wip

Author: michalsn

.github/workflows/reusable-phpunit-test.yml

@@ -167,13 +167,6 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y imagemagick libmagickwand-dev ghostscript poppler-data libjbig2dec0:amd64 libopenjp2-7:amd64 libheif-dev libmagickcore-6.q16-7-extra
 
-      - name: Check ImageMagick AVIF support
-        if: ${{ contains(inputs.extra-extensions, 'imagick') }}
-        run: |
-          convert -list delegate | grep -i "heic\|avif" || echo "No HEIC/AVIF delegate found"
-          apt-cache show imagemagick | grep -i "version"
-          apt-cache search "magickcore.*extra"
-
       - name: Checkout base branch for PR
         if: github.event_name == 'pull_request'
         uses: actions/checkout@v6

system/Images/Handlers/ImageMagickHandler.php

@@ -384,6 +384,20 @@ 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,9 +434,14 @@ public function testImageConvertPngToWebp(): void
 
     public function testImageConvertPngToAvif(): void
     {
-        $this->handler->withFile($this->origin . 'ci-logo.png');
-        $this->handler->convert(IMAGETYPE_AVIF);
-        $this->handler->save($this->root . 'ci-logo.avif');
+        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());
+        }
+
         $this->assertSame(IMAGETYPE_AVIF, exif_imagetype($this->root . 'ci-logo.avif'));
     }