MC-17218: php bin/magento catalog:image:resize error if image is missing

- Fixed an issue with resize command;

Author: Aliaksei Yakimovich2

app/code/Magento/MediaStorage/Console/Command/ImagesResizeCommand.php

@@ -15,6 +15,9 @@
 use Symfony\Component\Console\Helper\ProgressBar;
 use Magento\Framework\ObjectManagerInterface;
 
+/**
+ * Class for catalog image resizing via CLI
+ */
 class ImagesResizeCommand extends \Symfony\Component\Console\Command\Command
 {
     /**
@@ -49,7 +52,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function configure()
     {
@@ -58,19 +61,23 @@ protected function configure()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         try {
+            $errors = [];
             $this->appState->setAreaCode(Area::AREA_GLOBAL);
             $generator = $this->resize->resizeFromThemes();
 
             /** @var ProgressBar $progress */
-            $progress = $this->objectManager->create(ProgressBar::class, [
-                'output' => $output,
-                'max' => $generator->current()
-            ]);
+            $progress = $this->objectManager->create(
+                ProgressBar::class,
+                [
+                    'output' => $output,
+                    'max' => $generator->current()
+                ]
+            );
             $progress->setFormat(
                 "%current%/%max% [%bar%] %percent:3s%% %elapsed% %memory:6s% \t| <info>%message%</info>"
             );
@@ -79,8 +86,17 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 $progress->setOverwrite(false);
             }
 
+            // phpcs:ignore Generic.CodeAnalysis.ForLoopWithTestFunctionCall
             for (; $generator->valid(); $generator->next()) {
-                $progress->setMessage($generator->key());
+                $resizeInfo = $generator->key();
+                $error = $resizeInfo['error'];
+                $filename = $resizeInfo['filename'];
+
+                if ($error !== '') {
+                    $errors[$filename] = $error;
+                }
+
+                $progress->setMessage($filename);
                 $progress->advance();
             }
         } catch (\Exception $e) {
@@ -90,6 +106,13 @@ protected function execute(InputInterface $input, OutputInterface $output)
         }
 
         $output->write(PHP_EOL);
-        $output->writeln("<info>Product images resized successfully</info>");
+        if (count($errors)) {
+            $output->writeln("<info>Product images resized with errors:</info>");
+            foreach ($errors as $error) {
+                $output->writeln("<error>{$error}</error>");
+            }
+        } else {
+            $output->writeln("<info>Product images resized successfully</info>");
+        }
     }
 }

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

@@ -161,14 +161,21 @@ public function resizeFromThemes(array $themes = null): \Generator
         $viewImages = $this->getViewImages($themes ?? $this->getThemesInUse());
 
         foreach ($productImages as $image) {
+            $error = '';
             $originalImageName = $image['filepath'];
             $originalImagePath = $this->mediaDirectory->getAbsolutePath(
                 $this->imageConfig->getMediaPath($originalImageName)
             );
-            foreach ($viewImages as $viewImage) {
-                $this->resize($viewImage, $originalImagePath, $originalImageName);
+
+            if ($this->mediaDirectory->isFile($originalImagePath)) {
+                foreach ($viewImages as $viewImage) {
+                    $this->resize($viewImage, $originalImagePath, $originalImageName);
+                }
+            } else {
+                $error = __('Cannot resize image "%1" - original image not found', $originalImagePath);
             }
-            yield $originalImageName => $count;
+
+            yield ['filename' => $originalImageName, 'error' => $error] => $count;
         }
     }
 
@@ -202,10 +209,12 @@ private function getViewImages(array $themes): array
         $viewImages = [];
         /** @var \Magento\Theme\Model\Theme $theme */
         foreach ($themes as $theme) {
-            $config = $this->viewConfig->getViewConfig([
-                'area' => Area::AREA_FRONTEND,
-                'themeModel' => $theme,
-            ]);
+            $config = $this->viewConfig->getViewConfig(
+                [
+                    'area' => Area::AREA_FRONTEND,
+                    'themeModel' => $theme,
+                ]
+            );
             $images = $config->getMediaEntities('Magento_Catalog', ImageHelper::MEDIA_TYPE_CONFIG_NODE);
             foreach ($images as $imageId => $imageData) {
                 $uniqIndex = $this->getUniqueImageIndex($imageData);
@@ -226,7 +235,7 @@ private function getUniqueImageIndex(array $imageData): string
     {
         ksort($imageData);
         unset($imageData['type']);
-        return md5(json_encode($imageData));
+        return hash('sha256', json_encode($imageData));
     }
 
     /**