Merge branch 'ACP2E-1959' of https://github.com/magento-l3/magento2ce into PR-L3-08112023

chittima · chittima · commit ba4ba91144d0 · 2023-09-14T15:04:20.000-05:00
diff --git a/app/code/Magento/Catalog/Model/Product/Image/ParamsBuilder.php b/app/code/Magento/Catalog/Model/Product/Image/ParamsBuilder.php
@@ -7,8 +7,13 @@
 
 namespace Magento\Catalog\Model\Product\Image;
 
+use Magento\Framework\App\Area;
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\View\ConfigInterface;
+use Magento\Framework\View\Design\Theme\FlyweightFactory;
+use Magento\Framework\View\Design\ThemeInterface;
+use Magento\Framework\View\DesignInterface;
 use Magento\Store\Model\ScopeInterface;
 use Magento\Catalog\Model\Product\Image;
 
@@ -52,16 +57,42 @@ class ParamsBuilder
      */
     private $viewConfig;
 
+    /**
+     * @var DesignInterface
+     */
+    private $design;
+
+    /**
+     * @var FlyweightFactory
+     */
+    private $themeFactory;
+
+    /**
+     * @var ThemeInterface
+     */
+    private $currentTheme;
+
+    /**
+     * @var array
+     */
+    private $themesList = [];
+
     /**
      * @param ScopeConfigInterface $scopeConfig
      * @param ConfigInterface $viewConfig
+     * @param DesignInterface|null $designInterface
+     * @param FlyweightFactory|null $themeFactory
      */
     public function __construct(
         ScopeConfigInterface $scopeConfig,
-        ConfigInterface $viewConfig
+        ConfigInterface $viewConfig,
+        DesignInterface $designInterface = null,
+        FlyweightFactory $themeFactory = null
     ) {
         $this->scopeConfig = $scopeConfig;
         $this->viewConfig = $viewConfig;
+        $this->design = $designInterface ?? ObjectManager::getInstance()->get(DesignInterface::class);
+        $this->themeFactory = $themeFactory ?? ObjectManager::getInstance()->get(FlyweightFactory::class);
     }
 
     /**
@@ -75,6 +106,8 @@ public function __construct(
      */
     public function build(array $imageArguments, int $scopeId = null): array
     {
+        $this->determineCurrentTheme($scopeId);
+
         $miscParams = [
             'image_type' => $imageArguments['type'] ?? null,
             'image_height' => $imageArguments['height'] ?? null,
@@ -87,6 +120,25 @@ public function build(array $imageArguments, int $scopeId = null): array
         return array_merge($miscParams, $overwritten, $watermark);
     }
 
+    /**
+     * Determine the theme assigned to passed scope id
+     *
+     * @param int|null $scopeId
+     * @return void
+     */
+    private function determineCurrentTheme(int $scopeId = null): void
+    {
+        if (is_numeric($scopeId) || !$this->currentTheme) {
+            $themeId = $this->design->getConfigurationDesignTheme(Area::AREA_FRONTEND, ['store' => $scopeId]);
+            if (isset($this->themesList[$themeId])) {
+                $this->currentTheme = $this->themesList[$themeId];
+            } else {
+                $this->currentTheme = $this->themeFactory->create($themeId);
+                $this->themesList[$themeId] = $this->currentTheme;
+            }
+        }
+    }
+
     /**
      * Overwrite default values
      *
@@ -170,7 +222,11 @@ private function getWatermark(string $type, int $scopeId = null): array
      */
     private function hasDefaultFrame(): bool
     {
-        return (bool) $this->viewConfig->getViewConfig(['area' => \Magento\Framework\App\Area::AREA_FRONTEND])
-            ->getVarValue('Magento_Catalog', 'product_image_white_borders');
+        return (bool) $this->viewConfig->getViewConfig(
+            [
+                'area' => \Magento\Framework\App\Area::AREA_FRONTEND,
+                'themeModel' => $this->currentTheme
+            ]
+        )->getVarValue('Magento_Catalog', 'product_image_white_borders');
     }
 }
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Image/ParamsBuilderTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Image/ParamsBuilderTest.php
@@ -14,6 +14,9 @@
 use Magento\Framework\Config\View;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\View\ConfigInterface;
+use Magento\Framework\View\Design\Theme\FlyweightFactory;
+use Magento\Framework\View\Design\ThemeInterface;
+use Magento\Framework\View\DesignInterface;
 use Magento\Store\Model\ScopeInterface;
 use PHPUnit\Framework\TestCase;
 
@@ -41,6 +44,21 @@ class ParamsBuilderTest extends TestCase
      */
     private $scopeConfigData = [];
 
+    /**
+     * @var DesignInterface
+     */
+    private $design;
+
+    /**
+     * @var FlyweightFactory
+     */
+    private $themeFactory;
+
+    /**
+     * @var ThemeInterface
+     */
+    private $theme;
+
     /**
      * @inheritDoc
      */
@@ -49,11 +67,19 @@ protected function setUp(): void
         $objectManager = new ObjectManager($this);
         $this->scopeConfig = $this->getMockForAbstractClass(ScopeConfigInterface::class);
         $this->viewConfig = $this->getMockForAbstractClass(ConfigInterface::class);
+        $this->design = $this->getMockBuilder(DesignInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $this->themeFactory = $this->createMock(FlyweightFactory::class);
+        $this->theme = $this->getMockForAbstractClass(ThemeInterface::class);
+
         $this->model = $objectManager->getObject(
             ParamsBuilder::class,
             [
                 'scopeConfig' => $this->scopeConfig,
                 'viewConfig' => $this->viewConfig,
+                'design' => $this->design,
+                'themeFactory' => $this->themeFactory
             ]
         );
         $this->scopeConfigData = [];
@@ -69,13 +95,21 @@ function ($path, $scopeType, $scopeCode) {
      * Test build() with different parameters and config values
      *
      * @param int $scopeId
+     * @param string $themeId
+     * @param bool $keepFrame
      * @param array $config
      * @param array $imageArguments
      * @param array $expected
      * @dataProvider buildDataProvider
      */
-    public function testBuild(int $scopeId, array $config, array $imageArguments, array $expected)
-    {
+    public function testBuild(
+        int $scopeId,
+        string $themeId,
+        bool $keepFrame,
+        array $config,
+        array $imageArguments,
+        array $expected
+    ) {
         $this->scopeConfigData[Image::XML_PATH_JPEG_QUALITY][ScopeConfigInterface::SCOPE_TYPE_DEFAULT][null] = 80;
         foreach ($config as $path => $value) {
             $this->scopeConfigData[$path][ScopeInterface::SCOPE_STORE][$scopeId] = $value;
@@ -88,15 +122,23 @@ public function testBuild(int $scopeId, array $config, array $imageArguments, ar
             'background' => [110, 64, 224]
         ];
 
+        $this->design->expects($this->once())
+            ->method('getConfigurationDesignTheme')
+            ->willReturn($themeId);
+        $this->themeFactory->expects($this->once())
+            ->method('create')
+            ->with($themeId)
+            ->willReturn($this->theme);
+
         $viewMock = $this->createMock(View::class);
         $viewMock->expects($this->once())
             ->method('getVarValue')
             ->with('Magento_Catalog', 'product_image_white_borders')
-            ->willReturn(true);
+            ->willReturn($keepFrame);
 
         $this->viewConfig->expects($this->once())
             ->method('getViewConfig')
-            ->with(['area' => Area::AREA_FRONTEND])
+            ->with(['area' => Area::AREA_FRONTEND, 'themeModel' => $this->theme])
             ->willReturn($viewMock);
 
         $actual = $this->model->build($imageArguments, $scopeId);
@@ -106,7 +148,6 @@ public function testBuild(int $scopeId, array $config, array $imageArguments, ar
             'angle' => $imageArguments['angle'],
             'quality' => 80,
             'keep_aspect_ratio' => true,
-            'keep_frame' => true,
             'keep_transparency' => true,
             'constrain_only' => true,
             'image_height' => $imageArguments['height'],
@@ -129,6 +170,8 @@ public function buildDataProvider()
         return [
             'watermark config' => [
                 1,
+                '1',
+                true,
                 [
                     'design/watermark/small_image_image' => 'stores/1/magento-logo.png',
                     'design/watermark/small_image_size' => '60x40',
@@ -144,10 +187,32 @@ public function buildDataProvider()
                     'watermark_position' => 'bottom-right',
                     'watermark_width' => '60',
                     'watermark_height' => '40',
+                    'keep_frame' => true
                 ]
             ],
             'watermark config empty' => [
                 1,
+                '1',
+                true,
+                [
+                    'design/watermark/small_image_image' => 'stores/1/magento-logo.png',
+                ],
+                [
+                    'type' => 'small_image'
+                ],
+                [
+                    'watermark_file' => 'stores/1/magento-logo.png',
+                    'watermark_image_opacity' => null,
+                    'watermark_position' => null,
+                    'watermark_width' => null,
+                    'watermark_height' => null,
+                    'keep_frame' => true
+                ]
+            ],
+            'watermark empty with no border' => [
+                2,
+                '2',
+                false,
                 [
                     'design/watermark/small_image_image' => 'stores/1/magento-logo.png',
                 ],
@@ -160,6 +225,7 @@ public function buildDataProvider()
                     'watermark_position' => null,
                     'watermark_width' => null,
                     'watermark_height' => null,
+                    'keep_frame' => false
                 ]
             ]
         ];
