graphQl-239: refactoring, adjusting tests

Author: Vitaliy Boyko

app/code/Magento/CatalogGraphQl/Model/Resolver/Product/ProductImage/Url.php

@@ -27,20 +27,18 @@ class Url implements ResolverInterface
     /**
      * @var PlaceholderProvider
      */
-    private $_placeholderProvider;
+    private $placeholderProvider;
 
     /**
-     * Url constructor.
      * @param ImageFactory $productImageFactory
      * @param PlaceholderProvider $placeholderProvider
      */
     public function __construct(
         ImageFactory $productImageFactory,
         PlaceholderProvider $placeholderProvider
-
     ) {
         $this->productImageFactory = $productImageFactory;
-        $this->_placeholderProvider = $placeholderProvider;
+        $this->placeholderProvider = $placeholderProvider;
     }
 
     /**
@@ -83,7 +81,7 @@ private function getImageUrl(string $imageType, ?string $imagePath): string
             ->setBaseFile($imagePath);
 
         if ($image->isBaseFilePlaceholder()) {
-            return $this->_placeholderProvider->getPlaceholder($imageType);
+            return $this->placeholderProvider->getPlaceholder($imageType);
         }
 
         return $image->getUrl();

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

@@ -8,102 +8,64 @@
 namespace Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Image;
 
 use Magento\Catalog\Model\View\Asset\PlaceholderFactory;
-use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\View\Asset\Repository as AssetRepository;
-use Magento\Framework\View\Design\Theme\ThemeProviderInterface;
-use Magento\Store\Model\StoreManagerInterface;
 
 /**
- * Class Placeholder
- * @package Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Image
+ * Image Placeholder provider
  */
 class Placeholder
 {
     /**
      * @var PlaceholderFactory
      */
-    private $_placeholderFactory;
+    private $placeholderFactory;
+
     /**
      * @var AssetRepository
      */
-    private $_assetRepository;
-    /**
-     * @var ScopeConfigInterface
-     */
-    private $_scopeConfig;
-    /**
-     * @var StoreManagerInterface
-     */
-    private $_storeManager;
+    private $assetRepository;
+
     /**
-     * @var ThemeProviderInterface
+     * @var Theme
      */
-    private $_themeProvider;
+    private $theme;
 
     /**
      * Placeholder constructor.
      * @param PlaceholderFactory $placeholderFactory
      * @param AssetRepository $assetRepository
-     * @param ScopeConfigInterface $scopeConfig
-     * @param StoreManagerInterface $storeManager
-     * @param ThemeProviderInterface $themeProvider
+     * @param Theme $theme
      */
     public function __construct(
         PlaceholderFactory $placeholderFactory,
         AssetRepository $assetRepository,
-        ScopeConfigInterface $scopeConfig,
-        StoreManagerInterface $storeManager,
-        ThemeProviderInterface $themeProvider
+        Theme $theme
     ) {
-        $this->_placeholderFactory = $placeholderFactory;
-        $this->_assetRepository = $assetRepository;
-        $this->_scopeConfig = $scopeConfig;
-        $this->_storeManager = $storeManager;
-        $this->_themeProvider = $themeProvider;
+        $this->placeholderFactory = $placeholderFactory;
+        $this->assetRepository = $assetRepository;
+        $this->theme = $theme;
     }
 
     /**
      * Get placeholder
      *
-     * @param $imageType
+     * @param string $imageType
      * @return string
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
-    public function getPlaceholder($imageType): string
+    public function getPlaceholder(string $imageType): string
     {
-        $imageAsset = $this->_placeholderFactory->create(['type' => $imageType]);
+        $imageAsset = $this->placeholderFactory->create(['type' => $imageType]);
 
         // check if placeholder defined in config
         if ($imageAsset->getFilePath()) {
             return $imageAsset->getUrl();
         }
 
-        return $this->_assetRepository->createAsset(
+        $themeData = $this->theme->getThemeData();
+        return $this->assetRepository->createAsset(
             "Magento_Catalog::images/product/placeholder/{$imageType}.jpg",
-            $this->getThemeData()
+            $themeData
         )->getUrl();
     }
-
-    /**
-     * Get theme model
-     *
-     * @return mixed
-     * @throws \Magento\Framework\Exception\NoSuchEntityException
-     */
-    public function getThemeData()
-    {
-        $themeId = $this->_scopeConfig->getValue(
-            \Magento\Framework\View\DesignInterface::XML_PATH_THEME_ID,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
-            $this->_storeManager->getStore()->getId()
-        );
-
-        /** @var $theme \Magento\Framework\View\Design\ThemeInterface */
-        $theme = $this->_themeProvider->getThemeById($themeId);
-
-        $data = $theme->getData();
-        $data['themeModel'] = $theme;
-
-        return $data;
-    }
 }

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

@@ -0,0 +1,71 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Image;
+
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\View\Design\Theme\ThemeProviderInterface;
+use Magento\Store\Model\StoreManagerInterface;
+
+/**
+ * Theme provider
+ */
+class Theme
+{
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * @var ThemeProviderInterface
+     */
+    private $themeProvider;
+
+    /**
+     * @param ScopeConfigInterface $scopeConfig
+     * @param StoreManagerInterface $storeManager
+     * @param ThemeProviderInterface $themeProvider
+     */
+    public function __construct(
+        ScopeConfigInterface $scopeConfig,
+        StoreManagerInterface $storeManager,
+        ThemeProviderInterface $themeProvider
+    ) {
+        $this->scopeConfig = $scopeConfig;
+        $this->storeManager = $storeManager;
+        $this->themeProvider = $themeProvider;
+    }
+
+    /**
+     * Get theme model
+     *
+     * @return array
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    public function getThemeData(): array
+    {
+        $themeId = $this->scopeConfig->getValue(
+            \Magento\Framework\View\DesignInterface::XML_PATH_THEME_ID,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+            $this->storeManager->getStore()->getId()
+        );
+
+        /** @var $theme \Magento\Framework\View\Design\ThemeInterface */
+        $theme = $this->themeProvider->getThemeById($themeId);
+
+        $data = $theme->getData();
+        $data['themeModel'] = $theme;
+
+        return $data;
+    }
+}

dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductImageTest.php

@@ -60,12 +60,25 @@ public function testProductWithoutBaseImage()
             url
             label
         }
+        small_image {
+            url
+            label
+        }
     }
   }    
 }
 QUERY;
         $response = $this->graphQlQuery($query);
         self::assertEquals('Simple Product', $response['products']['items'][0]['image']['label']);
+        self::assertStringEndsWith(
+            'images/product/placeholder/image.jpg',
+            $response['products']['items'][0]['image']['url']
+        );
+        self::assertEquals('Simple Product', $response['products']['items'][0]['small_image']['label']);
+        self::assertStringEndsWith(
+            'images/product/placeholder/small_image.jpg',
+            $response['products']['items'][0]['small_image']['url']
+        );
     }
 
     /**