Merge remote-tracking branch 'origin/MC-23733' into 2.4-develop-pr21

Author: serhii-balko

app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Image/Placeholder.php

@@ -8,7 +8,9 @@
 namespace Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Image;
 
 use Magento\Catalog\Model\View\Asset\PlaceholderFactory;
+use Magento\Framework\App\Area;
 use Magento\Framework\View\Asset\Repository as AssetRepository;
+use Magento\Framework\View\DesignInterface;
 
 /**
  * Image Placeholder provider
@@ -25,16 +27,24 @@ class Placeholder
      */
     private $assetRepository;
 
+    /**
+     * @var DesignInterface
+     */
+    private $themeDesign;
+
     /**
      * @param PlaceholderFactory $placeholderFactory
      * @param AssetRepository $assetRepository
+     * @param DesignInterface $themeDesign
      */
     public function __construct(
         PlaceholderFactory $placeholderFactory,
-        AssetRepository $assetRepository
+        AssetRepository $assetRepository,
+        DesignInterface $themeDesign
     ) {
         $this->placeholderFactory = $placeholderFactory;
         $this->assetRepository = $assetRepository;
+        $this->themeDesign = $themeDesign;
     }
 
     /**
@@ -52,8 +62,14 @@ public function getPlaceholder(string $imageType): string
             return $imageAsset->getUrl();
         }
 
-        return $this->assetRepository->getUrl(
-            "Magento_Catalog::images/product/placeholder/{$imageType}.jpg"
+        $params = [
+            'area' => Area::AREA_FRONTEND,
+            'themeId' => $this->themeDesign->getConfigurationDesignTheme(Area::AREA_FRONTEND),
+        ];
+
+        return $this->assetRepository->getUrlWithParams(
+            "Magento_Catalog::images/product/placeholder/{$imageType}.jpg",
+            $params
         );
     }
 }

app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Image/Placeholder/Theme.php

@@ -38,6 +38,33 @@ public function testProductSmallImageUrlWithExistingImage()
         self::assertTrue($this->checkImageExists($response['products']['items'][0]['small_image']['url']));
     }
 
+    /**
+     * Test for get product image placeholder
+     *
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     */
+    public function testProductSmallImageUrlPlaceholder()
+    {
+        $productSku = 'simple';
+        $query = <<<QUERY
+{
+  products(filter: {sku: {eq: "{$productSku}"}}) {
+    items {
+        small_image {
+            url
+        }
+    }
+  }
+}
+QUERY;
+        $response = $this->graphQlQuery($query);
+        $responseImage = $response['products']['items'][0]['small_image'];
+
+        self::assertArrayHasKey('url', $responseImage);
+        self::assertContains('placeholder/small_image.jpg', $responseImage['url']);
+        self::assertTrue($this->checkImageExists($responseImage['url']));
+    }
+
     /**
      * @magentoApiDataFixture Magento/Catalog/_files/product_with_multiple_images.php
      */