Cleanup ObjectManager usage - Magento_Bundle

Author: Bartlomiejsz

app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle.php

@@ -6,20 +6,30 @@
 namespace Magento\Bundle\Block\Catalog\Product\View\Type;
 
 use Magento\Bundle\Model\Option;
+use Magento\Bundle\Model\Product\Price;
+use Magento\Bundle\Model\Product\PriceFactory;
+use Magento\Bundle\Model\Product\Type;
+use Magento\Catalog\Block\Product\Context;
+use Magento\Catalog\Block\Product\View\AbstractView;
 use Magento\Catalog\Model\Product;
+use Magento\Catalog\Pricing\Price\FinalPrice;
+use Magento\Catalog\Pricing\Price\RegularPrice;
+use Magento\CatalogRule\Model\ResourceModel\Product\CollectionProcessor;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\DataObject;
+use Magento\Framework\Json\EncoderInterface;
+use Magento\Framework\Locale\FormatInterface;
+use Magento\Framework\Stdlib\ArrayUtils;
 
 /**
  * Catalog bundle product info block
  *
  * @api
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @api
  * @since 100.0.2
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class Bundle extends \Magento\Catalog\Block\Product\View\AbstractView
+class Bundle extends AbstractView
 {
-
     /**
      * @var array
      */
@@ -33,17 +43,17 @@ class Bundle extends \Magento\Catalog\Block\Product\View\AbstractView
     protected $catalogProduct;
 
     /**
-     * @var \Magento\Bundle\Model\Product\PriceFactory
+     * @var PriceFactory
      */
     protected $productPriceFactory;
 
     /**
-     * @var \Magento\Framework\Json\EncoderInterface
+     * @var EncoderInterface
      */
     protected $jsonEncoder;
 
     /**
-     * @var \Magento\Framework\Locale\FormatInterface
+     * @var FormatInterface
      */
     protected $localeFormat;
 
@@ -63,22 +73,24 @@ class Bundle extends \Magento\Catalog\Block\Product\View\AbstractView
     private $optionsPosition = [];
 
     /**
-     * @param \Magento\Catalog\Block\Product\Context $context
-     * @param \Magento\Framework\Stdlib\ArrayUtils $arrayUtils
+     * @param Context $context
+     * @param ArrayUtils $arrayUtils
      * @param \Magento\Catalog\Helper\Product $catalogProduct
-     * @param \Magento\Bundle\Model\Product\PriceFactory $productPrice
-     * @param \Magento\Framework\Json\EncoderInterface $jsonEncoder
-     * @param \Magento\Framework\Locale\FormatInterface $localeFormat
+     * @param PriceFactory $productPrice
+     * @param EncoderInterface $jsonEncoder
+     * @param FormatInterface $localeFormat
      * @param array $data
+     * @param CollectionProcessor|null $catalogRuleProcessor
      */
     public function __construct(
-        \Magento\Catalog\Block\Product\Context $context,
-        \Magento\Framework\Stdlib\ArrayUtils $arrayUtils,
+        Context $context,
+        ArrayUtils $arrayUtils,
         \Magento\Catalog\Helper\Product $catalogProduct,
-        \Magento\Bundle\Model\Product\PriceFactory $productPrice,
-        \Magento\Framework\Json\EncoderInterface $jsonEncoder,
-        \Magento\Framework\Locale\FormatInterface $localeFormat,
-        array $data = []
+        PriceFactory $productPrice,
+        EncoderInterface $jsonEncoder,
+        FormatInterface $localeFormat,
+        array $data = [],
+        ?CollectionProcessor $catalogRuleProcessor = null
     ) {
         $this->catalogProduct = $catalogProduct;
         $this->productPriceFactory = $productPrice;
@@ -89,22 +101,8 @@ public function __construct(
             $arrayUtils,
             $data
         );
-    }
-
-    /**
-     * Return catalog rule processor or creates processor if it does not exist
-     *
-     * @deprecated 100.2.0
-     * @return \Magento\CatalogRule\Model\ResourceModel\Product\CollectionProcessor
-     */
-    private function getCatalogRuleProcessor()
-    {
-        if ($this->catalogRuleProcessor === null) {
-            $this->catalogRuleProcessor = \Magento\Framework\App\ObjectManager::getInstance()
-                ->get(\Magento\CatalogRule\Model\ResourceModel\Product\CollectionProcessor::class);
-        }
-
-        return $this->catalogRuleProcessor;
+        $this->catalogRuleProcessor = $catalogRuleProcessor ?? ObjectManager::getInstance()
+                ->get(CollectionProcessor::class);
     }
 
     /**
@@ -120,7 +118,7 @@ public function getOptions($stripSelection = false)
     {
         if (!$this->options) {
             $product = $this->getProduct();
-            /** @var \Magento\Bundle\Model\Product\Type $typeInstance */
+            /** @var Type $typeInstance */
             $typeInstance = $product->getTypeInstance();
             $typeInstance->setStoreFilter($product->getStoreId(), $product);
 
@@ -130,7 +128,7 @@ public function getOptions($stripSelection = false)
                 $typeInstance->getOptionsIds($product),
                 $product
             );
-            $this->getCatalogRuleProcessor()->addPriceData($selectionCollection);
+            $this->catalogRuleProcessor->addPriceData($selectionCollection);
             $selectionCollection->addTierPriceData();
 
             $this->options = $optionCollection->appendSelections(
@@ -151,10 +149,7 @@ public function getOptions($stripSelection = false)
     public function hasOptions()
     {
         $this->getOptions();
-        if (empty($this->options) || !$this->getProduct()->isSalable()) {
-            return false;
-        }
-        return true;
+        return !(empty($this->options) || !$this->getProduct()->isSalable());
     }
 
     /**
@@ -255,7 +250,7 @@ private function getSelectionItemData(Product $product, Product $selection)
             ->getOptionSelectionAmount($selection)
             ->getValue();
 
-        $selection = [
+        return [
             'qty' => $qty,
             'customQty' => $selection->getSelectionCanChangeQty(),
             'optionId' => $selection->getId(),
@@ -275,8 +270,6 @@ private function getSelectionItemData(Product $product, Product $selection)
             'name' => $selection->getName(),
             'canApplyMsrp' => false,
         ];
-
-        return $selection;
     }
 
     /**
@@ -371,16 +364,16 @@ private function getOptionItemData(Option $option, Product $product, $position)
      */
     private function getConfigData(Product $product, array $options)
     {
-        $isFixedPrice = $this->getProduct()->getPriceType() == \Magento\Bundle\Model\Product\Price::PRICE_TYPE_FIXED;
+        $isFixedPrice = $this->getProduct()->getPriceType() == Price::PRICE_TYPE_FIXED;
 
         $productAmount = $product
             ->getPriceInfo()
-            ->getPrice(\Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE)
+            ->getPrice(FinalPrice::PRICE_CODE)
             ->getPriceWithoutOption();
 
         $baseProductAmount = $product
             ->getPriceInfo()
-            ->getPrice(\Magento\Catalog\Pricing\Price\RegularPrice::PRICE_CODE)
+            ->getPrice(RegularPrice::PRICE_CODE)
             ->getAmount();
 
         $config = [