Add support of jfif (#248)

spatie · Apr 17, 2024 · 05166a6 · 05166a6
1 parent 85dd6ba
commit 05166a6
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/src/Drivers/Gd/GdDriver.php b/src/Drivers/Gd/GdDriver.php
@@ -151,6 +151,7 @@ public function save(?string $path = null): static
         switch (strtolower($extension)) {
             case 'jpg':
             case 'jpeg':
+            case 'jfif':
                 imagejpeg($this->image, $path, $this->quality);
                 break;
             case 'png':
@@ -185,6 +186,7 @@ public function base64(string $imageFormat = 'jpeg', bool $prefixWithFormat = tr
         switch (strtolower($imageFormat)) {
             case 'jpg':
             case 'jpeg':
+            case 'jfif':
                 imagejpeg($this->image, null, $this->quality);
                 break;
             case 'png':

diff --git a/src/Drivers/Imagick/ImagickDriver.php b/src/Drivers/Imagick/ImagickDriver.php
@@ -237,7 +237,13 @@ public function save(?string $path = null): static
 
         $extension = pathinfo($path, PATHINFO_EXTENSION);
 
-        if (! in_array(strtoupper($extension), Imagick::queryFormats('*'))) {
+        $formats = Imagick::queryFormats('*');
+
+        if (in_array('JPEG', $formats)) {
+            $formats[] = 'JFIF';
+        }
+
+        if (! in_array(strtoupper($extension), $formats)) {
             throw UnsupportedImageFormat::make($extension);
         }
 

diff --git a/tests/ImageFormatTest.php b/tests/ImageFormatTest.php
@@ -16,8 +16,14 @@
 
     $driver->loadFile(getTestJpg())->save($targetFile);
 
-    expect($targetFile)->toHaveMime("image/$format");
-})->with('drivers', ['jpeg', 'gif', 'png', 'webp', 'avif']);
+    $expectedFormat = $format;
+
+    if (in_array($expectedFormat, ['jpg', 'jfif'])) {
+        $expectedFormat = 'jpeg';
+    }
+
+    expect($targetFile)->toHaveMime("image/$expectedFormat");
+})->with('drivers', ['jpeg', 'jpg', 'jfif', 'gif', 'png', 'webp', 'avif']);
 
 it('can save supported formats using format() function', function (ImageDriver $driver, string $format) {
     if ($format === 'avif' && ! avifIsSupported($driver->driverName())) {