Merge pull request #6743 from magento-tsg/MC-41675

[Arrows] MC-41675: [2.3.7] Could not load file to Customer attribute type file

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 FileIo;
 
 /**
  * Processes files that are save for customer.
@@ -62,6 +63,11 @@ class File extends AbstractData
      */
     protected $fileProcessorFactory;
 
+    /**
+     * @var FileIo
+     */
+    private $fileIo;
+
     /**
      * Constructor
      *
@@ -77,6 +83,7 @@ class File extends AbstractData
      * @param Filesystem $fileSystem
      * @param UploaderFactory $uploaderFactory
      * @param \Magento\Customer\Model\FileProcessorFactory|null $fileProcessorFactory
+     * @param FileIo|null $fileIo
      * @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,
+        FileIo $fileIo = null
     ) {
         parent::__construct($localeDate, $logger, $attribute, $localeResolver, $value, $entityTypeCode, $isAjax);
         $this->urlEncoder = $urlEncoder;
@@ -101,6 +109,8 @@ public function __construct(
         $this->fileProcessorFactory = $fileProcessorFactory ?: ObjectManager::getInstance()
             ->get(\Magento\Customer\Model\FileProcessorFactory::class);
         $this->fileProcessor = $this->fileProcessorFactory->create(['entityTypeCode' => $this->_entityTypeCode]);
+        $this->fileIo = $fileIo ?: ObjectManager::getInstance()
+            ->get(FileIo::class);
     }
 
     /**
@@ -176,7 +186,7 @@ protected function _validateByRules($value)
     {
         $label = $value['name'];
         $rules = $this->getAttribute()->getValidationRules();
-        $extension = $this->fileProcessor->getStat($value['name'])['extension'];
+        $extension = $this->fileIo->getPathInfo($value['name'])['extension'];
         $fileExtensions = ArrayObjectSearch::getArrayElementByName(
             $rules,
             'file_extensions'
@@ -230,7 +240,7 @@ protected function _isUploadedFile($filename)
         }
 
         // This case is required for file uploader UI component
-        $temporaryFile = FileProcessor::TMP_DIR . '/' . $this->fileProcessor->getStat($filename)['basename'];
+        $temporaryFile = FileProcessor::TMP_DIR . '/' . $this->fileIo->getPathInfo($filename)['basename'];
         if ($this->fileProcessor->isExist($temporaryFile)) {
             return true;
         }

app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/FileTest.php

@@ -18,6 +18,7 @@
 use Magento\Framework\File\UploaderFactory;
 use Magento\Framework\Filesystem;
 use Magento\Framework\Filesystem\Directory\WriteInterface;
+use Magento\Framework\Filesystem\Io\File as FileIo;
 use Magento\Framework\Url\EncoderInterface;
 use Magento\MediaStorage\Model\File\Validator\NotProtectedExtension;
 use PHPUnit\Framework\MockObject\MockObject;
@@ -64,6 +65,14 @@ class FileTest extends AbstractFormTestCase
      */
     private $fileProcessorFactoryMock;
 
+    /**
+     * @var FileIo|MockObject
+     */
+    private $fileIoMock;
+
+    /**
+     * @inheritDoc
+     */
     protected function setUp(): void
     {
         parent::setUp();
@@ -90,6 +99,7 @@ protected function setUp(): void
         $this->fileProcessorFactoryMock->expects($this->any())
             ->method('create')
             ->willReturn($this->fileProcessorMock);
+        $this->fileIoMock = $this->createMock(FileIo::class);
     }
 
     /**
@@ -297,8 +307,9 @@ public function testValidateValueToUpload($expected, $value, $parameters = [])
             $parameters['valid']
         );
 
-        $this->fileProcessorMock->expects($this->any())
-            ->method('getStat')
+        $this->fileIoMock->expects($this->any())
+            ->method('getPathInfo')
+            ->with($value['name'])
             ->willReturn([
                 'extension' => $value['extension'],
                 'basename' => $value['basename']

app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/ImageTest.php

@@ -201,14 +201,6 @@ public function testValidateIsNotValidFile()
             ->method('getStoreLabel')
             ->willReturn('File Input Field Label');
 
-        $this->fileProcessorMock->expects($this->once())
-            ->method('getStat')
-            ->with($value['tmp_name'])
-            ->willReturn([
-                'extension' => 'txt',
-                'basename' => 'tmp_file.txt',
-            ]);
-
         $this->fileProcessorMock->expects($this->once())
             ->method('isExist')
             ->with(FileProcessor::TMP_DIR . '/' . $value['tmp_name'])
@@ -238,14 +230,6 @@ public function testValidate()
             ->method('getStoreLabel')
             ->willReturn('File Input Field Label');
 
-        $this->fileProcessorMock->expects($this->once())
-            ->method('getStat')
-            ->with($value['tmp_name'])
-            ->willReturn([
-                'extension' => 'gif',
-                'basename' => 'logo.gif',
-            ]);
-
         $this->fileProcessorMock->expects($this->once())
             ->method('isExist')
             ->with(FileProcessor::TMP_DIR . '/' . $value['name'])
@@ -299,14 +283,6 @@ public function testValidateMaxFileSize()
             ->method('getValidationRules')
             ->willReturn([$validationRuleMock]);
 
-        $this->fileProcessorMock->expects($this->once())
-            ->method('getStat')
-            ->with($value['tmp_name'])
-            ->willReturn([
-                'extension' => 'gif',
-                'basename' => 'logo.gif',
-            ]);
-
         $this->fileProcessorMock->expects($this->once())
             ->method('isExist')
             ->with(FileProcessor::TMP_DIR . '/' . $value['name'])
@@ -359,14 +335,6 @@ public function testValidateMaxImageWidth()
             ->method('getValidationRules')
             ->willReturn([$validationRuleMock]);
 
-        $this->fileProcessorMock->expects($this->once())
-            ->method('getStat')
-            ->with($value['tmp_name'])
-            ->willReturn([
-                'extension' => 'gif',
-                'basename' => 'logo.gif',
-            ]);
-
         $this->fileProcessorMock->expects($this->once())
             ->method('isExist')
             ->with(FileProcessor::TMP_DIR . '/' . $value['name'])
@@ -419,14 +387,6 @@ public function testValidateMaxImageHeight()
             ->method('getValidationRules')
             ->willReturn([$validationRuleMock]);
 
-        $this->fileProcessorMock->expects($this->once())
-            ->method('getStat')
-            ->with($value['tmp_name'])
-            ->willReturn([
-                'extension' => 'gif',
-                'basename' => 'logo.gif',
-            ]);
-
         $this->fileProcessorMock->expects($this->once())
             ->method('isExist')
             ->with(FileProcessor::TMP_DIR . '/' . $value['name'])