Merge remote-tracking branch 'origin/MC-30234' into 2.4-develop-pr8

Author: serhii-balko

app/code/Magento/Catalog/Model/Product/Image/ParamsBuilder.php

@@ -132,9 +132,10 @@ private function getWatermark(string $type, int $scopeId = null): array
         if ($file) {
             $size = explode(
                 'x',
-                $this->scopeConfig->getValue(
+                (string) $this->scopeConfig->getValue(
                     "design/watermark/{$type}_size",
-                    ScopeInterface::SCOPE_STORE
+                    ScopeInterface::SCOPE_STORE,
+                    $scopeId
                 )
             );
             $opacity = $this->scopeConfig->getValue(

app/code/Magento/Catalog/Test/Unit/Model/Product/Image/ParamsBuilderTest.php

@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Catalog\Test\Unit\Model\Product\Image;
 
@@ -11,10 +12,15 @@
 use Magento\Framework\App\Area;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\Config\View;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\View\ConfigInterface;
 use Magento\Store\Model\ScopeInterface;
+use PHPUnit\Framework\TestCase;
 
-class ParamsBuilderTest extends \PHPUnit\Framework\TestCase
+/**
+ * Test product image params builder
+ */
+class ParamsBuilderTest extends TestCase
 {
     /**
      * @var ScopeConfigInterface
@@ -30,10 +36,17 @@ class ParamsBuilderTest extends \PHPUnit\Framework\TestCase
      * @var ParamsBuilder
      */
     private $model;
+    /**
+     * @var array
+     */
+    private $scopeConfigData = [];
 
+    /**
+     * @inheritDoc
+     */
     protected function setUp()
     {
-        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $objectManager = new ObjectManager($this);
         $this->scopeConfig = $this->createMock(ScopeConfigInterface::class);
         $this->viewConfig = $this->createMock(ConfigInterface::class);
         $this->model = $objectManager->getObject(
@@ -43,28 +56,37 @@ protected function setUp()
                 'viewConfig' => $this->viewConfig,
             ]
         );
+        $this->scopeConfigData = [];
+        $this->scopeConfig->method('getValue')
+            ->willReturnCallback(
+                function ($path, $scopeType, $scopeCode) {
+                    return $this->scopeConfigData[$path][$scopeType][$scopeCode] ?? null;
+                }
+            );
     }
 
     /**
-     * Test watermark location.
+     * Test build() with different parameters and config values
+     *
+     * @param int $scopeId
+     * @param array $config
+     * @param array $imageArguments
+     * @param array $expected
+     * @dataProvider buildDataProvider
      */
-    public function testWatermarkLocation()
+    public function testBuild(int $scopeId, array $config, array $imageArguments, array $expected)
     {
-        $imageArguments = [
-            'type' => 'type',
-            'height' => 'image_height',
-            'width' => 'image_width',
-            'angle' => 'angle',
-            'background' => [1, 2, 3]
+        $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;
+        }
+        $imageArguments += [
+            'type' => 'image',
+            'height' => '600',
+            'width' => '400',
+            'angle' => '45',
+            'background' => [110, 64, 224]
         ];
-        $scopeId = 1;
-        $quality = 100;
-        $file = 'file';
-        $width = 'width';
-        $height = 'height';
-        $size = "{$width}x{$height}";
-        $opacity = 'opacity';
-        $position = 'position';
 
         $viewMock = $this->createMock(View::class);
         $viewMock->expects($this->once())
@@ -77,51 +99,16 @@ public function testWatermarkLocation()
             ->with(['area' => Area::AREA_FRONTEND])
             ->willReturn($viewMock);
 
-        $this->scopeConfig->expects($this->exactly(5))->method('getValue')->withConsecutive(
-            [
-                Image::XML_PATH_JPEG_QUALITY
-            ],
-            [
-                "design/watermark/{$imageArguments['type']}_image",
-                ScopeInterface::SCOPE_STORE,
-                $scopeId,
-            ],
-            [
-                "design/watermark/{$imageArguments['type']}_size",
-                ScopeInterface::SCOPE_STORE],
-            [
-                "design/watermark/{$imageArguments['type']}_imageOpacity",
-                ScopeInterface::SCOPE_STORE,
-                $scopeId
-            ],
-            [
-                "design/watermark/{$imageArguments['type']}_position",
-                ScopeInterface::SCOPE_STORE,
-                $scopeId
-            ]
-        )->willReturnOnConsecutiveCalls(
-            $quality,
-            $file,
-            $size,
-            $opacity,
-            $position
-        );
-
         $actual = $this->model->build($imageArguments, $scopeId);
-        $expected = [
+        $expected += [
             'image_type' => $imageArguments['type'],
             'background' => $imageArguments['background'],
             'angle' => $imageArguments['angle'],
-            'quality' => $quality,
+            'quality' => 80,
             'keep_aspect_ratio' => true,
             'keep_frame' => true,
             'keep_transparency' => true,
             'constrain_only' => true,
-            'watermark_file' => $file,
-            'watermark_image_opacity' => $opacity,
-            'watermark_position' => $position,
-            'watermark_width' => $width,
-            'watermark_height' => $height,
             'image_height' => $imageArguments['height'],
             'image_width' => $imageArguments['width'],
         ];
@@ -131,4 +118,50 @@ public function testWatermarkLocation()
             $actual
         );
     }
+
+    /**
+     * Provides test scenarios for
+     *
+     * @return array
+     */
+    public function buildDataProvider()
+    {
+        return [
+            'watermark config' => [
+                1,
+                [
+                    'design/watermark/small_image_image' => 'stores/1/magento-logo.png',
+                    'design/watermark/small_image_size' => '60x40',
+                    'design/watermark/small_image_imageOpacity' => '50',
+                    'design/watermark/small_image_position' => 'bottom-right',
+                ],
+                [
+                    'type' => 'small_image'
+                ],
+                [
+                    'watermark_file' => 'stores/1/magento-logo.png',
+                    'watermark_image_opacity' => '50',
+                    'watermark_position' => 'bottom-right',
+                    'watermark_width' => '60',
+                    'watermark_height' => '40',
+                ]
+            ],
+            'watermark config empty' => [
+                1,
+                [
+                    '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,
+                ]
+            ]
+        ];
+    }
 }