MAGETWO-72582: Configurable product displays the price of "out of stock" configuration

Author: Dmytro Voskoboinikov

app/code/Magento/Catalog/view/base/templates/product/price/configured_price.phtml

@@ -3,7 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+// @codingStandardsIgnoreFile
+
 ?>
+
 <?php
 /** @var \Magento\Catalog\Pricing\Render\FinalPriceBox $block */
 /** @var \Magento\Catalog\Pricing\Price\ConfiguredPrice $configuredPrice */
@@ -14,11 +18,13 @@ $priceLabel = ($block->getPriceLabel() !== null)
     : '';
 ?>
 <p class="price-as-configured">
-    <?= /* @escapeNotVerified */ $block->renderAmount($configuredPrice->getAmount(), [
-        'display_label'     => $priceLabel,
-        'price_id'          => $block->getPriceId('product-price-'),
-        'price_type'        => 'finalPrice',
-        'include_container' => true,
-        'schema' => $schema
-    ]); ?>
+    <?php if($configuredPrice->getAmount()->getValue() !== null): ?>
+        <?= /* @noEscape */ $block->renderAmount($configuredPrice->getAmount(), [
+            'display_label'     => $priceLabel,
+            'price_id'          => $block->getPriceId('product-price-'),
+            'price_type'        => 'finalPrice',
+            'include_container' => true,
+            'schema' => $schema
+        ]); ?>
+    <?php endif; ?>
 </p>

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

@@ -55,8 +55,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)
     {
@@ -67,6 +66,6 @@ public function resolvePrice(\Magento\Framework\Pricing\SaleableInterface $produ
             $price = $price ? min($price, $productPrice) : $productPrice;
         }
 
-        return (float)$price;
+        return $price === null ? null : (float)$price;
     }
 }

app/code/Magento/ConfigurableProduct/view/base/templates/product/price/final_price.phtml

@@ -38,7 +38,7 @@ $schema = ($block->getZone() == 'item_view') ? true : false;
             'skip_adjustments'  => true
         ]); ?>
     </span>
-<?php else: ?>
+<?php elseif($finalPriceModel->getAmount()->getValue() !== null): ?>
     <?php /* @escapeNotVerified */ echo $block->renderAmount($finalPriceModel->getAmount(), [
         'price_id'          => $block->getPriceId('product-price-' . $idSuffix),
         'price_type'        => 'finalPrice',

app/code/Magento/Wishlist/Pricing/ConfiguredPrice/ConfigurableProduct.php

@@ -26,7 +26,7 @@ public function getValue()
         $product = $customOption ? $customOption->getProduct() : $this->getProduct();
         $price = $product->getPriceInfo()->getPrice(self::PRICE_CODE)->getValue();
 
-        return max(0, $price);
+        return $price === null ? null : max(0, $price);
     }
 
     /**