Merge branch 'MAGETWO-71515' into QwertyPR-2017-11-21

Author: Dmytro Voskoboinikov

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

@@ -5,7 +5,6 @@
  */
 namespace Magento\ConfigurableProduct\Pricing\Price;
 
-use Magento\Framework\App\ObjectManager;
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Model\ResourceModel\Product\LinkedProductSelectBuilderInterface;
 use Magento\Framework\App\ResourceConnection;
@@ -16,15 +15,20 @@
  */
 class LowestPriceOptionsProvider implements LowestPriceOptionsProviderInterface
 {
+    /**
+     * @var ResourceConnection
+     */
+    private $resource;
+
     /**
      * @var LinkedProductSelectBuilderInterface
      */
     private $linkedProductSelectBuilder;
 
     /**
-     * @var OptionsCollectionProvider
+     * @var CollectionFactory
      */
-    private $optionsCollectionProvider;
+    private $collectionFactory;
 
     /**
      * Key is product id. Value is prepared product collection
@@ -37,20 +41,15 @@ class LowestPriceOptionsProvider implements LowestPriceOptionsProviderInterface
      * @param ResourceConnection $resourceConnection
      * @param LinkedProductSelectBuilderInterface $linkedProductSelectBuilder
      * @param CollectionFactory $collectionFactory
-     * @param OptionsCollectionProvider|null $optionsCollectionProvider
-     *
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function __construct(
         ResourceConnection $resourceConnection,
         LinkedProductSelectBuilderInterface $linkedProductSelectBuilder,
-        CollectionFactory $collectionFactory,
-        OptionsCollectionProvider $optionsCollectionProvider = null
+        CollectionFactory $collectionFactory
     ) {
+        $this->resource = $resourceConnection;
         $this->linkedProductSelectBuilder = $linkedProductSelectBuilder;
-
-        $this->optionsCollectionProvider = $optionsCollectionProvider ?:
-            ObjectManager::getInstance()->get(OptionsCollectionProvider::class);
+        $this->collectionFactory = $collectionFactory;
     }
 
     /**
@@ -59,13 +58,15 @@ public function __construct(
     public function getProducts(ProductInterface $product)
     {
         if (!isset($this->productsMap[$product->getId()])) {
-            $optionsCollection = $this->optionsCollectionProvider->getCollection(
-                $this->linkedProductSelectBuilder->build($product->getId())
+            $productIds = $this->resource->getConnection()->fetchCol(
+                '(' . implode(') UNION (', $this->linkedProductSelectBuilder->build($product->getId())) . ')'
             );
 
-            $this->productsMap[$product->getId()] = $optionsCollection->getItems();
+            $this->productsMap[$product->getId()] = $this->collectionFactory->create()
+                ->addAttributeToSelect(['price', 'special_price'])
+                ->addIdFilter($productIds)
+                ->getItems();
         }
-
         return $this->productsMap[$product->getId()];
     }
 }

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

@@ -93,7 +93,6 @@
             <argument name="prices" xsi:type="array">
                 <item name="regular_price" xsi:type="string">Magento\ConfigurableProduct\Pricing\Price\ConfigurableRegularPrice</item>
                 <item name="final_price" xsi:type="string">Magento\ConfigurableProduct\Pricing\Price\FinalPrice</item>
-                <item name="highest_price" xsi:type="string">Magento\ConfigurableProduct\Pricing\Price\HighestPrice</item>
             </argument>
             <argument name="target" xsi:type="object">Magento\Catalog\Pricing\Price\Pool</argument>
         </arguments>
@@ -137,11 +136,6 @@
             <argument name="priceResolver" xsi:type="object">ConfigurableFinalPriceResolver</argument>
         </arguments>
     </type>
-    <type name="Magento\ConfigurableProduct\Pricing\Price\HighestPrice">
-        <arguments>
-            <argument name="priceResolver" xsi:type="object">Magento\ConfigurableProduct\Pricing\Price\HighestPriceResolver</argument>
-        </arguments>
-    </type>
     <virtualType name="ConfigurableRegularPriceResolver" type="Magento\ConfigurableProduct\Pricing\Price\ConfigurablePriceResolver">
         <arguments>
             <argument name="priceResolver" xsi:type="object">Magento\ConfigurableProduct\Pricing\Price\RegularPriceResolver</argument>

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

@@ -17,9 +17,6 @@ $priceModel = $block->getPriceType('regular_price');
 /** @var \Magento\Framework\Pricing\Price\PriceInterface $finalPriceModel */
 $finalPriceModel = $block->getPriceType('final_price');
 
-/** @var \Magento\Framework\Pricing\Price\PriceInterface $highestPriceModel */
-$highestPriceModel = $block->getPriceType('highest_price');
-
 $idSuffix = $block->getIdSuffix() ? $block->getIdSuffix() : '';
 $schema = ($block->getZone() == 'item_view') ? true : false;
 ?>
@@ -28,17 +25,14 @@ $schema = ($block->getZone() == 'item_view') ? true : false;
     <span class="normal-price">
         <?php
             $arguments = [
-                'price_id'          => $block->getPriceId('product-price-' . $idSuffix),
-                'price_type'        => 'finalPrice',
+                'display_label' => __('As low as'),
+                'price_id' => $block->getPriceId('product-price-' . $idSuffix),
+                'price_type' => 'finalPrice',
                 'include_container' => true,
                 'schema' => $schema
             ];
 
-            if ($finalPriceModel->getAmount()->getValue() !== $highestPriceModel->getAmount()->getValue()) {
-                $arguments['display_label'] = __('As low as');
-            }
-
-            /* @escapeNotVerified */ echo $block->renderAmount($finalPriceModel->getAmount(), $arguments);
+            /* @noEscape */ echo $block->renderAmount($finalPriceModel->getAmount(), $arguments);
         ?>
     </span>