Merge tag v2.6.14 into develop

Author: roadiz-ci

src/Utils/StringHandler.php

@@ -67,6 +67,20 @@ public static function cleanForFilename(?string $string): string
             return '';
         }
 
+        // Remove images double extensions
+        // for compatibility with intervention-request
+        // and only keep the last one.
+        // example: my.image.jpg.webp => my_image_jpg.webp
+        $parts = explode('.', $string);
+        if (count($parts) > 2) {
+            $extension = array_pop($parts);
+            // Keep double extension for zip, gz, xz and bz
+            if (!\in_array($extension, ['zip', 'gz', 'xz', 'bz', 'bz2', '7z', 'tgz'], true)) {
+                $filename = implode('_', $parts);
+                $string = $filename.'.'.$extension;
+            }
+        }
+
         return (new UnicodeString($string))
             ->ascii()
             ->trim()

tests/StringHandlerTest.php

@@ -40,6 +40,50 @@ public function cleanForFilenameProvider(): array
                 'image/with/slashes.jpg',
                 'image_with_slashes.jpg',
             ],
+            [
+                'image.jpg.webp',
+                'image_jpg.webp',
+            ],
+            [
+                'image.png.avif',
+                'image_png.avif',
+            ],
+            [
+                'image.png.heif',
+                'image_png.heif',
+            ],
+            [
+                'folder/folder.image.jpg.webp',
+                'folder_folder_image_jpg.webp',
+            ],
+            [
+                'folder/archive.tar.gz',
+                'folder_archive.tar.gz',
+            ],
+            [
+                'folder/archive.tar.xz',
+                'folder_archive.tar.xz',
+            ],
+            [
+                'folder/archive.tar.zip',
+                'folder_archive.tar.zip',
+            ],
+            [
+                'folder/archive.tar.bz',
+                'folder_archive.tar.bz',
+            ],
+            [
+                'folder/archive.tar.bz2',
+                'folder_archive.tar.bz2',
+            ],
+            [
+                'folder/archive.tar.tgz',
+                'folder_archive.tar.tgz',
+            ],
+            [
+                'folder/archive.tar.7z',
+                'folder_archive.tar.7z',
+            ],
         ];
     }