MAGETWO-52098: Exception if add configurable product with out of stock items to shopping cart

Author: mslabko

app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php

@@ -512,6 +512,7 @@ public function getUsedProducts($product, $requiredAttributeIds = null)
         if (!$product->hasData($this->_usedProducts)) {
             $usedProducts = [];
             $collection = $this->getUsedProductCollection($product)
+                ->setFlag('has_stock_status_filter', true)
                 ->addAttributeToSelect('name')
                 ->addAttributeToSelect('price')
                 ->addAttributeToSelect('weight')

app/code/Magento/ConfigurableProduct/Pricing/Price/ConfigurablePriceResolver.php

@@ -44,11 +44,7 @@ public function __construct(
     public function resolvePrice(\Magento\Framework\Pricing\SaleableInterface $product)
     {
         $price = null;
-        $configurableProducts = $this->configurable->getUsedProductCollection($product)
-            ->setFlag('has_stock_status_filter', true)
-            ->addAttributeToSelect('price');
-
-        foreach ($configurableProducts as $subProduct) {
+        foreach ($this->configurable->getUsedProducts($product) as $subProduct) {
             $productPrice = $this->priceResolver->resolvePrice($subProduct);
             $price = $price ? min($price, $productPrice) : $productPrice;
         }

app/code/Magento/ConfigurableProduct/Test/Unit/Pricing/Price/ConfigurablePriceResolverTest.php

@@ -27,7 +27,7 @@ class ConfigurablePriceResolverTest extends \PHPUnit_Framework_TestCase
     protected function setUp()
     {
         $className = 'Magento\ConfigurableProduct\Model\Product\Type\Configurable';
-        $this->configurable = $this->getMock($className, ['getUsedProductCollection'], [], '', false);
+        $this->configurable = $this->getMock($className, ['getUsedProducts'], [], '', false);
 
         $className = 'Magento\ConfigurableProduct\Pricing\Price\PriceResolverInterface';
         $this->priceResolver = $this->getMockForAbstractClass($className, [], '', false, true, true, ['resolvePrice']);
@@ -59,9 +59,8 @@ public function testResolvePriceWithNoPrices()
             ['getSku']
         );
         $product->expects($this->once())->method('getSku')->willReturn('Kiwi');
-        $productCollection = $this->getProductCollection([]);
 
-        $this->configurable->expects($this->once())->method('getUsedProductCollection')->willReturn($productCollection);
+        $this->configurable->expects($this->once())->method('getUsedProducts')->willReturn([]);
 
         $this->resolver->resolvePrice($product);
     }
@@ -86,36 +85,12 @@ public function testResolvePrice($expectedValue)
         );
         $product->expects($this->never())->method('getSku');
 
-        $productCollection = $this->getProductCollection([$product]);
-        $this->configurable->expects($this->once())->method('getUsedProductCollection')->willReturn($productCollection);
+        $this->configurable->expects($this->once())->method('getUsedProducts')->willReturn([$product]);
         $this->priceResolver->expects($this->atLeastOnce())->method('resolvePrice')->willReturn($price);
 
         $this->assertEquals($expectedValue, $this->resolver->resolvePrice($product));
     }
 
-    /**
-     * @param array $products
-     * @return \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected function getProductCollection($products)
-    {
-        $productCollection = $this->getMockBuilder(
-            'Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Product\Collection'
-        )->setMethods(
-            [
-                'setFlag',
-                'addAttributeToSelect',
-                'getIterator',
-            ]
-        )->disableOriginalConstructor()
-            ->getMock();
-        $productCollection->expects($this->once())->method('addAttributeToSelect')->willReturnSelf();
-        $productCollection->expects($this->once())->method('setFlag')->willReturnSelf();
-        $productCollection->expects($this->once())->method('getIterator')->willReturn(new \ArrayIterator($products));
-
-        return $productCollection;
-    }
-
     /**
      * @return array
      */