🔃 [Magento Community Engineering] Community Contributions - 2.4-develop latest changes

Accepted Community Pull Requests:
 - #29149: Generetae thumbnails only if image have bigger size then defined in configuration, to aviod stretched images (by @Nazar65)

Author: magento-engcom-team

app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php

@@ -628,8 +628,12 @@ public function resizeFile($source, $keepRatio = true)
         }
         $image = $this->_imageFactory->create();
         $image->open($source);
+
         $image->keepAspectRatio($keepRatio);
-        $image->resize($this->_resizeParameters['width'], $this->_resizeParameters['height']);
+
+        list($imageWidth, $imageHeight) = $this->getResizedParams($source);
+        
+        $image->resize($imageWidth, $imageHeight);
         $dest = $targetDir . '/' . $this->ioFile->getPathInfo($source)['basename'];
         $image->save($dest);
         if ($this->_directory->isFile($this->_directory->getRelativePath($dest))) {
@@ -638,6 +642,29 @@ public function resizeFile($source, $keepRatio = true)
         return false;
     }
 
+    /**
+     * Return width height for the image resizing.
+     *
+     * @param string $source
+     * @return array
+     */
+    private function getResizedParams(string $source): array
+    {
+        $configWidth = $this->_resizeParameters['width'];
+        $configHeight = $this->_resizeParameters['height'];
+
+        //phpcs:ignore Generic.PHP.NoSilencedErrors
+        list($imageWidth, $imageHeight) = @getimagesize($source);
+     
+        if ($imageWidth && $imageHeight) {
+            $imageWidth = $configWidth > $imageWidth ? $imageWidth : $configWidth;
+            $imageHeight = $configHeight > $imageHeight ? $imageHeight : $configHeight;
+
+            return  [$imageWidth, $imageHeight];
+        }
+        return [$configWidth, $configHeight];
+    }
+    
     /**
      * Resize images on the fly in controller action
      *

dev/tests/integration/testsuite/Magento/Cms/Model/Wysiwyg/Images/StorageTest.php

@@ -167,7 +167,9 @@ public function testUploadFile(): void
     public function testUploadFileWithExcludedDirPath(): void
     {
         $this->expectException(\Magento\Framework\Exception\LocalizedException::class);
-        $this->expectExceptionMessage('We can\'t upload the file to current folder right now. Please try another folder.');
+        $this->expectExceptionMessage(
+            'We can\'t upload the file to current folder right now. Please try another folder.'
+        );
 
         $fileName = 'magento_small_image.jpg';
         $tmpDirectory = $this->filesystem->getDirectoryWrite(\Magento\Framework\App\Filesystem\DirectoryList::SYS_TMP);
@@ -295,6 +297,58 @@ public function testGetThumbnailUrl(string $directory, string $filename, string
         $this->storage->deleteFile($path);
     }
 
+    /**
+     * Verify thumbnail generation for diferent sizes
+     *
+     * @param array $sizes
+     * @param bool $resized
+     * @dataProvider getThumbnailsSizes
+     */
+    public function testResizeFile(array $sizes, bool $resized): void
+    {
+        $root = $this->storage->getCmsWysiwygImages()->getStorageRoot();
+        $path = $root . '/' . 'testfile.png';
+        $this->generateImage($path, $sizes['width'], $sizes['height']);
+        $this->storage->resizeFile($path);
+
+        $thumbPath =   $this->storage->getThumbnailPath($path);
+        list($imageWidth, $imageHeight) = getimagesize($thumbPath);
+
+        $this->assertEquals(
+            $resized ? $this->storage->getResizeWidth() : $sizes['width'],
+            $imageWidth
+        );
+        $this->assertLessThanOrEqual(
+            $resized ? $this->storage->getResizeHeight() : $sizes['height'],
+            $imageHeight
+        );
+
+        $this->storage->deleteFile($path);
+    }
+
+    /**
+     * Provide sizes for resizeFile test
+     */
+    public function getThumbnailsSizes(): array
+    {
+        return [
+            [
+                [
+                    'width' => 1024,
+                    'height' => 768,
+                ],
+                true
+            ],
+            [
+                [
+                    'width' => 20,
+                    'height' => 20,
+                ],
+                false
+            ]
+        ];
+    }
+
     /**
      * Provide scenarios for testing getThumbnailUrl()
      *