Merge remote-tracking branch 'origin/MC-40689' into 2.4.3-develop-pr124

Author: zakdma

app/code/Magento/Customer/Model/Metadata/Form/File.php

@@ -14,6 +14,7 @@
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\File\UploaderFactory;
 use Magento\Framework\Filesystem;
+use Magento\Framework\Filesystem\Io\File as IoFile;
 
 /**
  * Processes files that are save for customer.
@@ -62,6 +63,11 @@ class File extends AbstractData
      */
     protected $fileProcessorFactory;
 
+    /**
+     * @var IoFile|null
+     */
+    private $ioFile;
+
     /**
      * Constructor
      *
@@ -77,6 +83,7 @@ class File extends AbstractData
      * @param Filesystem $fileSystem
      * @param UploaderFactory $uploaderFactory
      * @param \Magento\Customer\Model\FileProcessorFactory|null $fileProcessorFactory
+     * @param IoFile|null $ioFile
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -91,7 +98,8 @@ public function __construct(
         \Magento\MediaStorage\Model\File\Validator\NotProtectedExtension $fileValidator,
         Filesystem $fileSystem,
         UploaderFactory $uploaderFactory,
-        \Magento\Customer\Model\FileProcessorFactory $fileProcessorFactory = null
+        \Magento\Customer\Model\FileProcessorFactory $fileProcessorFactory = null,
+        IoFile $ioFile = null
     ) {
         $value = $this->prepareFileValue($value);
         parent::__construct($localeDate, $logger, $attribute, $localeResolver, $value, $entityTypeCode, $isAjax);
@@ -102,6 +110,8 @@ public function __construct(
         $this->fileProcessorFactory = $fileProcessorFactory ?: ObjectManager::getInstance()
             ->get(FileProcessorFactory::class);
         $this->fileProcessor = $this->fileProcessorFactory->create(['entityTypeCode' => $this->_entityTypeCode]);
+        $this->ioFile = $ioFile ?: ObjectManager::getInstance()
+            ->get(IoFile::class);
     }
 
     /**
@@ -183,7 +193,7 @@ protected function _validateByRules($value)
     {
         $label = $value['name'];
         $rules = $this->getAttribute()->getValidationRules();
-        $extension = $this->getFileExtension($value['name']);
+        $extension = $this->ioFile->getPathInfo($value['name'])['extension'];
         $fileExtensions = ArrayObjectSearch::getArrayElementByName(
             $rules,
             'file_extensions'
@@ -221,28 +231,6 @@ protected function _validateByRules($value)
         return [];
     }
 
-    /**
-     * Get file extension from the file if it exists, otherwise, get from filename.
-     *
-     * @param string $fileName
-     * @return string
-     */
-    private function getFileExtension(string $fileName): string
-    {
-        return pathinfo($fileName, PATHINFO_EXTENSION);
-    }
-
-    /**
-     * Get file basename from the file if it exists, otherwise, get from filename.
-     *
-     * @param string $fileName
-     * @return string
-     */
-    private function getFileBasename(string $fileName): string
-    {
-        return pathinfo($fileName, PATHINFO_BASENAME);
-    }
-
     /**
      * Helper function that checks if the file was uploaded.
      *
@@ -259,7 +247,7 @@ protected function _isUploadedFile($filename)
         }
 
         // This case is required for file uploader UI component
-        $temporaryFile = FileProcessor::TMP_DIR . '/' . $this->getFileBasename($filename);
+        $temporaryFile = FileProcessor::TMP_DIR . '/' . $this->ioFile->getPathInfo($filename)['basename'];
         if ($this->fileProcessor->isExist($temporaryFile)) {
             return true;
         }