MAGETWO-55729: [Customer] Optimize performance for bundled products with lots of product options

- MAGETWO-60467: Simple product name not displayed as options on product page

Author: mslabko

app/code/Magento/Bundle/Model/ResourceModel/Selection/Collection.php

@@ -177,7 +177,7 @@ public function addQuantityFilter()
      */
     public function getNewEmptyItem()
     {
-        if ($this->itemPrototype == null) {
+        if (null === $this->itemPrototype) {
             $this->itemPrototype = parent::getNewEmptyItem();
         }
         return clone $this->itemPrototype;
@@ -200,7 +200,7 @@ public function addPriceFilter($product, $searchMin, $useRegularPrice = false)
                 $minimalPriceExpression = 'minimal_price';
             } else {
                 $this->getCatalogRuleProcessor()->addPriceData($this, 'selection.product_id');
-                $minimalPriceExpression = 'LEAST(minimal_price, IFNULL(catalog_rule_price, 99999999))';
+                $minimalPriceExpression = 'LEAST(minimal_price, IFNULL(catalog_rule_price, minimal_price))';
             }
             $orderByValue = new \Zend_Db_Expr(
                 '(' .

app/code/Magento/Bundle/Pricing/Adjustment/Calculator.php

@@ -9,7 +9,6 @@
 use Magento\Bundle\Model\Product\Price;
 use Magento\Bundle\Pricing\Price\BundleSelectionFactory;
 use Magento\Catalog\Model\Product;
-use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Pricing\Adjustment\Calculator as CalculatorBase;
 use Magento\Framework\Pricing\Amount\AmountFactory;
 use Magento\Framework\Pricing\SaleableInterface;
@@ -199,23 +198,24 @@ protected function getSelectionAmounts(Product $bundleProduct, $searchMin, $useR
         }
         $canSkipRequiredOptions = $searchMin && !$shouldFindMinOption;
 
+        /** @var \Magento\Bundle\Model\Product\Type $typeInstance */
+        $typeInstance = $bundleProduct->getTypeInstance();
         $priceList = [];
+
         foreach ($this->getBundleOptions($bundleProduct) as $option) {
             /** @var \Magento\Bundle\Model\Option $option */
             if ($this->canSkipOption($option, $canSkipRequiredOptions)) {
                 continue;
             }
 
-            /** @var \Magento\Bundle\Model\Product\Type $typeInstance */
-            $typeInstance = $bundleProduct->getTypeInstance();
             $selectionsCollection = $typeInstance->getSelectionsCollection(
                 [(int)$option->getOptionId()],
                 $bundleProduct
             );
             $selectionsCollection->removeAttributeToSelect();
             $selectionsCollection->addQuantityFilter();
 
-            if ($option->isMultiSelection() && !$searchMin) {
+            if (!$searchMin && $option->isMultiSelection()) {
                 $selectionsCollection->addPriceData();
 
                 foreach ($selectionsCollection as $selection) {
@@ -278,7 +278,7 @@ protected function getSelectionAmounts(Product $bundleProduct, $searchMin, $useR
      */
     protected function canSkipOption($option, $canSkipRequiredOption)
     {
-        return ($canSkipRequiredOption && !$option->getRequired());
+        return $canSkipRequiredOption && !$option->getRequired();
     }
 
     /**
@@ -289,9 +289,9 @@ protected function canSkipOption($option, $canSkipRequiredOption)
      */
     protected function hasRequiredOption($bundleProduct)
     {
-        /** @var \Magento\Bundle\Model\Product\Type $typeInstance */
-        $typeInstance = $bundleProduct->getTypeInstance();
-        $collection = $typeInstance->getOptionsCollection($bundleProduct);
+        $collection = clone $this->getBundleOptions($bundleProduct);
+        $collection->clear();
+
         return $collection->addFilter(\Magento\Bundle\Model\Option::KEY_REQUIRED, 1)->getSize() > 0;
     }
 

app/code/Magento/Bundle/Pricing/Price/BundleSelectionFactory.php

@@ -42,7 +42,6 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * @param Product $selection
      * @param float $quantity
      * @param array $arguments
-     * @throws \InvalidArgumentException
      * @return BundleSelectionPrice
      */
     public function create(
@@ -54,12 +53,7 @@ public function create(
         $arguments['bundleProduct'] = $bundleProduct;
         $arguments['saleableItem'] = $selection;
         $arguments['quantity'] = $quantity ? floatval($quantity) : 1.;
-        $selectionPrice = $this->objectManager->create(self::SELECTION_CLASS_DEFAULT, $arguments);
-        if (!$selectionPrice instanceof BundleSelectionPrice) {
-            throw new \InvalidArgumentException(
-                get_class($selectionPrice) . ' doesn\'t extend BundleSelectionPrice'
-            );
-        }
-        return $selectionPrice;
+
+        return $this->objectManager->create(self::SELECTION_CLASS_DEFAULT, $arguments);
     }
 }

app/code/Magento/Bundle/Test/Unit/Pricing/Price/BundleSelectionFactoryTest.php

@@ -66,26 +66,4 @@ public function testCreate()
                 ->create($this->bundleMock, $this->selectionMock, 2., ['test' => 'some value'])
         );
     }
-
-    /**
-     * @expectedException \InvalidArgumentException
-     */
-    public function testCreateException()
-    {
-        $this->objectManagerMock->expects($this->once())
-            ->method('create')
-            ->with(
-                $this->equalTo(BundleSelectionFactory::SELECTION_CLASS_DEFAULT),
-                $this->equalTo(
-                    [
-                        'test' => 'some value',
-                        'bundleProduct' => $this->bundleMock,
-                        'saleableItem' => $this->selectionMock,
-                        'quantity' => 2.,
-                    ]
-                )
-            )
-            ->will($this->returnValue(new \stdClass()));
-        $this->bundleSelectionFactory->create($this->bundleMock, $this->selectionMock, 2., ['test' => 'some value']);
-    }
 }

lib/internal/Magento/Framework/Pricing/Price/AbstractPrice.php

@@ -23,7 +23,7 @@ abstract class AbstractPrice implements PriceInterface
     const PRICE_CODE = 'abstract_price';
 
     /**
-     * @var AmountInterface
+     * @var AmountInterface[]
      */
     protected $amount;