MC-17765: Category A image replaced by uploading to Category B

Author: StasKozar

app/code/Magento/Catalog/Model/Category/Attribute/Backend/Image.php

@@ -70,8 +70,7 @@ public function __construct(
     }
 
     /**
-     * Gets image name from $value array.
-     * Will return empty string in a case when $value is not an array
+     * Gets image name from $value array. Will return empty string in a case when $value is not an array.
      *
      * @param array $value Attribute value
      * @return string
@@ -107,8 +106,7 @@ private function checkUniqueImageName(string $imageName): string
     }
 
     /**
-     * Avoiding saving potential upload data to DB
-     * Will set empty image attribute value if image was not uploaded
+     * Avoiding saving potential upload data to DB. Will set empty image attribute value if image was not uploaded.
      *
      * @param \Magento\Framework\DataObject $object
      * @return $this
@@ -136,6 +134,8 @@ public function beforeSave($object)
     }
 
     /**
+     * Get image uploader.
+     *
      * @return \Magento\Catalog\Model\ImageUploader
      *
      * @deprecated 101.0.0

app/code/Magento/Catalog/Test/Unit/Model/Category/Attribute/Backend/ImageTest.php

@@ -8,6 +8,10 @@
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Filesystem\Directory\WriteInterface;
 
+/**
+ * Test for Magento\Catalog\Model\Category\Attribute\Backend\Image class.
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class ImageTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -96,9 +100,7 @@ public function testBeforeSaveValueDeletion($value)
         $model = $this->objectManager->getObject(\Magento\Catalog\Model\Category\Attribute\Backend\Image::class);
         $model->setAttribute($this->attribute);
 
-        $object = new \Magento\Framework\DataObject([
-            'test_attribute' => $value
-        ]);
+        $object = new \Magento\Framework\DataObject(['test_attribute' => $value]);
 
         $model->beforeSave($object);
 
@@ -133,9 +135,7 @@ public function testBeforeSaveValueInvalid($value)
         $model = $this->objectManager->getObject(\Magento\Catalog\Model\Category\Attribute\Backend\Image::class);
         $model->setAttribute($this->attribute);
 
-        $object = new \Magento\Framework\DataObject([
-            'test_attribute' => $value
-        ]);
+        $object = new \Magento\Framework\DataObject(['test_attribute' => $value]);
 
         $model->beforeSave($object);
 
@@ -163,11 +163,13 @@ public function testBeforeSaveAttributeFileName()
             ->with('absolute/path/base/path/test123.jpg')
             ->willReturn(false);
 
-        $object = new \Magento\Framework\DataObject([
-            'test_attribute' => [
-                ['name' => 'test123.jpg']
+        $object = new \Magento\Framework\DataObject(
+            [
+                'test_attribute' => [
+                    ['name' => 'test123.jpg'],
+                ],
             ]
-        ]);
+        );
 
         $model->beforeSave($object);
 
@@ -193,14 +195,16 @@ public function testBeforeSaveAttributeFileNameOutsideOfCategoryDir()
             ->with(DirectoryList::MEDIA)
             ->willReturn('pub/media');
 
-        $object = new \Magento\Framework\DataObject([
-            'test_attribute' => [
-                [
-                    'name' => '/test123.jpg',
-                    'url' => '/pub/media/wysiwyg/test123.jpg',
-                ]
+        $object = new \Magento\Framework\DataObject(
+            [
+                'test_attribute' => [
+                    [
+                        'name' => '/test123.jpg',
+                        'url' => '/pub/media/wysiwyg/test123.jpg',
+                    ],
+                ],
             ]
-        ]);
+        );
 
         $model->beforeSave($object);
 
@@ -225,17 +229,22 @@ public function testBeforeSaveTemporaryAttribute()
             ->with(DirectoryList::MEDIA)
             ->willReturn($mediaDirectoryMock);
 
-        $object = new \Magento\Framework\DataObject([
-            'test_attribute' => [
-                ['name' => 'test123.jpg', 'tmp_name' => 'abc123', 'url' => 'http://www.example.com/test123.jpg']
+        $object = new \Magento\Framework\DataObject(
+            [
+                'test_attribute' => [
+                    ['name' => 'test123.jpg', 'tmp_name' => 'abc123', 'url' => 'http://www.example.com/test123.jpg'],
+                ],
             ]
-        ]);
+        );
 
         $model->beforeSave($object);
 
-        $this->assertEquals([
-            ['name' => 'test123.jpg', 'tmp_name' => 'abc123', 'url' => 'http://www.example.com/test123.jpg']
-        ], $object->getData('_additional_data_test_attribute'));
+        $this->assertEquals(
+            [
+                ['name' => 'test123.jpg', 'tmp_name' => 'abc123', 'url' => 'http://www.example.com/test123.jpg'],
+            ],
+            $object->getData('_additional_data_test_attribute')
+        );
     }
 
     /**
@@ -246,9 +255,7 @@ public function testBeforeSaveAttributeStringValue()
         $model = $this->objectManager->getObject(\Magento\Catalog\Model\Category\Attribute\Backend\Image::class);
         $model->setAttribute($this->attribute);
 
-        $object = new \Magento\Framework\DataObject([
-            'test_attribute' => 'test123.jpg'
-        ]);
+        $object = new \Magento\Framework\DataObject(['test_attribute' => 'test123.jpg']);
 
         $model->beforeSave($object);
 
@@ -267,19 +274,26 @@ private function setUpModelForAfterSave()
 
         $objectManagerMock->expects($this->any())
             ->method('get')
-            ->will($this->returnCallback(function ($class, $params = []) use ($imageUploaderMock) {
-                if ($class == \Magento\Catalog\CategoryImageUpload::class) {
-                    return $imageUploaderMock;
-                }
-
-                return $this->objectManager->get($class, $params);
-            }));
-
-        $model = $this->objectManager->getObject(\Magento\Catalog\Model\Category\Attribute\Backend\Image::class, [
-            'objectManager' => $objectManagerMock,
-            'logger' => $this->logger,
-            'filesystem' => $this->filesystem,
-        ]);
+            ->will(
+                $this->returnCallback(
+                    function ($class, $params = []) use ($imageUploaderMock) {
+                        if ($class == \Magento\Catalog\CategoryImageUpload::class) {
+                            return $imageUploaderMock;
+                        }
+
+                        return $this->objectManager->get($class, $params);
+                    }
+                )
+            );
+
+        $model = $this->objectManager->getObject(
+            \Magento\Catalog\Model\Category\Attribute\Backend\Image::class,
+            [
+                'objectManager' => $objectManagerMock,
+                'logger' => $this->logger,
+                'filesystem' => $this->filesystem,
+            ]
+        );
         $this->objectManager->setBackwardCompatibleProperty($model, 'imageUploader', $this->imageUploader);
 
         return $model->setAttribute($this->attribute);