Merge remote-tracking branch 'arcticfoxes/B2B-2017' into 2.4-develop-pr

Author: joanhe

app/code/Magento/RemoteStorage/etc/di.xml

@@ -26,6 +26,7 @@
             <argument name="writeFactory" xsi:type="object">
                 Magento\RemoteStorage\Model\Filesystem\Directory\WriteFactory
             </argument>
+            <argument name="readFactory" xsi:type="object">remoteReadFactory</argument>
         </arguments>
     </type>
     <virtualType name="customRemoteFilesystem" type="Magento\RemoteStorage\Filesystem">

dev/tests/integration/testsuite/Magento/ImportExport/Controller/Adminhtml/Export/File/DeleteTest.php

@@ -51,7 +51,7 @@ protected function setUp(): void
         $this->fileSystem = $this->_objectManager->get(Filesystem::class);
         $this->sourceFilePath = __DIR__ . '/../../Import/_files' . DIRECTORY_SEPARATOR . $this->fileName;
         //Refers to tests 'var' directory
-        $this->varDirectory = $this->fileSystem->getDirectoryRead(DirectoryList::VAR_IMPORT_EXPORT);
+        $this->varDirectory = $this->fileSystem->getDirectoryWrite(DirectoryList::VAR_IMPORT_EXPORT);
     }
 
     /**
@@ -84,12 +84,15 @@ public function testExecute($file): void
      *
      * @param $destinationFilePath
      * @return void
+     * @throws \Magento\Framework\Exception\FileSystemException
      */
     protected function copyFile($destinationFilePath): void
     {
-        //Refers to application root directory
-        $rootDirectory = $this->fileSystem->getDirectoryWrite(DirectoryList::ROOT);
-        $rootDirectory->copyFile($this->sourceFilePath, $this->varDirectory->getAbsolutePath($destinationFilePath));
+        $driver = $this->varDirectory->getDriver();
+        $absolutePath = $this->varDirectory->getAbsolutePath($destinationFilePath);
+
+        $driver->createDirectory(dirname($absolutePath));
+        $driver->filePutContents($absolutePath, file_get_contents($this->sourceFilePath));
     }
 
     /**
@@ -112,7 +115,7 @@ public static function tearDownAfterClass(): void
     {
         $filesystem = Bootstrap::getObjectManager()->get(Filesystem::class);
         /** @var WriteInterface $directory */
-        $directory = $filesystem->getDirectoryWrite(DirectoryList::VAR_DIR);
+        $directory = $filesystem->getDirectoryWrite(DirectoryList::VAR_IMPORT_EXPORT);
         if ($directory->isExist('export')) {
             $directory->delete('export');
         }

dev/tests/integration/testsuite/Magento/ImportExport/Model/Export/Adapter/CsvTest.php

@@ -48,7 +48,10 @@ protected function setUp(): void
      */
     public function testDestruct(string $destination, bool $shouldBeDeleted): void
     {
-        $csv = $this->objectManager->create(Csv::class, ['destination' => $destination]);
+        $csv = $this->objectManager->create(Csv::class, [
+            'destination' => $destination,
+            'destinationDirectoryCode' => DirectoryList::VAR_DIR
+        ]);
         /** @var Filesystem $fileSystem */
         $fileSystem = $this->objectManager->get(Filesystem::class);
         $directoryHandle = $fileSystem->getDirectoryRead(DirectoryList::VAR_DIR);

dev/tests/integration/testsuite/Magento/ImportExport/Model/Export/ConsumerTest.php

@@ -9,9 +9,8 @@
 
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
-use Magento\Framework\File\Csv;
 use Magento\Framework\Filesystem;
-use Magento\Framework\Filesystem\Directory\Write;
+use Magento\Framework\Filesystem\Directory\WriteInterface;
 use Magento\Framework\MessageQueue\MessageEncoder;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\MysqlMq\Model\Driver\Queue;
@@ -40,10 +39,7 @@ class ConsumerTest extends TestCase
     /** @var Queue */
     private $queue;
 
-    /** @var Csv */
-    private $csvReader;
-
-    /** @var Write */
+    /** @var WriteInterface */
     private $directory;
 
     /** @var string */
@@ -60,8 +56,8 @@ protected function setUp(): void
         $this->queue = $this->objectManager->create(Queue::class, ['queueName' => 'export']);
         $this->messageEncoder = $this->objectManager->get(MessageEncoder::class);
         $this->consumer = $this->objectManager->get(Consumer::class);
-        $this->directory = $this->objectManager->get(Filesystem::class)->getDirectoryWrite(DirectoryList::VAR_DIR);
-        $this->csvReader = $this->objectManager->get(Csv::class);
+        $filesystem = $this->objectManager->get(Filesystem::class);
+        $this->directory = $filesystem->getDirectoryWrite(DirectoryList::VAR_IMPORT_EXPORT);
     }
 
     /**
@@ -91,7 +87,7 @@ public function testProcess(): void
         $this->consumer->process($decodedMessage);
         $this->filePath = 'export/' . $decodedMessage->getFileName();
         $this->assertTrue($this->directory->isExist($this->filePath));
-        $data = $this->csvReader->getData($this->directory->getAbsolutePath($this->filePath));
+        $data = $this->getCsvData($this->directory->getAbsolutePath($this->filePath));
         $this->assertCount(2, $data);
         $skuPosition = $this->getSkuPosition($data);
         $this->assertNotNull($skuPosition);
@@ -117,4 +113,25 @@ private function getSkuPosition(array $csvFileData): ?int
 
         return null;
     }
+
+    /**
+     * Parse csv file and return csv data as array
+     *
+     * @param string $filePath
+     * @return array
+     * @throws \Magento\Framework\Exception\FileSystemException
+     */
+    private function getCsvData(string $filePath): array
+    {
+        $driver = $this->directory->getDriver();
+        $fileResource = $driver->fileOpen($filePath, null);
+
+        $data = [];
+        while ($rowData = $driver->fileGetCsv($fileResource, 100000)) {
+            $data[] = $rowData;
+        }
+        $driver->fileClose($fileResource);
+
+        return $data;
+    }
 }

dev/tests/integration/testsuite/Magento/ImportExport/Model/Report/CsvTest.php

@@ -47,7 +47,7 @@ class CsvTest extends \PHPUnit\Framework\TestCase
     protected function setUp(): void
     {
         $filesystem = Bootstrap::getObjectManager()->create(Filesystem::class);
-        $this->directory = $filesystem->getDirectoryWrite(DirectoryList::VAR_DIR);
+        $this->directory = $filesystem->getDirectoryWrite(DirectoryList::VAR_IMPORT_EXPORT);
 
         $this->csvReport = Bootstrap::getObjectManager()->create(Csv::class);
     }