MAGETWO-60605: Exception when adding configurable product by sku from customer account if associated simple product is out of stock

Author: igrybkov

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

@@ -53,8 +53,7 @@ public function __construct(
 
     /**
      * @param \Magento\Framework\Pricing\SaleableInterface|\Magento\Catalog\Model\Product $product
-     * @return float
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @return float | null
      */
     public function resolvePrice(\Magento\Framework\Pricing\SaleableInterface $product)
     {
@@ -64,12 +63,7 @@ public function resolvePrice(\Magento\Framework\Pricing\SaleableInterface $produ
             $productPrice = $this->priceResolver->resolvePrice($subProduct);
             $price = $price ? min($price, $productPrice) : $productPrice;
         }
-        if ($price === null) {
-            throw new \Magento\Framework\Exception\LocalizedException(
-                __('Configurable product "%1" does not have sub-products', $product->getSku())
-            );
-        }
 
-        return (float)$price;
+        return $price === null ? null : (float)$price;
     }
 }

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

@@ -53,20 +53,18 @@ protected function setUp()
 
     /**
      * situation: There are no used products, thus there are no prices
-     *
-     * @expectedException \Magento\Framework\Exception\LocalizedException
      */
     public function testResolvePriceWithNoPrices()
     {
         $product = $this->getMockBuilder(
             \Magento\Catalog\Model\Product::class
         )->disableOriginalConstructor()->getMock();
 
-        $product->expects($this->once())->method('getSku')->willReturn('Kiwi');
+        $product->expects($this->never())->method('getSku');
 
         $this->lowestPriceOptionsProvider->expects($this->once())->method('getProducts')->willReturn([]);
 
-        $this->resolver->resolvePrice($product);
+        $this->assertNull($this->resolver->resolvePrice($product));
     }
 
     /**

dev/tests/integration/testsuite/Magento/ConfigurableProduct/Pricing/Price/FinalPriceTest.php

@@ -0,0 +1,71 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\ConfigurableProduct\Pricing\Price;
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
+
+class FinalPriceTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    protected function setUp()
+    {
+        $this->productRepository = Bootstrap::getObjectManager()->get(ProductRepositoryInterface::class);
+    }
+
+    /**
+     * @magentoDataFixture Magento/ConfigurableProduct/_files/product_configurable.php
+     */
+    public function testNullPriceForConfigurbaleIfAllChildIsOutOfStock()
+    {
+        //prepare configurable product
+        $configurableProduct = $this->productRepository->get('configurable', false, null, true);
+        foreach ($configurableProduct->getExtensionAttributes()->getConfigurableProductLinks() as $productId) {
+            $product = $this->productRepository->getById($productId);
+            $product->getExtensionAttributes()->getStockItem()->setIsInStock(0);
+            $this->productRepository->save($product);
+        }
+
+        $finalPrice = Bootstrap::getObjectManager()->create(
+            FinalPrice::class,
+            [
+                'saleableItem' => $configurableProduct,
+                'quantity' => 1
+            ]
+        );
+
+        static::assertNull($finalPrice->getValue());
+    }
+
+    /**
+     * @magentoDataFixture Magento/ConfigurableProduct/_files/product_configurable.php
+     */
+    public function testNullPriceForConfigurbaleIfAllChildIsDisabled()
+    {
+        //prepare configurable product
+        $configurableProduct = $this->productRepository->get('configurable', false, null, true);
+        foreach ($configurableProduct->getExtensionAttributes()->getConfigurableProductLinks() as $productId) {
+            $product = $this->productRepository->getById($productId);
+            $product->setStatus(Status::STATUS_DISABLED);
+            $this->productRepository->save($product);
+        }
+
+        $finalPrice = Bootstrap::getObjectManager()->create(
+            FinalPrice::class,
+            [
+                'saleableItem' => $configurableProduct,
+                'quantity' => 1
+            ]
+        );
+
+        static::assertNull($finalPrice->getValue());
+    }
+}