fix png / gif thumbnail generation

Author: aguingand

src/Form/Eloquent/Uploads/Thumbnails/Thumbnail.php

@@ -224,7 +224,11 @@ private function resolveEncoder(): EncoderInterface
             ) {
                 $class = $this->encoderClass;
 
-                return new $class(quality: $this->quality);
+                return tap(new $class(), function ($encoder) {
+                    if (isset($encoder->quality)) {
+                        $encoder->quality = $this->quality;
+                    }
+                });
             }
             throw new EncoderException('Encoder class ('.$this->encoderClass.') does not exist or does not implement EncoderInterface.');
         }

tests/Unit/Form/Eloquent/Uploads/SharpUploadModelTest.php

@@ -111,20 +111,51 @@
         ->and($thumbWasCreatedTwice)->toBeFalse();
 });
 
-it('allows to define an encoder when creating the thumbnail', function () {
-    $file = createImage(name: 'my-image.png');
-    $upload = createSharpUploadModel($file);
-
-    $thumb = $upload->thumbnail()
-        ->setQuality(80)
-        ->when($upload->mime_type == 'image/png', fn ($thumbnail) => $thumbnail->toWebp())
-        ->make(150);
-
-    expect($thumb)
+it('allows to define an encoder when creating the thumbnail', function (string $driver) {
+    sharp()->config()
+        ->configureUploadsThumbnailCreation(imageDriverClass: $driver);
+
+    expect(
+        createSharpUploadModel(createImage(name: 'my-image.png'))->thumbnail()->setQuality(80)
+            ->toWebp()->make(150)
+    )
         ->toEqual('/storage/thumbnails/data/150-_q-80/my-image.webp')
-        ->and(Storage::disk('public')->exists('thumbnails/data/150-_q-80/my-image.webp'))
-        ->toBeTrue();
-});
+        ->and(Storage::disk('public')->exists('thumbnails/data/150-_q-80/my-image.webp'))->toBeTrue();
+
+    expect(
+        createSharpUploadModel(createImage(name: 'my-image.png'))->thumbnail()->setQuality(80)
+            ->toGif()->make(150)
+    )
+        ->toEqual('/storage/thumbnails/data/150-_q-80/my-image.gif')
+        ->and(Storage::disk('public')->exists('thumbnails/data/150-_q-80/my-image.gif'))->toBeTrue();
+
+    expect(
+        createSharpUploadModel(createImage(name: 'my-image.gif'))->thumbnail()->setQuality(80)
+            ->toPng()->make(150)
+    )
+        ->toEqual('/storage/thumbnails/data/150-_q-80/my-image.png')
+        ->and(Storage::disk('public')->exists('thumbnails/data/150-_q-80/my-image.png'))->toBeTrue();
+
+    expect(
+        createSharpUploadModel(createImage(name: 'my-image.gif'))->thumbnail()->setQuality(80)
+            ->toJpeg()->make(150)
+    )
+        ->toEqual('/storage/thumbnails/data/150-_q-80/my-image.jpeg')
+        ->and(Storage::disk('public')->exists('thumbnails/data/150-_q-80/my-image.jpeg'))->toBeTrue();
+
+    if ($driver === \Intervention\Image\Drivers\Imagick\Driver::class) {
+        expect(
+            createSharpUploadModel(createImage(name: 'my-image.png'))->thumbnail()->setQuality(80)
+                ->toAvif()->make(150)
+        )
+            ->toEqual('/storage/thumbnails/data/150-_q-80/my-image.avif')
+            ->and(Storage::disk('public')->exists('thumbnails/data/150-_q-80/my-image.avif'))->toBeTrue();
+    }
+})
+    ->with([
+        \Intervention\Image\Drivers\Gd\Driver::class,
+        \Intervention\Image\Drivers\Imagick\Driver::class,
+    ]);
 
 it('allows to create SVG thumbnail by only copying the file', function () {
     $file = createImage('local', 'test.svg');