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

Author: StasKozar

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

@@ -5,7 +5,6 @@
  */
 namespace Magento\Catalog\Model\Category\Attribute\Backend;
 
-use Magento\Catalog\Model\ImageUploader;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\File\Uploader;
 
@@ -137,15 +136,15 @@ public function beforeSave($object)
     }
 
     /**
-     * @return ImageUploader
+     * @return \Magento\Catalog\Model\ImageUploader
      *
      * @deprecated 101.0.0
      */
     private function getImageUploader()
     {
         if ($this->imageUploader === null) {
             $this->imageUploader = \Magento\Framework\App\ObjectManager::getInstance()
-                ->get(ImageUploader::class);
+                ->get(\Magento\Catalog\CategoryImageUpload::class);
         }
 
         return $this->imageUploader;

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

@@ -5,7 +5,6 @@
  */
 namespace Magento\Catalog\Test\Unit\Model\Category\Attribute\Backend;
 
-use Magento\Catalog\Model\ImageUploader;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Filesystem\Directory\WriteInterface;
 
@@ -269,7 +268,7 @@ private function setUpModelForAfterSave()
         $objectManagerMock->expects($this->any())
             ->method('get')
             ->will($this->returnCallback(function ($class, $params = []) use ($imageUploaderMock) {
-                if ($class == ImageUploader::class) {
+                if ($class == \Magento\Catalog\CategoryImageUpload::class) {
                     return $imageUploaderMock;
                 }