MAGETWO-8709: [GITHUB] Child product image should be shown in Wishist…

… if options are selected for configurable product #8168 - fixing formatting
magento · Jul 17, 2018 · 525308c · 525308c
1 parent c2c8ef9
commit 525308c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/app/code/Magento/Catalog/Model/Product/Configuration/Item/ItemResolverComposite.php b/app/code/Magento/Catalog/Model/Product/Configuration/Item/ItemResolverComposite.php
@@ -34,15 +34,15 @@ public function __construct(array $itemResolvers)
      */
     public function getFinalProduct(ItemInterface $item) : ProductInterface
     {
-        $product = $item->getProduct();
+        $finalProduct = $item->getProduct();
         foreach ($this->itemResolvers as $resolver) {
             $resolvedProduct = $this->getItemResolverInstance($resolver)->getFinalProduct($item);
-            if ($resolvedProduct !== $product) {
-                $product = $resolvedProduct;
+            if ($resolvedProduct !== $finalProduct) {
+                $finalProduct = $resolvedProduct;
                 break;
             }
         }
-        return $product;
+        return $finalProduct;
     }
 
     /**
@@ -51,7 +51,7 @@ public function getFinalProduct(ItemInterface $item) : ProductInterface
      * @param string $className
      * @return ItemResolverInterface
      */
-    private function getItemResolverInstance(string $className)
+    private function getItemResolverInstance(string $className) : ItemResolverInterface
     {
         if (!isset($this->itemResolversInstances[$className])) {
             $this->itemResolversInstances[$className] = ObjectManager::getInstance()->get($className);

diff --git a/app/code/Magento/Checkout/Model/Cart/ImageProvider.php b/app/code/Magento/Checkout/Model/Cart/ImageProvider.php
@@ -20,7 +20,8 @@ class ImageProvider
 
     /**
      * @var \Magento\Checkout\CustomerData\ItemPoolInterface
-     * @deprecated
+     * @deprecated No need for the pool as images are resolved in the default item implementation
+     * @see \Magento\Checkout\CustomerData\DefaultItem::getProductForThumbnail
      */
     protected $itemPool;
 

diff --git a/app/code/Magento/Checkout/Test/Unit/Block/Cart/Item/RendererTest.php b/app/code/Magento/Checkout/Test/Unit/Block/Cart/Item/RendererTest.php
@@ -86,16 +86,16 @@ protected function _initProduct()
             Product::class,
             ['getName', '__wakeup', 'getIdentities']
         );
-        $product->expects($this->any())->method('getName')->will($this->returnValue('Parent Product'));
+        $product->expects($this->any())->method('getName')->willReturn('Parent Product');
 
         /** @var Item|\PHPUnit_Framework_MockObject_MockObject $item */
         $item = $this->createMock(\Magento\Quote\Model\Quote\Item::class);
-        $item->expects($this->any())->method('getProduct')->will($this->returnValue($product));
+        $item->expects($this->any())->method('getProduct')->willReturn($product);
 
         $this->itemResolver->expects($this->any())
             ->method('getFinalProduct')
             ->with($item)
-            ->will($this->returnValue($product));
+            ->willReturn($product);
 
         $this->renderer->setItem($item);
         return $product;
@@ -107,7 +107,7 @@ public function testGetIdentities()
         $identities = [1 => 1, 2 => 2, 3 => 3];
         $product->expects($this->exactly(2))
             ->method('getIdentities')
-            ->will($this->returnValue($identities));
+            ->willReturn($identities);
 
         $this->assertEquals($product->getIdentities(), $this->renderer->getIdentities());
     }
@@ -135,7 +135,7 @@ public function testGetProductPriceHtml()
         $this->layout->expects($this->atLeastOnce())
             ->method('getBlock')
             ->with('product.price.render.default')
-            ->will($this->returnValue($priceRender));
+            ->willReturn($priceRender);
 
         $priceRender->expects($this->once())
             ->method('render')
@@ -147,7 +147,7 @@ public function testGetProductPriceHtml()
                     'display_minimal_price' => true,
                     'zone' => \Magento\Framework\Pricing\Render::ZONE_ITEM_LIST
                 ]
-            )->will($this->returnValue($priceHtml));
+            )->willReturn($priceHtml);
 
         $this->assertEquals($priceHtml, $this->renderer->getProductPriceHtml($product));
     }