ENGCOM-6959: Fix: #26973 Fatal error when Product Image size is not defined #26974

Author: slavvka

app/code/Magento/Catalog/Block/Product/ImageFactory.php

@@ -123,7 +123,7 @@ private function getLabel(Product $product, string $imageType): string
         if (empty($label)) {
             $label = $product->getName();
         }
-        return (string) $label;
+        return (string)$label;
     }
 
     /**
@@ -161,15 +161,15 @@ public function create(Product $product, string $imageId, array $attributes = nu
         }
 
         $attributes = $attributes === null ? [] : $attributes;
-        
+
         $data = [
             'data' => [
                 'template' => 'Magento_Catalog::product/image_with_borders.phtml',
                 'image_url' => $imageAsset->getUrl(),
                 'width' => $imageMiscParams['image_width'],
                 'height' => $imageMiscParams['image_height'],
                 'label' => $this->getLabel($product, $imageMiscParams['image_type']),
-                'ratio' => $this->getRatio($imageMiscParams['image_width'], $imageMiscParams['image_height']),
+                'ratio' => $this->getRatio($imageMiscParams['image_width'] ?? 0, $imageMiscParams['image_height'] ?? 0),
                 'custom_attributes' => $this->getStringCustomAttributes($attributes),
                 'class' => $this->getClass($attributes),
                 'product_id' => $product->getId()

app/code/Magento/Catalog/Test/Unit/Block/Product/ImageFactoryTest.php

@@ -95,6 +95,7 @@ public function createDataProvider(): array
         return [
             $this->getTestDataWithoutAttributes(),
             $this->getTestDataWithAttributes(),
+            $this->getTestDataWithoutDimensions()
         ];
     }
 
@@ -209,4 +210,21 @@ private function getTestDataWithAttributes(): array
             ],
         ];
     }
+
+    /**
+     * @return array
+     */
+    private function getTestDataWithoutDimensions(): array
+    {
+        $data = $this->getTestDataWithoutAttributes();
+
+        $data['data']['imageParamsBuilder']['image_width'] = null;
+        $data['data']['imageParamsBuilder']['image_height'] = null;
+
+        $data['expected']['data']['width'] = null;
+        $data['expected']['data']['height'] = null;
+        $data['expected']['data']['ratio'] = 1.0;
+
+        return $data;
+    }
 }