Merge remote-tracking branch 'origin/MC-29523' into 2.4-develop-pr5

Author: serhii-balko

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

@@ -5,8 +5,12 @@
  */
 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;
+use Magento\Store\Api\Data\StoreInterface;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Catalog category image attribute backend model
@@ -45,7 +49,7 @@ class Image extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
     protected $_logger;
 
     /**
-     * @var \Magento\Catalog\Model\ImageUploader
+     * @var ImageUploader
      */
     private $imageUploader;
 
@@ -54,19 +58,32 @@ class Image extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
      */
     private $additionalData = '_additional_data_';
 
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
     /**
      * @param \Psr\Log\LoggerInterface $logger
      * @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
+        \Magento\MediaStorage\Model\File\UploaderFactory $fileUploaderFactory,
+        StoreManagerInterface $storeManager = null,
+        ImageUploader $imageUploader = 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);
     }
 
     /**
@@ -94,13 +111,13 @@ 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);
+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
+        $imageName = call_user_func([Uploader::class, 'getNewFilename'], $imageAbsolutePath);
 
         return $imageName;
     }
@@ -119,7 +136,18 @@ public function beforeSave($object)
         $attributeName = $this->getAttribute()->getName();
         $value = $object->getData($attributeName);
 
-        if ($this->fileResidesOutsideCategoryDir($value)) {
+        if ($this->isTmpFileAvailable($value) && $imageName = $this->getUploadedImageName($value)) {
+            try {
+                /** @var StoreInterface $store */
+                $store = $this->storeManager->getStore();
+                $baseMediaDir = $store->getBaseMediaDir();
+                $newImgRelativePath = $this->imageUploader->moveFileFromTmp($imageName, true);
+                $value[0]['url'] = '/' . $baseMediaDir . '/' . $newImgRelativePath;
+                $value[0]['name'] = $value[0]['url'];
+            } catch (\Exception $e) {
+                $this->_logger->critical($e);
+            }
+        } elseif ($this->fileResidesOutsideCategoryDir($value)) {
             // use relative path for image attribute so we know it's outside of category dir when we fetch it
             // phpcs:ignore Magento2.Functions.DiscouragedFunction
             $value[0]['url'] = parse_url($value[0]['url'], PHP_URL_PATH);
@@ -139,23 +167,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.
      *
@@ -194,19 +205,10 @@ private function fileResidesOutsideCategoryDir($value)
      *
      * @param \Magento\Framework\DataObject $object
      * @return \Magento\Catalog\Model\Category\Attribute\Backend\Image
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function afterSave($object)
     {
-        $value = $object->getData($this->additionalData . $this->getAttribute()->getName());
-
-        if ($this->isTmpFileAvailable($value) && $imageName = $this->getUploadedImageName($value)) {
-            try {
-                $this->getImageUploader()->moveFileFromTmp($imageName);
-            } catch (\Exception $e) {
-                $this->_logger->critical($e);
-            }
-        }
-
         return $this;
     }
 }

app/code/Magento/Catalog/Model/ImageUploader.php

@@ -191,12 +191,12 @@ public function getFilePath($path, $imageName)
      * Checking file for moving and move it
      *
      * @param string $imageName
-     *
+     * @param bool $returnRelativePath
      * @return string
      *
      * @throws \Magento\Framework\Exception\LocalizedException
      */
-    public function moveFileFromTmp($imageName)
+    public function moveFileFromTmp($imageName, $returnRelativePath = false)
     {
         $baseTmpPath = $this->getBaseTmpPath();
         $basePath = $this->getBasePath();
@@ -226,7 +226,7 @@ public function moveFileFromTmp($imageName)
             );
         }
 
-        return $imageName;
+        return $returnRelativePath ? $baseImagePath : $imageName;
     }
 
     /**