Merge branch '2.4-develop' into ph-delivery

Author: xmav

app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php

@@ -77,8 +77,6 @@ class Storage extends \Magento\Framework\DataObject
     protected $_coreFileStorageDb = null;
 
     /**
-     * Cms wysiwyg images
-     *
      * @var \Magento\Cms\Helper\Wysiwyg\Images
      */
     protected $_cmsWysiwygImages = null;
@@ -109,36 +107,26 @@ class Storage extends \Magento\Framework\DataObject
     protected $_session;
 
     /**
-     * Directory database factory
-     *
      * @var \Magento\MediaStorage\Model\File\Storage\Directory\DatabaseFactory
      */
     protected $_directoryDatabaseFactory;
 
     /**
-     * Storage database factory
-     *
      * @var \Magento\MediaStorage\Model\File\Storage\DatabaseFactory
      */
     protected $_storageDatabaseFactory;
 
     /**
-     * Storage file factory
-     *
      * @var \Magento\MediaStorage\Model\File\Storage\FileFactory
      */
     protected $_storageFileFactory;
 
     /**
-     * Storage collection factory
-     *
      * @var \Magento\Cms\Model\Wysiwyg\Images\Storage\CollectionFactory
      */
     protected $_storageCollectionFactory;
 
     /**
-     * Uploader factory
-     *
      * @var \Magento\MediaStorage\Model\File\UploaderFactory
      */
     protected $_uploaderFactory;
@@ -745,8 +733,8 @@ private function getResizedParams(string $source): array
         $configWidth = $this->_resizeParameters['width'];
         $configHeight = $this->_resizeParameters['height'];
 
-        //phpcs:ignore Generic.PHP.NoSilencedErrors
-        [$imageWidth, $imageHeight] = @getimagesize($source);
+        $driver = $this->_directory->getDriver();
+        [$imageWidth, $imageHeight] = getimagesizefromstring($driver->fileGetContents($source));
 
         if ($imageWidth && $imageHeight) {
             $imageWidth = $configWidth > $imageWidth ? $imageWidth : $configWidth;
@@ -999,7 +987,7 @@ private function getAllowedPathPattern()
             );
             $regExp = '/^(';
             $or = '';
-            foreach($mediaGalleryImageFolders as $folder) {
+            foreach ($mediaGalleryImageFolders as $folder) {
                 $folderPattern = str_replace('/', '[\/]+', $folder);
                 $regExp .= $or . $folderPattern . '\b(?!-)(?:\/?[a-zA-Z0-9\-\_]+)*\/?$';
                 $or = '|';
@@ -1013,7 +1001,7 @@ private function getAllowedPathPattern()
     /**
      * Get allowed media gallery image folders
      *
-     * example:
+     * Example:
      *   [
      *     [0 => 'wysiwyg'],
      *     [0 => 'catalog', 1 => 'category']

app/code/Magento/Cms/Test/Unit/Model/Wysiwyg/Images/StorageTest.php

@@ -141,6 +141,9 @@ class StorageTest extends TestCase
      */
     private $fileMock;
 
+    /**
+     * @var array
+     */
     private $allowedImageExtensions = [
         'jpg' => 'image/jpg',
         'jpeg' => 'image/jpeg',
@@ -366,13 +369,13 @@ public function testGetDirsCollectionCreateSubDirectories()
     }
 
     /**
-     * @param array $exclude
-     * @param array $include
-     * @param array $fileNames
-     * @param array $expectedRemoveKeys
+     * @param $path
+     * @param $callNum
+     * @param string $dirsFilter
+     * @throws \Exception
      * @dataProvider dirsCollectionDataProvider
      */
-    public function testGetDirsCollection($path, $callNum, $dirsFilter='')
+    public function testGetDirsCollection($path, $callNum, $dirsFilter = '')
     {
         $this->generalTestGetDirsCollection($path, $callNum, $dirsFilter);
     }
@@ -517,6 +520,9 @@ public function testUploadFile()
                     [$thumbnailTargetPath, true],
                 ]
             );
+        $this->driverMock->expects(self::once())
+            ->method('fileGetContents')
+            ->willReturn('some content');
 
         $image = $this->getMockBuilder(Image::class)
             ->disableOriginalConstructor()

app/code/Magento/RemoteStorage/Model/Filesystem/Directory/WriteFactory.php

@@ -19,8 +19,6 @@
 class WriteFactory extends BaseWriteFactory
 {
     /**
-     * Object Manager
-     *
      * @var ObjectManagerInterface
      */
     private $objectManager;
@@ -32,19 +30,29 @@ class WriteFactory extends BaseWriteFactory
      */
     private $driverPool;
 
+    /**
+     * Deny List Validator
+     *
+     * @var DenyListPathValidator
+     */
+    private $denyListPathValidator;
+
     /**
      * WriteFactory constructor.
      *
      * @param ObjectManagerInterface $objectManager
      * @param BaseDriverPool $driverPool
+     * @param DenyListPathValidator|null $denyListPathValidator
      */
     public function __construct(
         ObjectManagerInterface $objectManager,
-        BaseDriverPool $driverPool
+        BaseDriverPool $driverPool,
+        ?DenyListPathValidator $denyListPathValidator = null
     ) {
         $this->objectManager = $objectManager;
         $this->driverPool = $driverPool;
-        parent::__construct($driverPool);
+        $this->denyListPathValidator = $denyListPathValidator;
+        parent::__construct($driverPool, $denyListPathValidator);
     }
 
     /**
@@ -64,7 +72,7 @@ public function create(
 
             $validators = [
                 'pathValidator' => new PathValidator($driver),
-                'denyListPathValidator' => new DenyListPathValidator($driver)
+                'denyListPathValidator' => $this->denyListPathValidator ?: new DenyListPathValidator($driver)
             ];
 
             $pathValidator = new CompositePathValidator($validators);
@@ -82,6 +90,5 @@ public function create(
         } else {
             return parent::create($path, $driverCode, $createPermissions);
         }
-
     }
 }

dev/tests/integration/testsuite/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricingTest.php

@@ -6,19 +6,19 @@
 
 namespace Magento\AdvancedPricingImportExport\Model\Export;
 
-use Magento\Framework\App\Filesystem\DirectoryList;
-use Magento\Framework\Exception\NoSuchEntityException;
-use Magento\Framework\File\Csv;
-use Magento\TestFramework\Indexer\TestCase;
-use Magento\TestFramework\Helper\Bootstrap;
-use Magento\Framework\Filesystem;
 use Magento\AdvancedPricingImportExport\Model\Export\AdvancedPricing as ExportAdvancedPricing;
+use Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing as ImportAdvancedPricing;
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\Product;
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Filesystem;
+use Magento\Framework\Filesystem\Directory\Write;
 use Magento\ImportExport\Model\Export\Adapter\Csv as ExportAdapterCsv;
-use Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing as ImportAdvancedPricing;
-use Magento\ImportExport\Model\Import\Source\Csv as ImportSourceCsv;
 use Magento\ImportExport\Model\Import;
+use Magento\ImportExport\Model\Import\Source\Csv as ImportSourceCsv;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Indexer\TestCase;
 
 /**
  * Test for \Magento\AdvancedPricingImportExport\Model\Export\AdvancedPricing
@@ -41,6 +41,11 @@ class AdvancedPricingTest extends TestCase
      */
     protected $fileSystem;
 
+    /**
+     * @var Write
+     */
+    private $directory;
+
     // @codingStandardsIgnoreStart
     public static function setUpBeforeClass(): void
     {
@@ -64,6 +69,7 @@ protected function setUp(): void
 
         $this->objectManager = Bootstrap::getObjectManager();
         $this->fileSystem = $this->objectManager->get(Filesystem::class);
+        $this->directory = $this->fileSystem->getDirectoryWrite(DirectoryList::VAR_IMPORT_EXPORT);
         $this->model = $this->objectManager->create(ExportAdvancedPricing::class);
     }
 
@@ -179,7 +185,7 @@ public function testExportImportOfAdvancedPricing(): void
     {
         $simpleSku = 'simple';
         $secondSimpleSku = 'second_simple';
-        $csvfile = uniqid('importexport_') . '.csv';
+        $csvfile = $this->directory->getAbsolutePath(uniqid('importexport_') . '.csv');
         $exportContent = $this->exportData($csvfile);
         $this->assertStringContainsString(
             \sprintf('%s,"All Websites [USD]","ALL GROUPS",10.0000,3.00,Discount', $secondSimpleSku),
@@ -269,10 +275,7 @@ private function updateTierPriceDataInCsv(string $csvfile): void
             ],
         ];
 
-        /** @var Csv $csv */
-        $csv = $this->objectManager->get(Csv::class);
-        $varDirectory = $this->fileSystem->getDirectoryWrite(DirectoryList::VAR_DIR);
-        $csv->appendData($varDirectory->getAbsolutePath($csvfile), $csvNewData);
+        $this->updateCsvFile($csvfile, $csvNewData);
     }
 
     /**
@@ -281,16 +284,15 @@ private function updateTierPriceDataInCsv(string $csvfile): void
      */
     private function exportData($csvFile)
     {
-        $this->model->setWriter(
-            Bootstrap::getObjectManager()
-                ->create(
-                    ExportAdapterCsv::class,
-                    ['fileSystem' => $this->fileSystem, 'destination' => $csvFile]
-                )
-        );
+        $writer = Bootstrap::getObjectManager()->create(ExportAdapterCsv::class, ['fileSystem' => $this->fileSystem]);
+
+        $this->model->setWriter($writer);
         $exportContent = $this->model->export();
         $this->assertNotEmpty($exportContent);
 
+        $driver = $this->directory->getDriver();
+        $driver->filePutContents($this->directory->getAbsolutePath($csvFile), $exportContent);
+
         return $exportContent;
     }
 
@@ -301,12 +303,11 @@ private function importData($csvFile)
     {
         /** @var ImportAdvancedPricing $importModel */
         $importModel = $this->objectManager->create(ImportAdvancedPricing::class);
-        $directory = $this->fileSystem->getDirectoryWrite(DirectoryList::VAR_DIR);
         $source = $this->objectManager->create(
             ImportSourceCsv::class,
             [
                 'file' => $csvFile,
-                'directory' => $directory
+                'directory' => $this->directory
             ]
         );
         $errors = $importModel->setParameters(
@@ -366,4 +367,24 @@ private function removeImportedProducts(array $skus): void
         $registry->unregister('isSecureArea');
         $registry->register('isSecureArea', false);
     }
+
+    /**
+     * Appends csv data to the file
+     *
+     * @param string $filePath
+     * @param array $csv
+     * @return void
+     */
+    private function updateCsvFile(string $filePath, array $csv): void
+    {
+        $driver = $this->directory->getDriver();
+        $driver->deleteFile($filePath);
+        $fileResource = $driver->fileOpen($filePath, 'w');
+
+        foreach ($csv as $dataRow) {
+            $driver->filePutCsv($fileResource, $dataRow);
+        }
+
+        $driver->fileClose($fileResource);
+    }
 }

dev/tests/integration/testsuite/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricingTest.php

@@ -175,6 +175,7 @@ public function testImportDelete()
         $index = 0;
         $ids = [];
         $origPricingData = [];
+        $skus = ['simple'];
         while (isset($skus[$index])) {
             $ids[$index] = $productRepository->get($skus[$index])->getId();
             $origPricingData[$index] = $this->objectManager->create(\Magento\Catalog\Model\Product::class)
@@ -192,12 +193,16 @@ public function testImportDelete()
         $exportModel->setWriter(
             \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
                 \Magento\ImportExport\Model\Export\Adapter\Csv::class,
-                ['fileSystem' => $this->fileSystem, 'destination' => $csvfile]
+                ['fileSystem' => $this->fileSystem]
             )
         );
-        $this->assertNotEmpty($exportModel->export());
+        $exportContent = $exportModel->export();
+        $this->assertNotEmpty($exportContent);
 
-        $errors = $this->doImport($csvfile, DirectoryList::VAR_DIR, Import::BEHAVIOR_DELETE, true);
+        $directory = $this->fileSystem->getDirectoryWrite(DirectoryList::VAR_IMPORT_EXPORT);
+        $directory->getDriver()->filePutContents($directory->getAbsolutePath($csvfile), $exportContent);
+
+        $errors = $this->doImport($csvfile, DirectoryList::VAR_IMPORT_EXPORT, Import::BEHAVIOR_DELETE, true);
 
         $this->assertTrue(
             $errors->getErrorsCount() == 0,