MC-29519: Category image saves to pub/media/catalog/tmp/category

Author: Roman Lytvynenko

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

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

@@ -238,11 +238,6 @@
             <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>