wip

Author: michalsn

system/Images/Handlers/ImageMagickHandler.php

@@ -277,6 +277,22 @@ protected function _flip(string $direction)
         return $this;
     }
 
+    /**
+     * Changes the image type.
+     *
+     * Validates that the target format is supported before applying the change.
+     *
+     * @throws ImageException
+     */
+    public function convert(int $imageType)
+    {
+        parent::convert($imageType);
+
+        $this->supportedFormatCheck();
+
+        return $this;
+    }
+
     /**
      * Get a driver version
      *
@@ -384,20 +400,6 @@ public function save(?string $target = null, int $quality = 90): bool
         try {
             $result = $this->resource->writeImage($target);
 
-            if (! $result || ! file_exists($target) || filesize($target) === 0) {
-                $extension = strtoupper(pathinfo($target, PATHINFO_EXTENSION));
-                $message   = match ($extension) {
-                    'GIF'  => lang('Images.gifNotSupported'),
-                    'JPG', 'JPEG' => lang('Images.jpgNotSupported'),
-                    'PNG'  => lang('Images.pngNotSupported'),
-                    'WEBP' => lang('Images.webpNotSupported'),
-                    'AVIF' => lang('Images.avifNotSupported'),
-                    default => null,
-                };
-
-                throw ImageException::forInvalidImageCreate($message);
-            }
-
             chmod($target, $this->filePermissions);
 
             $this->resource->clear();

tests/system/Images/ImageMagickHandlerTest.php

@@ -434,14 +434,14 @@ public function testImageConvertPngToWebp(): void
 
     public function testImageConvertPngToAvif(): void
     {
-        try {
-            $this->handler->withFile($this->origin . 'ci-logo.png');
-            $this->handler->convert(IMAGETYPE_AVIF);
-            $this->handler->save($this->root . 'ci-logo.avif');
-        } catch (ImageException $e) {
-            $this->markTestSkipped('AVIF encoding is not supported on this system: ' . $e->getMessage());
+        if (! in_array('AVIF', Imagick::queryFormats(), true)) {
+            $this->expectException(ImageException::class);
+            $this->expectExceptionMessage('Your server does not support the GD function required to process an avif image.');
         }
 
+        $this->handler->withFile($this->origin . 'ci-logo.png');
+        $this->handler->convert(IMAGETYPE_AVIF);
+        $this->handler->save($this->root . 'ci-logo.avif');
         $this->assertSame(IMAGETYPE_AVIF, exif_imagetype($this->root . 'ci-logo.avif'));
     }