MC-39747: catalog:images:resize stops when cannot process image

Author: dhorytskyi

app/code/Magento/MediaStorage/Service/ImageResize.php

@@ -195,14 +195,18 @@ public function resizeFromThemes(array $themes = null): Generator
                 $this->fileStorageDatabase->saveFileToFilesystem($mediastoragefilename);
             }
             if ($this->mediaDirectory->isFile($originalImagePath)) {
-                foreach ($viewImages as $viewImage) {
-                    $this->resize($viewImage, $originalImagePath, $originalImageName);
+                try {
+                    foreach ($viewImages as $viewImage) {
+                        $this->resize($viewImage, $originalImagePath, $originalImageName);
+                    }
+                } catch (\Exception $e) {
+                    $error = $e->getMessage();
                 }
             } else {
                 $error = __('Cannot resize image "%1" - original image not found', $originalImagePath);
             }
 
-            yield ['filename' => $originalImageName, 'error' => $error] => $count;
+            yield ['filename' => $originalImageName, 'error' => (string) $error] => $count;
         }
     }
 
@@ -276,6 +280,7 @@ private function getUniqueImageIndex(array $imageData): string
      * @param string $originalImagePath
      * @param array $imageParams
      * @return Image
+     * @throws \InvalidArgumentException
      */
     private function makeImage(string $originalImagePath, array $imageParams): Image
     {

app/code/Magento/MediaStorage/Test/Unit/Service/ImageResizeTest.php

@@ -60,11 +60,6 @@ class ImageResizeTest extends TestCase
      */
     protected $imageFactoryMock;
 
-    /**
-     * @var Image|MockObject
-     */
-    protected $imageMock;
-
     /**
      * @var ParamsBuilder|MockObject
      */
@@ -141,7 +136,6 @@ protected function setUp(): void
         $this->appStateMock = $this->createMock(State::class);
         $this->imageConfigMock = $this->createMock(MediaConfig::class);
         $this->productImageMock = $this->createMock(ProductImage::class);
-        $this->imageMock = $this->createMock(Image::class);
         $this->imageFactoryMock = $this->createMock(ImageFactory::class);
         $this->paramsBuilderMock = $this->createMock(ParamsBuilder::class);
         $this->viewMock = $this->createMock(View::class);
@@ -164,9 +158,6 @@ protected function setUp(): void
             ->with(DirectoryList::MEDIA)
             ->willReturn($this->mediaDirectoryMock);
 
-        $this->imageFactoryMock->expects($this->any())
-            ->method('create')
-            ->willReturn($this->imageMock);
         $this->assetImageMock->expects($this->any())
             ->method('getPath')
             ->willReturn($this->testfilepath);
@@ -256,6 +247,11 @@ public function testResizeFromThemesMediaStorageDatabase()
             ->method('fileExists')
             ->willReturn(false);
 
+        $imageMock = $this->createMock(Image::class);
+        $this->imageFactoryMock->expects($this->once())
+            ->method('create')
+            ->willReturn($imageMock);
+
         $this->productImageMock->expects($this->any())
             ->method('getCountUsedProductImages')
             ->willReturn(1);
@@ -284,6 +280,49 @@ function () {
 
         $generator = $this->service->resizeFromThemes(['test-theme']);
         while ($generator->valid()) {
+            $resizeInfo = $generator->key();
+            $this->assertEquals('image.jpg', $resizeInfo['filename']);
+            $this->assertEmpty($resizeInfo['error']);
+            $generator->next();
+        }
+    }
+
+    public function testResizeFromThemesUnsupportedImage()
+    {
+        $this->databaseMock->expects($this->any())
+            ->method('checkDbUsage')
+            ->willReturn(true);
+        $this->databaseMock->expects($this->any())
+            ->method('fileExists')
+            ->willReturn(false);
+
+        $this->imageFactoryMock->expects($this->once())
+            ->method('create')
+            ->willThrowException(new \InvalidArgumentException('Unsupported image format.'));
+
+        $this->productImageMock->expects($this->any())
+            ->method('getCountUsedProductImages')
+            ->willReturn(1);
+        $this->productImageMock->expects($this->any())
+            ->method('getUsedProductImages')
+            ->willReturnCallback(
+                function () {
+                    $data = [[ 'filepath' => $this->testfilename ]];
+                    foreach ($data as $e) {
+                        yield $e;
+                    }
+                }
+            );
+
+        $this->mediaDirectoryMock->expects($this->any())
+            ->method('isFile')
+            ->with($this->testfilepath)
+            ->willReturn(true);
+
+        $generator = $this->service->resizeFromThemes(['test-theme']);
+        while ($generator->valid()) {
+            $resizeInfo = $generator->key();
+            $this->assertEquals('Unsupported image format.', $resizeInfo['error']);
             $generator->next();
         }
     }
@@ -297,6 +336,11 @@ public function testResizeFromImageNameMediaStorageDatabase()
             ->method('fileExists')
             ->willReturn(false);
 
+        $imageMock = $this->createMock(Image::class);
+        $this->imageFactoryMock->expects($this->once())
+            ->method('create')
+            ->willReturn($imageMock);
+
         $this->mediaDirectoryMock->expects($this->any())
             ->method('isFile')
             ->with($this->testfilepath)