ACP2E-1526 : Fixed build failures

Author: lakshmana

app/code/Magento/Catalog/Model/Product/Gallery/GalleryManagement.php

@@ -9,16 +9,19 @@
 use Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryInterface;
 use Magento\Catalog\Api\Data\ProductInterfaceFactory;
 use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product;
 use Magento\Framework\Api\Data\ImageContentInterface;
 use Magento\Framework\Api\Data\ImageContentInterfaceFactory;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Exception\FileSystemException;
 use Magento\Framework\Exception\InputException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Exception\StateException;
 use Magento\Framework\Api\ImageContentValidatorInterface;
 use Magento\Framework\Filesystem;
 use Magento\Framework\Filesystem\Driver\File\Mime;
+use Magento\Framework\Filesystem\Io\File;
 
 /**
  * Class GalleryManagement
@@ -64,7 +67,12 @@ class GalleryManagement implements \Magento\Catalog\Api\ProductAttributeMediaGal
     /**
      * @var Mime
      */
-    protected $imageMime;
+    protected $mime;
+
+    /**
+     * @var File
+     */
+    protected $file;
 
     /**
      * @param ProductRepositoryInterface $productRepository
@@ -73,7 +81,8 @@ class GalleryManagement implements \Magento\Catalog\Api\ProductAttributeMediaGal
      * @param DeleteValidator|null $deleteValidator
      * @param ImageContentInterfaceFactory|null $imageContentInterface
      * @param Filesystem|null $filesystem
-     * @param Mime|null $imageMime
+     * @param Mime|null $mime
+     * @param File|null $file
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -83,7 +92,8 @@ public function __construct(
         ?DeleteValidator $deleteValidator = null,
         ?ImageContentInterfaceFactory $imageContentInterface = null,
         ?Filesystem $filesystem = null,
-        ?Mime $imageMime = null
+        ?Mime $mime = null,
+        ?File $file = null
     ) {
         $this->productRepository = $productRepository;
         $this->contentValidator = $contentValidator;
@@ -95,8 +105,12 @@ public function __construct(
             ?? ObjectManager::getInstance()->get(ImageContentInterfaceFactory::class);
         $this->filesystem =  $filesystem
             ?? ObjectManager::getInstance()->get(Filesystem::class);
-        $this->imageMime = $imageMime
+        $this->mime = $mime
             ?? ObjectManager::getInstance()->get(Mime::class);
+        $this->file = $file
+            ?? ObjectManager::getInstance()->get(
+                File::class
+            );
     }
 
     /**
@@ -249,23 +263,31 @@ public function get($sku, $entryId)
      */
     public function getList($sku)
     {
-        /** @var \Magento\Catalog\Model\Product $product */
+        /** @var Product $product */
         $product = $this->productRepository->get($sku);
         $mediaGalleryEntries = $product->getMediaGalleryEntries();
         foreach ($mediaGalleryEntries as $entry) {
-          $entry->setContent($this->getImageContent($product, $entry));
+            $entry->setContent($this->getImageContent($product, $entry));
         }
         return $mediaGalleryEntries;
     }
 
+    /**
+     * Get image content
+     *
+     * @param Product $product
+     * @param ProductAttributeMediaGalleryEntryInterface $entry
+     * @throws FileSystemException
+     */
     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);
         return $this->imageContentInterface->create()
-            ->setName(basename($entry->getFile()))
+            ->setName($fileName)
             ->setBase64EncodedData(base64_encode($imageFileContent))
-            ->setType($this->imageMime->getMimeType($path));
+            ->setType($this->mime->getMimeType($path));
     }
 }

app/code/Magento/Catalog/Test/Unit/Model/Product/Gallery/GalleryManagementTest.php

@@ -18,9 +18,13 @@
 use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
 use Magento\Framework\Api\AttributeValue;
 use Magento\Framework\Api\Data\ImageContentInterface;
+use Magento\Framework\Api\Data\ImageContentInterfaceFactory;
 use Magento\Framework\Api\ImageContentValidatorInterface;
+use Magento\Framework\Filesystem;
+use Magento\Framework\Filesystem\Driver\File\Mime;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
+use Magento\Framework\Filesystem\Io\File;
 
 /**
  * Tests for \Magento\Catalog\Model\Product\Gallery\GalleryManagement.
@@ -74,6 +78,26 @@ class GalleryManagementTest extends TestCase
      */
     private $newProductMock;
 
+    /**
+     * @var ImageContentInterface|MockObject
+     */
+    private $imageContentInterface;
+
+    /**
+     * @var Filesystem|MockObject
+     */
+    private $filesystem;
+
+    /**
+     * @var Mime|MockObject
+     */
+    private $mime;
+
+    /**
+     * @var File|MockObject
+     */
+    private $file;
+
     /**
      * @inheritDoc
      */
@@ -83,6 +107,10 @@ protected function setUp(): void
         $this->contentValidatorMock = $this->getMockForAbstractClass(ImageContentValidatorInterface::class);
         $this->productInterfaceFactory = $this->createMock(ProductInterfaceFactory::class);
         $this->deleteValidator = $this->createMock(DeleteValidator::class);
+        $this->imageContentInterface = $this->createMock(ImageContentInterfaceFactory::class);
+        $this->filesystem = $this->createMock(Filesystem::class);
+        $this->mime = $this->createMock(Mime::class);
+        $this->file = $this->createMock(File::class);
         $this->productMock = $this->createPartialMock(
             Product::class,
             [
@@ -102,7 +130,11 @@ protected function setUp(): void
             $this->productRepositoryMock,
             $this->contentValidatorMock,
             $this->productInterfaceFactory,
-            $this->deleteValidator
+            $this->deleteValidator,
+            $this->imageContentInterface,
+            $this->filesystem,
+            $this->mime,
+            $this->file,
         );
         $this->attributeValueMock = $this->getMockBuilder(AttributeValue::class)
             ->disableOriginalConstructor()