Merge remote-tracking branch 'adobe-commerce-tier-4/ACP2E-3127' into Tier4-Kings-PR-07-24-2024

Author: glo23503

dev/tests/integration/testsuite/Magento/Framework/Image/Adapter/InterfaceTest.php

@@ -296,6 +296,7 @@ public function resizeDataProvider()
                 [$this->_getFixture('image_adapters_test.png'), [100, null]],
                 [$this->_getFixture('image_adapters_test.png'), [null, null]],
                 [$this->_getFixture('image_adapters_test.png'), [-100, -50]],
+                [$this->_getFixture('image_adapters_test.png'), [200, 0]]
             ]
         );
     }

lib/internal/Magento/Framework/Image/Adapter/AbstractAdapter.php

@@ -12,6 +12,7 @@
 /**
  * Image abstract adapter
  *
+ * phpcs:disable Magento2.Classes.AbstractApi
  * @api
  * @SuppressWarnings(PHPMD.TooManyFields)
  */
@@ -27,25 +28,25 @@ abstract class AbstractAdapter implements AdapterInterface
      * Position constants.
      * Used mainly for watermarks
      */
-    const POSITION_TOP_LEFT = 'top-left';
+    public const POSITION_TOP_LEFT = 'top-left';
 
-    const POSITION_TOP_RIGHT = 'top-right';
+    public const POSITION_TOP_RIGHT = 'top-right';
 
-    const POSITION_BOTTOM_LEFT = 'bottom-left';
+    public const POSITION_BOTTOM_LEFT = 'bottom-left';
 
-    const POSITION_BOTTOM_RIGHT = 'bottom-right';
+    public const POSITION_BOTTOM_RIGHT = 'bottom-right';
 
-    const POSITION_STRETCH = 'stretch';
+    public const POSITION_STRETCH = 'stretch';
 
-    const POSITION_TILE = 'tile';
+    public const POSITION_TILE = 'tile';
 
-    const POSITION_CENTER = 'center';
+    public const POSITION_CENTER = 'center';
     /**#@-*/
 
     /**
      * The size of the font to use as default
      */
-    const DEFAULT_FONT_SIZE = 15;
+    public const DEFAULT_FONT_SIZE = 15;
 
     /**
      * @var  int
@@ -604,7 +605,10 @@ protected function _checkAspectRatio($frameWidth, $frameHeight)
             }
             // keep aspect ratio
             if ($this->_imageSrcWidth / $this->_imageSrcHeight >= $frameWidth / $frameHeight) {
-                $dstHeight = round($dstWidth / $this->_imageSrcWidth * $this->_imageSrcHeight);
+                $dstHeight = max(
+                    1,
+                    round($dstWidth / $this->_imageSrcWidth * $this->_imageSrcHeight)
+                );
             } else {
                 $dstWidth = round($dstHeight / $this->_imageSrcHeight * $this->_imageSrcWidth);
             }
@@ -624,7 +628,7 @@ protected function _checkDimensions($frameWidth, $frameHeight)
     {
         if ($frameWidth !== null && $frameWidth <= 0 ||
             $frameHeight !== null && $frameHeight <= 0 ||
-            empty($frameWidth) && empty($frameHeight)
+            ($frameWidth === null && $frameHeight === null)
         ) {
             //phpcs:ignore Magento2.Exceptions.DirectThrow
             throw new \InvalidArgumentException('Invalid image dimensions.');