Merge branch '2.4.7-beta1-develop' into application-server-part3

magento · Jun 5, 2023 · d7512e3 · d7512e3
2 parents 9c1a6f4 + a656f4e
commit d7512e3
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/app/code/Magento/Catalog/Model/Product/Gallery/GalleryManagement.php b/app/code/Magento/Catalog/Model/Product/Gallery/GalleryManagement.php
@@ -6,6 +6,7 @@
 
 namespace Magento\Catalog\Model\Product\Gallery;
 
+use Magento\AwsS3\Driver\AwsS3;
 use Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryInterface;
 use Magento\Catalog\Api\Data\ProductInterfaceFactory;
 use Magento\Catalog\Api\ProductRepositoryInterface;
@@ -287,10 +288,18 @@ private function getImageContent($product, $entry): ImageContentInterface
         $mediaDirectory = $this->filesystem->getDirectoryWrite(DirectoryList::MEDIA);
         $path = $mediaDirectory->getAbsolutePath($product->getMediaConfig()->getMediaPath($entry->getFile()));
         $fileName = $this->file->getPathInfo($path)['basename'];
-        $imageFileContent = $mediaDirectory->getDriver()->fileGetContents($path);
+        $fileDriver = $mediaDirectory->getDriver();
+        $imageFileContent = $fileDriver->fileGetContents($path);
+
+        if ($fileDriver instanceof AwsS3) {
+            $remoteMediaMimeType = $fileDriver->getMetadata($path);
+            $mediaMimeType = $remoteMediaMimeType['mimetype'];
+        } else {
+            $mediaMimeType = $this->mime->getMimeType($path);
+        }
         return $this->imageContentInterface->create()
             ->setName($fileName)
             ->setBase64EncodedData(base64_encode($imageFileContent))
-            ->setType($this->mime->getMimeType($path));
+            ->setType($mediaMimeType);
     }
 }
diff --git a/app/code/Magento/Catalog/composer.json b/app/code/Magento/Catalog/composer.json
@@ -31,7 +31,8 @@
         "magento/module-ui": "*",
         "magento/module-url-rewrite": "*",
         "magento/module-widget": "*",
-        "magento/module-wishlist": "*"
+        "magento/module-wishlist": "*",
+        "magento/module-aws-s3": "*"
     },
     "suggest": {
         "magento/module-cookie": "*",