MAGETWO-60483: Catalog broken when all child products of configurable are disabled

- Fixes after code review;

Author: interio-zz

app/code/Magento/Catalog/Model/Product/Pricing/Renderer/SalableResolver.php

@@ -6,6 +6,9 @@
 
 namespace Magento\Catalog\Model\Product\Pricing\Renderer;
 
+/**
+ * Resolver provided to check is product available for sale
+ */
 class SalableResolver implements SalableResolverInterface
 {
     /**
@@ -14,15 +17,10 @@ class SalableResolver implements SalableResolverInterface
      * @param \Magento\Framework\Pricing\SaleableInterface $salableItem
      * @return boolean
      */
-    public function isSalable($salableItem)
+    public function isSalable(\Magento\Framework\Pricing\SaleableInterface $salableItem)
     {
-        if (!$salableItem ||
-            $salableItem->getCanShowPrice() === false ||
-            !$salableItem->isSalable()
-        ) {
-            return false;
-        }
-
-        return true;
+        return ($salableItem->getCanShowPrice() === false || !$salableItem->isSalable())
+            ? false
+            : true;
     }
 }

app/code/Magento/Catalog/Model/Product/Pricing/Renderer/SalableResolverInterface.php

@@ -7,8 +7,7 @@
 namespace Magento\Catalog\Model\Product\Pricing\Renderer;
 
 /**
- * Interface SalableResolverInterface
- *
+ * Interface resolver provided to check is product available for sale
  */
 interface SalableResolverInterface
 {
@@ -18,5 +17,5 @@ interface SalableResolverInterface
      * @param \Magento\Framework\Pricing\SaleableInterface $salableItem
      * @return boolean
      */
-    public function isSalable($salableItem);
+    public function isSalable(\Magento\Framework\Pricing\SaleableInterface $salableItem);
 }

app/code/Magento/Catalog/Pricing/Render/FinalPriceBox.php

@@ -11,6 +11,10 @@
 use Magento\Framework\Pricing\Render\PriceBox as BasePriceBox;
 use Magento\Msrp\Pricing\Price\MsrpPrice;
 use Magento\Catalog\Model\Product\Pricing\Renderer\SalableResolverInterface;
+use Magento\Framework\View\Element\Template\Context;
+use Magento\Framework\Pricing\SaleableInterface;
+use Magento\Framework\Pricing\Price\PriceInterface;
+use Magento\Framework\Pricing\Render\RendererPool;
 
 /**
  * Class for final_price rendering
@@ -21,16 +25,38 @@
 class FinalPriceBox extends BasePriceBox
 {
     /**
-     * @var \Magento\Catalog\Model\Product\Pricing\Renderer\SalableResolverInterface
+     * @var SalableResolverInterface
      */
     private $salableResolver;
 
+    /**
+     * @param Context $context
+     * @param SaleableInterface $saleableItem
+     * @param PriceInterface $price
+     * @param RendererPool $rendererPool
+     * @param array $data
+     * @param SalableResolverInterface $salableResolver
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function __construct(
+        Context $context,
+        SaleableInterface $saleableItem,
+        PriceInterface $price,
+        RendererPool $rendererPool,
+        array $data = [],
+        SalableResolverInterface $salableResolver = null
+    ) {
+        parent::__construct($context, $saleableItem, $price, $rendererPool);
+        $this->salableResolver = $salableResolver ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(SalableResolverInterface::class);
+    }
+
     /**
      * @return string
      */
     protected function _toHtml()
     {
-        if (!$this->getSalableResolver()->isSalable($this->getSaleableItem())) {
+        if (!$this->salableResolver->isSalable($this->getSaleableItem())) {
             return '';
         }
 
@@ -62,22 +88,6 @@ protected function _toHtml()
         return $this->wrapResult($result);
     }
 
-    /**
-     * The getter function to get the new SalableResolver dependency
-     *
-     * @return \Magento\Catalog\Model\Product\Pricing\Renderer\SalableResolverInterface
-     *
-     * @deprecated
-     */
-    private function getSalableResolver()
-    {
-        if ($this->salableResolver === null) {
-            $this->salableResolver = \Magento\Framework\App\ObjectManager::getInstance()->
-            get(\Magento\Catalog\Model\Product\Pricing\Renderer\SalableResolverInterface::class);
-        }
-        return $this->salableResolver;
-    }
-
     /**
      * Wrap with standard required container
      *

app/code/Magento/Catalog/Test/Unit/Model/Product/Pricing/Renderer/SalableResolverTest.php

@@ -30,8 +30,7 @@ protected function setUp()
 
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $this->object = $objectManager->getObject(
-            \Magento\Catalog\Model\Product\Pricing\Renderer\SalableResolver::class,
-            []
+            \Magento\Catalog\Model\Product\Pricing\Renderer\SalableResolver::class
         );
     }
 
@@ -47,19 +46,19 @@ public function testSalableItem()
     {
         $this->product->expects($this->any())
             ->method('getCanShowPrice')
-            ->will($this->returnValue(true));
+            ->willReturn(true);
 
         $this->product->expects($this->any())->method('isSalable')->willReturn(true);
 
         $result = $this->object->isSalable($this->product);
-        $this->assertNotFalse($result);
+        $this->assertTrue($result);
     }
 
     public function testNotSalableItem()
     {
         $this->product->expects($this->any())
             ->method('getCanShowPrice')
-            ->will($this->returnValue(true));
+            ->willReturn(true);
 
         $this->product->expects($this->any())->method('isSalable')->willReturn(false);
 

app/code/Magento/Catalog/etc/di.xml

@@ -48,6 +48,7 @@
     <preference for="Magento\Catalog\Api\Data\CategorySearchResultsInterface" type="Magento\Framework\Api\SearchResults" />
     <preference for="Magento\Catalog\Model\Config\Source\ProductPriceOptionsInterface" type="Magento\Catalog\Model\Config\Source\Product\Options\Price"/>
     <preference for="Magento\Catalog\Model\Indexer\Product\Flat\Table\BuilderInterface" type="Magento\Catalog\Model\Indexer\Product\Flat\Table\Builder"/>
+    <preference for="Magento\Catalog\Model\Product\Pricing\Renderer\SalableResolverInterface" type="Magento\Catalog\Model\Product\Pricing\Renderer\SalableResolver"/>
     <type name="Magento\Customer\Model\ResourceModel\Visitor">
         <plugin name="catalogLog" type="Magento\Catalog\Model\Plugin\Log" />
     </type>

app/code/Magento/Catalog/etc/frontend/di.xml

@@ -6,7 +6,6 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-    <preference for="Magento\Catalog\Model\Product\Pricing\Renderer\SalableResolverInterface" type="Magento\Catalog\Model\Product\Pricing\Renderer\SalableResolver"/>
     <virtualType name="Magento\Catalog\Model\ResourceModel\Category\Collection\FetchStrategy" type="Magento\Framework\Data\Collection\Db\FetchStrategy\Cache">
         <arguments>
             <argument name="cacheTags" xsi:type="array">