Merge pull request #358 from magento-performance/MC-38613

duhon · web-flow · commit d553c3c1cd3e · 2020-11-06T10:20:58.000-06:00
diff --git a/app/code/Magento/AwsS3/Driver/AwsS3.php b/app/code/Magento/AwsS3/Driver/AwsS3.php
@@ -344,7 +344,11 @@ public function isFile($path): bool
         $path = $this->normalizeRelativePath($path);
         $path = rtrim($path, '/');
 
-        return $this->adapter->has($path) && $this->adapter->getMetadata($path)['type'] === self::TYPE_FILE;
+        if ($this->adapter->has($path) && ($meta = $this->adapter->getMetadata($path))) {
+            return ($meta['type'] ?? null) === self::TYPE_FILE;
+        }
+
+        return false;
     }
 
     /**
diff --git a/app/code/Magento/Eav/Model/AttributeRepository.php b/app/code/Magento/Eav/Model/AttributeRepository.php
@@ -88,7 +88,7 @@ public function save(\Magento\Eav\Api\Data\AttributeInterface $attribute)
         try {
             $this->eavResource->save($attribute);
         } catch (\Exception $e) {
-            throw new StateException(__("The attribute can't be saved."));
+            throw new StateException(__("The attribute can't be saved."), $e);
         }
         return $attribute;
     }
diff --git a/app/code/Magento/Swatches/Helper/Media.php b/app/code/Magento/Swatches/Helper/Media.php
@@ -197,7 +197,7 @@ protected function getUniqueFileName($file)
                 $file
             );
         } else {
-            $destFile = dirname($file) . '/' . \Magento\MediaStorage\Model\File\Uploader::getNewFileName(
+            $destFile = rtrim(dirname($file), '/.') . '/' . \Magento\MediaStorage\Model\File\Uploader::getNewFileName(
                 $this->getOriginalFilePath($file)
             );
         }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Gallery/ProcessorTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Gallery/ProcessorTest.php
@@ -46,9 +46,10 @@ public static function setUpBeforeClass(): void
         $mediaDirectory->create($config->getBaseTmpMediaPath());
         $mediaDirectory->create($config->getBaseMediaPath());
 
-        copy($fixtureDir . "/magento_image.jpg", self::$_mediaTmpDir . "/magento_image.jpg");
-        copy($fixtureDir . "/magento_image.jpg", self::$_mediaDir . "/magento_image.jpg");
-        copy($fixtureDir . "/magento_small_image.jpg", self::$_mediaTmpDir . "/magento_small_image.jpg");
+        $mediaDirectory->getDriver()->filePutContents(self::$_mediaTmpDir . "/magento_image.jpg", file_get_contents($fixtureDir . "/magento_image.jpg"));
+        $mediaDirectory->getDriver()->filePutContents(self::$_mediaDir . "/magento_image.jpg", file_get_contents($fixtureDir . "/magento_image.jpg"));
+        $mediaDirectory->getDriver()->filePutContents(self::$_mediaTmpDir . "/magento_small_image.jpg", file_get_contents($fixtureDir . "/magento_small_image.jpg"));
+
     }
 
     public static function tearDownAfterClass(): void
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductTest.php
@@ -246,7 +246,7 @@ protected function _copyFileToBaseTmpMediaPath($sourceFile)
 
         $mediaDirectory->create($config->getBaseTmpMediaPath());
         $targetFile = $config->getTmpMediaPath(basename($sourceFile));
-        copy($sourceFile, $mediaDirectory->getAbsolutePath($targetFile));
+        $mediaDirectory->getDriver()->filePutContents($mediaDirectory->getAbsolutePath($targetFile), file_get_contents($sourceFile));
 
         return $targetFile;
     }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/catalog_category_image.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/catalog_category_image.php
@@ -10,13 +10,14 @@
 $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
 
 /** @var $mediaDirectory \Magento\Framework\Filesystem\Directory\WriteInterface */
-$mediaDirectory = $objectManager->get(\Magento\Framework\Filesystem::class)
-    ->getDirectoryWrite(DirectoryList::MEDIA);
+$mediaDirectory = $objectManager->get(\Magento\Framework\Filesystem::class)->getDirectoryWrite(DirectoryList::MEDIA);
 $fileName = 'magento_small_image.jpg';
 $fileNameLong = 'magento_long_image_name_magento_long_image_name_magento_long_image_name.jpg';
 $filePath = 'catalog/category/' . $fileName;
 $filePathLong = 'catalog/category/' . $fileNameLong;
 $mediaDirectory->create('catalog/category');
-
-copy(__DIR__ . DIRECTORY_SEPARATOR . $fileName, $mediaDirectory->getAbsolutePath($filePath));
-copy(__DIR__ . DIRECTORY_SEPARATOR . $fileNameLong, $mediaDirectory->getAbsolutePath($filePathLong));
+$shortImageContent = file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . $fileName);
+$longImageContent = file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . $fileNameLong);
+$mediaDirectory->getDriver()->filePutContents($mediaDirectory->getAbsolutePath($filePath), $shortImageContent);
+$mediaDirectory->getDriver()->filePutContents($mediaDirectory->getAbsolutePath($filePathLong), $longImageContent);
+unset($shortImageContent, $longImageContent);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/catalog_tmp_category_image.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/catalog_tmp_category_image.php
@@ -15,5 +15,4 @@
 $fileName = 'magento_small_image.jpg';
 $tmpFilePath = 'catalog/tmp/category/' . $fileName;
 $mediaDirectory->create('catalog/tmp/category');
-
-copy(__DIR__ . DIRECTORY_SEPARATOR . $fileName, $mediaDirectory->getAbsolutePath($tmpFilePath));
+$mediaDirectory->getDriver()->filePutContents($mediaDirectory->getAbsolutePath($tmpFilePath), file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . $fileName));
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_image.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_image.php
@@ -24,12 +24,11 @@
 $images = ['magento_image.jpg', 'magento_small_image.jpg', 'magento_thumbnail.jpg'];
 
 foreach ($images as $image) {
-    $targetTmpFilePath = $mediaDirectory->getAbsolutePath() . DIRECTORY_SEPARATOR . $targetTmpDirPath
-        . DIRECTORY_SEPARATOR . $image;
+    $targetTmpFilePath = $mediaDirectory->getAbsolutePath() . $targetTmpDirPath . $image;
 
     $sourceFilePath = __DIR__ . DIRECTORY_SEPARATOR . $image;
+    $mediaDirectory->getDriver()->filePutContents($targetTmpFilePath, file_get_contents($sourceFilePath));
 
-    copy($sourceFilePath, $targetTmpFilePath);
     // Copying the image to target dir is not necessary because during product save, it will be moved there from tmp dir
     $database->saveFile($targetTmpFilePath);
 }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_image.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_image.php
@@ -38,7 +38,7 @@
 $mediaDirectory->create($targetTmpDirPath);
 
 $dist = $mediaDirectory->getAbsolutePath($mediaConfig->getBaseMediaPath() .  DIRECTORY_SEPARATOR . 'magento_image.jpg');
-copy(__DIR__ . '/magento_image.jpg', $dist);
+$mediaDirectory->getDriver()->filePutContents($dist, file_get_contents(__DIR__ . '/magento_image.jpg'));
 
 /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
 $productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/validate_image_info.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/validate_image_info.php
@@ -12,10 +12,10 @@
 /** @var Magento\Catalog\Model\Product\Media\Config $config */
 $config = $objectManager->get(\Magento\Catalog\Model\Product\Media\Config::class);
 
-/** @var $tmpDirectory \Magento\Framework\Filesystem\Directory\WriteInterface */
-$tmpDirectory = $filesystem->getDirectoryWrite(\Magento\Framework\App\Filesystem\DirectoryList::MEDIA);
-$tmpDirectory->create($config->getBaseTmpMediaPath());
+/** @var $mediaDirectory \Magento\Framework\Filesystem\Directory\WriteInterface */
+$mediaDirectory = $filesystem->getDirectoryWrite(\Magento\Framework\App\Filesystem\DirectoryList::MEDIA);
+$mediaDirectory->create($config->getBaseTmpMediaPath());
 
-$targetTmpFilePath = $tmpDirectory->getAbsolutePath($config->getBaseTmpMediaPath() . '/magento_small_image.jpg');
-copy(__DIR__ . '/magento_small_image.jpg', $targetTmpFilePath);
+$targetTmpFilePath = $mediaDirectory->getAbsolutePath($config->getBaseTmpMediaPath() . '/magento_small_image.jpg');
+$mediaDirectory->getDriver()->filePutContents($targetTmpFilePath, file_get_contents(__DIR__ . '/magento_small_image.jpg'));
 // Copying the image to target dir is not necessary because during product save, it will be moved there from tmp dir
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/controllers/_files/products.php b/dev/tests/integration/testsuite/Magento/Catalog/controllers/_files/products.php
@@ -24,7 +24,7 @@
 
 $baseTmpMediaPath = $config->getBaseTmpMediaPath();
 $mediaDirectory->create($baseTmpMediaPath);
-copy(__DIR__ . '/product_image.png', $mediaDirectory->getAbsolutePath($baseTmpMediaPath . '/product_image.png'));
+$mediaDirectory->getDriver()->filePutContents($mediaDirectory->getAbsolutePath($baseTmpMediaPath . '/product_image.png'), file_get_contents(__DIR__ . '/product_image.png'));
 
 /** @var $productOne \Magento\Catalog\Model\Product */
 $productOne = $objectManager->create(\Magento\Catalog\Model\Product::class);
diff --git a/dev/tests/integration/testsuite/Magento/Swatches/_files/visual_swatch_attribute_with_different_options_type.php b/dev/tests/integration/testsuite/Magento/Swatches/_files/visual_swatch_attribute_with_different_options_type.php
@@ -30,7 +30,7 @@
     'image-height' => 90,
     'image-name' => $imageName,
 ]);
-$imagePath = substr($swatchesMedia->moveImageFromTmp($imageName), 1);
+$imagePath = $swatchesMedia->moveImageFromTmp($imageName);
 $swatchesMedia->generateSwatchVariations($imagePath);
 
 // Add attribute data
diff --git a/lib/internal/Magento/Framework/Api/Uploader.php b/lib/internal/Magento/Framework/Api/Uploader.php
@@ -39,20 +39,4 @@ public function processFileAttributes($fileAttributes)
             $this->_fileExists = true;
         }
     }
-
-    /**
-     * Move files from TMP folder into destination folder
-     *
-     * @param string $tmpPath
-     * @param string $destPath
-     * @return bool|void
-     */
-    protected function _moveFile($tmpPath, $destPath)
-    {
-        if (is_uploaded_file($tmpPath)) {
-            return move_uploaded_file($tmpPath, $destPath);
-        } elseif (is_file($tmpPath)) {
-            return rename($tmpPath, $destPath);
-        }
-    }
 }
diff --git a/setup/src/Magento/Setup/Fixtures/ImagesGenerator/ImagesGenerator.php b/setup/src/Magento/Setup/Fixtures/ImagesGenerator/ImagesGenerator.php
@@ -71,6 +71,7 @@ public function generate($config)
         $mediaDirectory->create($relativePathToMedia);
 
         $imagePath = $relativePathToMedia . DIRECTORY_SEPARATOR . $config['image-name'];
+        $imagePath = preg_replace('|/{2,}|', '/', $imagePath);
         $memory = fopen('php://memory', 'r+');
         if(!imagejpeg($image, $memory)) {
             throw new \Exception('Could not create picture ' . $imagePath);

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ public function save(\Magento\Eav\Api\Data\AttributeInterface $attribute)`
`88`	`88`	`try {`
`89`	`89`	`$this->eavResource->save($attribute);`
`90`	`90`	`} catch (\Exception $e) {`
`91`		`- throw new StateException(__("The attribute can't be saved."));`
	`91`	`+ throw new StateException(__("The attribute can't be saved."), $e);`
`92`	`92`	`}`
`93`	`93`	`return $attribute;`
`94`	`94`	`}`
Original file line number	Diff line number	Diff line change
`@@ -197,7 +197,7 @@ protected function getUniqueFileName($file)`
`197`	`197`	`$file`
`198`	`198`	`);`
`199`	`199`	`} else {`
`200`		`- $destFile = dirname($file) . '/' . \Magento\MediaStorage\Model\File\Uploader::getNewFileName(`
	`200`	`+ $destFile = rtrim(dirname($file), '/.') . '/' . \Magento\MediaStorage\Model\File\Uploader::getNewFileName(`
`201`	`201`	`$this->getOriginalFilePath($file)`
`202`	`202`	`);`
`203`	`203`	`}`
Original file line number	Diff line number	Diff line change
`@@ -246,7 +246,7 @@ protected function _copyFileToBaseTmpMediaPath($sourceFile)`
`246`	`246`
`247`	`247`	`$mediaDirectory->create($config->getBaseTmpMediaPath());`
`248`	`248`	`$targetFile = $config->getTmpMediaPath(basename($sourceFile));`
`249`		`- copy($sourceFile, $mediaDirectory->getAbsolutePath($targetFile));`
	`249`	`+ $mediaDirectory->getDriver()->filePutContents($mediaDirectory->getAbsolutePath($targetFile), file_get_contents($sourceFile));`
`250`	`250`
`251`	`251`	`return $targetFile;`
`252`	`252`	`}`