Merge branch 'B2B-2049' into B2B-2069

NadiyaS · NadiyaS · commit 73dfa1876c51 · 2021-11-09T09:30:02.000-06:00
diff --git a/app/code/Magento/Customer/Model/Metadata/Form/Image.php b/app/code/Magento/Customer/Model/Metadata/Form/Image.php
@@ -22,6 +22,7 @@
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\File\UploaderFactory;
 use Magento\Framework\Filesystem;
+use Magento\Framework\Filesystem\Directory\ReadInterface;
 use Magento\Framework\Filesystem\Directory\WriteFactory;
 use Magento\Framework\Filesystem\Directory\WriteInterface;
 use Magento\Framework\Filesystem\Io\File as IoFileSystem;
@@ -48,10 +49,15 @@ class Image extends File
      */
     private $ioFileSystem;
 
+    /**
+     * @var ReadInterface
+     */
+    private $mediaEntityTmpReadDirectory;
+
     /**
      * @var WriteInterface
      */
-    private $mediaEntityTmpDirectory;
+    private $mediaWriteDirectory;
 
     /**
      * @param TimezoneInterface $localeDate
@@ -71,6 +77,7 @@ class Image extends File
      * @param DirectoryList|null $directoryList
      * @param WriteFactory|null $writeFactory
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      * @throws FileSystemException
      */
     public function __construct(
@@ -109,12 +116,10 @@ public function __construct(
             ->get(ImageContentInterfaceFactory::class);
         $this->ioFileSystem = $ioFileSystem ?: ObjectManager::getInstance()
             ->get(IoFileSystem::class);
-        $writeFactory = $writeFactory ?? ObjectManager::getInstance()->get(WriteFactory::class);
-        $directoryList = $directoryList ?? ObjectManager::getInstance()->get(DirectoryList::class);
-        $this->mediaEntityTmpDirectory = $writeFactory->create(
-            $directoryList->getPath($directoryList::MEDIA)
-            . '/' . $this->_entityTypeCode
-            . '/' . FileProcessor::TMP_DIR
+        $this->mediaWriteDirectory = $fileSystem->getDirectoryWrite(DirectoryList::MEDIA);
+        $this->mediaEntityTmpReadDirectory = $fileSystem->getDirectoryReadByPath(
+            $this->mediaWriteDirectory->getAbsolutePath() . $this->_entityTypeCode
+            . DIRECTORY_SEPARATOR . FileProcessor::TMP_DIR . DIRECTORY_SEPARATOR
         );
     }
 
@@ -224,18 +229,18 @@ protected function processUiComponentValue(array $value)
      */
     protected function processCustomerAddressValue(array $value)
     {
-        $fileName = $this->mediaEntityTmpDirectory
+        $fileName = $this->mediaWriteDirectory
             ->getDriver()
             ->getRealPathSafety(
-                $this->mediaEntityTmpDirectory->getAbsolutePath(
+                $this->mediaEntityTmpReadDirectory->getAbsolutePath(
                     ltrim(
                         $value['file'],
                         '/'
                     )
                 )
             );
         return $this->getFileProcessor()->moveTemporaryFile(
-            $this->mediaEntityTmpDirectory->getRelativePath($fileName)
+            $this->mediaEntityTmpReadDirectory->getRelativePath($fileName)
         );
     }
 
@@ -249,7 +254,7 @@ protected function processCustomerAddressValue(array $value)
     protected function processCustomerValue(array $value)
     {
         $file = ltrim($value['file'], '/');
-        if ($this->mediaEntityTmpDirectory->isExist($file)) {
+        if ($this->mediaEntityTmpReadDirectory->isExist($file)) {
             $temporaryFile = FileProcessor::TMP_DIR . '/' . $file;
             $base64EncodedData = $this->getFileProcessor()->getBase64EncodedData($temporaryFile);
             /** @var ImageContentInterface $imageContentDataObject */
diff --git a/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/ImageTest.php b/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/ImageTest.php
@@ -15,13 +15,12 @@
 use Magento\Customer\Model\Metadata\Form\Image;
 use Magento\Framework\Api\Data\ImageContentInterface;
 use Magento\Framework\Api\Data\ImageContentInterfaceFactory;
-use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\App\Request\Http;
 use Magento\Framework\Exception\FileSystemException;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\File\UploaderFactory;
 use Magento\Framework\Filesystem;
-use Magento\Framework\Filesystem\Directory\WriteFactory;
+use Magento\Framework\Filesystem\Directory\ReadInterface;
 use Magento\Framework\Filesystem\Directory\Write;
 use Magento\Framework\Filesystem\Driver\File as Driver;
 use Magento\Framework\Filesystem\Io\File;
@@ -82,19 +81,14 @@ class ImageTest extends AbstractFormTestCase
     private $ioFileSystemMock;
 
     /**
-     * @var DirectoryList|\PHPUnit\Framework\MockObject\MockObject
+     * @var ReadInterface|\PHPUnit\Framework\MockObject\MockObject
      */
-    private $directoryListMock;
-
-    /**
-     * @var WriteFactory|\PHPUnit\Framework\MockObject\MockObject
-     */
-    private $writeFactoryMock;
+    private $readDirectoryMock;
 
     /**
      * @var Write|\PHPUnit\Framework\MockObject\MockObject
      */
-    private $mediaEntityTmpDirectoryMock;
+    private $mediaWriteDirectoryMock;
 
     /**
      * @var Driver|\PHPUnit\Framework\MockObject\MockObject
@@ -140,23 +134,24 @@ protected function setUp(): void
         $this->ioFileSystemMock = $this->getMockBuilder(File::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->directoryListMock = $this->getMockBuilder(DirectoryList::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->writeFactoryMock = $this->getMockBuilder(WriteFactory::class)
-            ->setMethods(['create'])
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->mediaEntityTmpDirectoryMock = $this->getMockBuilder(Write::class)
+
+        $this->readDirectoryMock = $this->getMockBuilder(ReadInterface::class)
+            ->getMockForAbstractClass();
+        $this->fileSystemMock->expects($this->once())
+            ->method('getDirectoryReadByPath')
+            ->willReturn($this->readDirectoryMock);
+
+        $this->mediaWriteDirectoryMock = $this->getMockBuilder(Write::class)
             ->disableOriginalConstructor()
             ->getMock();
+        $this->fileSystemMock->expects($this->once())
+            ->method('getDirectoryWrite')
+            ->willReturn($this->mediaWriteDirectoryMock);
+
         $this->driverMock = $this->getMockBuilder(Driver::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->writeFactoryMock->expects($this->any())
-            ->method('create')
-            ->willReturn($this->mediaEntityTmpDirectoryMock);
-        $this->mediaEntityTmpDirectoryMock->expects($this->any())
+        $this->mediaWriteDirectoryMock->expects($this->any())
             ->method('getDriver')
             ->willReturn($this->driverMock);
     }
@@ -184,9 +179,7 @@ private function initialize(array $data): Image
             $this->uploaderFactoryMock,
             $this->fileProcessorFactoryMock,
             $this->imageContentFactory,
-            $this->ioFileSystemMock,
-            $this->directoryListMock,
-            $this->writeFactoryMock
+            $this->ioFileSystemMock
         );
     }
 
@@ -470,10 +463,10 @@ public function testCompactValueUiComponentAddress()
             ->method('getRealPathSafety')
             ->with($value['file'])
             ->willReturn($value['file']);
-        $this->mediaEntityTmpDirectoryMock->expects($this->once())
+        $this->readDirectoryMock->expects($this->once())
             ->method('getAbsolutePath')
             ->willReturn($value['file']);
-        $this->mediaEntityTmpDirectoryMock->expects($this->once())
+        $this->readDirectoryMock->expects($this->once())
             ->method('getRelativePath')
             ->willReturn($value['file']);
         $this->fileProcessorMock->expects($this->once())
@@ -505,7 +498,7 @@ public function testCompactValueUiComponentCustomer()
 
         $base64EncodedData = 'encoded_data';
 
-        $this->mediaEntityTmpDirectoryMock->expects($this->once())
+        $this->readDirectoryMock->expects($this->once())
             ->method('isExist')
             ->with($value['file'])
             ->willReturn(true);
@@ -561,7 +554,7 @@ public function testCompactValueUiComponentCustomerNotExists()
             'type' => 'image',
         ];
 
-        $this->mediaEntityTmpDirectoryMock->expects($this->once())
+        $this->readDirectoryMock->expects($this->once())
             ->method('isExist')
             ->with($value['file'])
             ->willReturn(false);
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/Metadata/Form/ImageTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/Metadata/Form/ImageTest.php
@@ -73,20 +73,10 @@ public function setUp(): void
      */
     public function testProcessCustomerAddressValue()
     {
-        $this->mediaDirectory->delete('customer_address');
-        $this->mediaDirectory->create($this->mediaDirectory->getRelativePath('customer_address/tmp/'));
-        $tmpFilePath = $this->mediaDirectory->getAbsolutePath('customer_address/tmp/' . $this->fileName);
-        $this->copyFile($this->imageFixtureDir . DIRECTORY_SEPARATOR . $this->fileName, $tmpFilePath);
+        $entityTypeCode = 'customer_address';
+        $tmpFilePath = $this->prepareImageForTest($entityTypeCode);
 
-        $imageFile = [
-            'name' => $this->fileName,
-            'type' => 'image/jpeg',
-            'tmp_name' => $this->fileName,
-            'file' => $this->fileName,
-            'error' => 0,
-            'size' => 12500,
-            'previewType' => 'image',
-        ];
+        $imageFile = $this->getImageValues();
 
         $params = [
             'entityTypeCode' => 'customer_address',
@@ -119,23 +109,12 @@ public function testProcessCustomerAddressValue()
      */
     public function testProcessCustomerValue()
     {
-        $this->mediaDirectory->delete('customer');
-        $this->mediaDirectory->create($this->mediaDirectory->getRelativePath('customer/tmp/'));
-        $tmpFilePath = $this->mediaDirectory->getAbsolutePath('customer/tmp/' . $this->fileName);
-        $this->copyFile($this->imageFixtureDir . DIRECTORY_SEPARATOR . $this->fileName, $tmpFilePath);
-
-        $imageFile = [
-            'name' => $this->fileName,
-            'type' => 'image/jpeg',
-            'tmp_name' => $this->fileName,
-            'file' => $this->fileName,
-            'error' => 0,
-            'size' => 12500,
-            'previewType' => 'image',
-        ];
+        $entityTypeCode = 'customer';
+        $tmpFilePath = $this->prepareImageForTest($entityTypeCode);
+        $imageFile = $this->getImageValues();
 
         $params = [
-            'entityTypeCode' => 'customer',
+            'entityTypeCode' => $entityTypeCode,
             'formCode' => 'customer_edit',
             'isAjax' => false,
             'value' => $imageFile
@@ -167,23 +146,14 @@ public function testProcessCustomerInvalidValue()
             \Magento\Framework\Exception\ValidatorException::class
         );
 
-        $this->mediaDirectory->delete('customer');
-        $this->mediaDirectory->create($this->mediaDirectory->getRelativePath('customer/tmp/'));
-        $tmpFilePath = $this->mediaDirectory->getAbsolutePath('customer/tmp/' . $this->fileName);
-        $this->copyFile($this->imageFixtureDir . DIRECTORY_SEPARATOR . $this->fileName, $tmpFilePath);
+        $entityTypeCode = 'customer';
+        $this->prepareImageForTest($entityTypeCode);
 
-        $imageFile = [
-            'name' => $this->fileName,
-            'type' => 'image/jpeg',
-            'tmp_name' => $this->fileName,
-            'file' => $this->invalidFileName,
-            'error' => 0,
-            'size' => 12500,
-            'previewType' => 'image',
-        ];
+        $imageFile = $this->getImageValues();
+        $imageFile['file'] = $this->invalidFileName;
 
         $params = [
-            'entityTypeCode' => 'customer',
+            'entityTypeCode' => $entityTypeCode,
             'formCode' => 'customer_edit',
             'isAjax' => false,
             'value' => $imageFile
@@ -199,6 +169,36 @@ public function testProcessCustomerInvalidValue()
         $processCustomerAddressValueMethod->invoke($image, $imageFile);
     }
 
+    /**
+     * Test for _validateByRules method with not existed file
+     *
+     * @magentoAppIsolation enabled
+     *
+     * @throws FileSystemException
+     * @throws \ReflectionException
+     */
+    public function testValidateByRulesWithNotValidFile()
+    {
+        $entityTypeCode = 'customer';
+        $this->mediaDirectory->delete($entityTypeCode);
+        $imageFile = $this->getImageValues();
+        $params = [
+            'entityTypeCode' => $entityTypeCode,
+            'formCode' => 'customer_edit',
+            'isAjax' => false,
+            'value' => $imageFile
+        ];
+
+        $image = $this->objectManager->create(\Magento\Customer\Model\Metadata\Form\Image::class, $params);
+        $processValidateMethod = new \ReflectionMethod(
+            \Magento\Customer\Model\Metadata\Form\Image::class,
+            '_validateByRules'
+        );
+        $processValidateMethod->setAccessible(true);
+        $validationResult = $processValidateMethod->invoke($image, $imageFile);
+        $this->assertEquals('"' . $this->fileName .'" is not a valid file.', $validationResult[0]->__toString());
+    }
+
     /**
      * @inheritdoc
      * @throws FileSystemException
@@ -226,4 +226,38 @@ private function copyFile(string $source, string $destination)
         $driver->createDirectory(dirname($destination));
         $driver->filePutContents($destination, file_get_contents($source));
     }
+
+    /**
+     * Returns image values
+     *
+     * @return array
+     */
+    private function getImageValues(): array
+    {
+        return [
+            'name' => $this->fileName,
+            'type' => 'image/jpeg',
+            'tmp_name' => $this->fileName,
+            'file' => $this->fileName,
+            'error' => 0,
+            'size' => 12500,
+            'previewType' => 'image',
+        ];
+    }
+
+    /**
+     * Copies image from fixture to necessary for test dir
+     *
+     * @param string $entityTypeCode
+     * @return string
+     * @throws FileSystemException
+     */
+    private function prepareImageForTest(string $entityTypeCode): string
+    {
+        $this->mediaDirectory->delete($entityTypeCode);
+        $this->mediaDirectory->create($this->mediaDirectory->getRelativePath($entityTypeCode . '/tmp/'));
+        $tmpFilePath = $this->mediaDirectory->getAbsolutePath($entityTypeCode . '/tmp/' . $this->fileName);
+        $this->copyFile($this->imageFixtureDir . DIRECTORY_SEPARATOR . $this->fileName, $tmpFilePath);
+        return $tmpFilePath;
+    }
 }
