Merge remote-tracking branch 'tango/MC-29519' into MC-29519

Author: dhorytskyi

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

@@ -5,6 +5,7 @@
  */
 namespace Magento\Catalog\Model\Category\Attribute\Backend;
 
+use Magento\Catalog\Model\ImageUploader;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\File\Uploader;
@@ -48,7 +49,7 @@ class Image extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
     protected $_logger;
 
     /**
-     * @var \Magento\Catalog\Model\ImageUploader
+     * @var ImageUploader
      */
     private $imageUploader;
 
@@ -67,18 +68,22 @@ class Image extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
      * @param \Magento\Framework\Filesystem $filesystem
      * @param \Magento\MediaStorage\Model\File\UploaderFactory $fileUploaderFactory
      * @param StoreManagerInterface $storeManager
+     * @param ImageUploader $imageUploader
      */
     public function __construct(
         \Psr\Log\LoggerInterface $logger,
         \Magento\Framework\Filesystem $filesystem,
         \Magento\MediaStorage\Model\File\UploaderFactory $fileUploaderFactory,
-        StoreManagerInterface $storeManager = null
+        StoreManagerInterface $storeManager = null,
+        ImageUploader $imageUploader = null
     ) {
         $this->_filesystem = $filesystem;
         $this->_fileUploaderFactory = $fileUploaderFactory;
         $this->_logger = $logger;
-        $this->storeManager = $storeManager ?
-            $storeManager : ObjectManager::getInstance()->get(StoreManagerInterface::class);
+        $this->storeManager = $storeManager ??
+            ObjectManager::getInstance()->get(StoreManagerInterface::class);
+        $this->imageUploader = $imageUploader ??
+            ObjectManager::getInstance()->get(ImageUploader::class);
     }
 
     /**
@@ -107,10 +112,9 @@ private function getUploadedImageName($value)
      */
     private function checkUniqueImageName(string $imageName): string
     {
-        $imageUploader = $this->getImageUploader();
         $mediaDirectory = $this->_filesystem->getDirectoryWrite(DirectoryList::MEDIA);
         $imageAbsolutePath = $mediaDirectory->getAbsolutePath(
-            $imageUploader->getBasePath() . DIRECTORY_SEPARATOR . $imageName
+            $this->imageUploader->getBasePath() . DIRECTORY_SEPARATOR . $imageName
         );
 
         $imageName = Uploader::getNewFilename($imageAbsolutePath);
@@ -138,7 +142,7 @@ public function beforeSave($object)
                 /** @var StoreInterface $store */
                 $store = $this->storeManager->getStore();
                 $baseMediaDir = $store->getBaseMediaDir();
-                $newImgRelativePath = $this->getImageUploader()->moveFileFromTmp($imageName, true);
+                $newImgRelativePath = $this->imageUploader->moveFileFromTmp($imageName, true);
                 $value[0]['url'] = '/' . $baseMediaDir . '/' . $newImgRelativePath;
                 $value[0]['name'] = $value[0]['url'];
             } catch (\Exception $e) {
@@ -164,23 +168,6 @@ public function beforeSave($object)
         return parent::beforeSave($object);
     }
 
-    /**
-     * Get Instance of Category Image Uploader.
-     *
-     * @return \Magento\Catalog\Model\ImageUploader
-     *
-     * @deprecated 101.0.0
-     */
-    private function getImageUploader()
-    {
-        if ($this->imageUploader === null) {
-            $this->imageUploader = \Magento\Framework\App\ObjectManager::getInstance()
-                ->get(\Magento\Catalog\CategoryImageUpload::class);
-        }
-
-        return $this->imageUploader;
-    }
-
     /**
      * Check if temporary file is available for new image upload.
      *

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

@@ -320,7 +320,7 @@ private function setUpModelForTests()
             ->will(
                 $this->returnCallback(
                     function ($class, $params = []) use ($imageUploaderMock) {
-                        if ($class == \Magento\Catalog\CategoryImageUpload::class) {
+                        if ($class == "\Magento\Catalog\CategoryImageUpload") {
                             return $imageUploaderMock;
                         }
 

app/code/Magento/Catalog/etc/di.xml

@@ -238,6 +238,11 @@
             <argument name="imageUploader" xsi:type="object">Magento\Catalog\CategoryImageUpload</argument>
         </arguments>
     </type>
+    <type name="Magento\Catalog\Model\Category\Attribute\Backend\Image">
+        <arguments>
+            <argument name="imageUploader" xsi:type="object">Magento\Catalog\CategoryImageUpload</argument>
+        </arguments>
+    </type>
     <type name="Magento\Catalog\Model\Session">
         <arguments>
             <argument name="storage" xsi:type="object">Magento\Catalog\Model\Session\Storage</argument>