Merge remote-tracking branch 'origin/B2B-2060' into B2B-2022

Author: avattam06

app/code/Magento/Catalog/Model/Webapi/Product/Option/Type/File/Processor.php

@@ -40,8 +40,11 @@ public function __construct(
     }
 
     /**
+     * Saves file
+     *
      * @param ImageContentInterface $imageContent
      * @return string
+     * @throws \Magento\Framework\Exception\InputException
      */
     protected function saveFile(ImageContentInterface $imageContent)
     {
@@ -50,6 +53,8 @@ protected function saveFile(ImageContentInterface $imageContent)
     }
 
     /**
+     * Save file content and return file details
+     *
      * @param ImageContentInterface $imageContent
      * @return array
      * @throws \Magento\Framework\Exception\LocalizedException
@@ -58,16 +63,19 @@ public function processFileContent(ImageContentInterface $imageContent)
     {
         $filePath = $this->saveFile($imageContent);
 
-        $fileAbsolutePath = $this->filesystem->getDirectoryRead(DirectoryList::MEDIA)->getAbsolutePath($filePath);
-        $fileHash = hash('sha256', $this->filesystem->getDirectoryRead(DirectoryList::MEDIA)->readFile($filePath));
-        $imageSize = getimagesize($fileAbsolutePath);
+        $mediaDirectory = $this->filesystem->getDirectoryRead(DirectoryList::MEDIA);
+        $fileAbsolutePath = $mediaDirectory->getAbsolutePath($filePath);
+        $fileContent = $mediaDirectory->readFile($filePath);
+        $fileHash = hash('sha256', $fileContent);
+        $imageSize = getimagesizefromstring($fileContent);
+        $stat = $mediaDirectory->stat($fileAbsolutePath);
         $result = [
             'type' => $imageContent->getType(),
             'title' => $imageContent->getName(),
             'fullpath' => $fileAbsolutePath,
             'quote_path' => $filePath,
             'order_path' => $filePath,
-            'size' => filesize($fileAbsolutePath),
+            'size' => $stat['size'],
             'width' => $imageSize ? $imageSize[0] : 0,
             'height' => $imageSize ? $imageSize[1] : 0,
             'secret_key' => substr($fileHash, 0, 20),

dev/tests/integration/testsuite/Magento/Catalog/Model/Webapi/Product/Option/Type/File/ProcessorTest.php

@@ -29,23 +29,33 @@ public function testProcessFileContent($pathConfig)
         $imageContent = $this->objectManager->create(
             \Magento\Framework\Api\Data\ImageContentInterface::class
         );
+        $fileExpectedParams = [
+            'type' => 'image/png',
+            'title' => 'my_file',
+            'size' => 212,
+            'width' => 10,
+            'height' => 10,
+            'secret_key' => 'bc9577055da436b9c116',
+        ];
         $imageContent->setName('my_file');
         $imageContent->setType('image/png');
         $imageContent->setBase64EncodedData($this->getImageContent());
         $result = $model->processFileContent($imageContent);
 
-        $this->assertArrayHasKey('fullpath', $result);
-        $this->assertFileExists($result['fullpath']);
-
         /** @var  $filesystem \Magento\Framework\Filesystem */
         $filesystem = $this->objectManager->get(\Magento\Framework\Filesystem::class);
+        $directory = $filesystem->getDirectoryRead(DirectoryList::MEDIA);
+        $this->assertArrayHasKey('fullpath', $result);
+        $this->assertEmpty(array_diff_assoc($fileExpectedParams, $result), 'Some file parameters are not correct');
+        $this->assertTrue($directory->isExist($result['fullpath']));
+
         $this->assertArrayHasKey('quote_path', $result);
-        $filePath = $filesystem->getDirectoryRead(DirectoryList::MEDIA)->getAbsolutePath($result['quote_path']);
-        $this->assertFileExists($filePath);
+        $filePath = $directory->getAbsolutePath($result['quote_path']);
+        $this->assertTrue($directory->isExist($filePath));
 
         $this->assertArrayHasKey('order_path', $result);
-        $filePath = $filesystem->getDirectoryRead(DirectoryList::MEDIA)->getAbsolutePath($result['order_path']);
-        $this->assertFileExists($filePath);
+        $filePath = $directory->getAbsolutePath($result['order_path']);
+        $this->assertTrue($directory->isExist($filePath));
     }
 
     public function pathConfigDataProvider()