Add avif encoding

Dockerfile

@@ -4,6 +4,7 @@ RUN apt update \
         && apt install -y \
             libpng-dev \
             libicu-dev \
+            libavif-dev \
             libpq-dev \
             libzip-dev \
             zip \
@@ -13,7 +14,7 @@ RUN apt update \
             libmagickwand-dev \
             libwebp-dev \
         && pecl install imagick \
-        && docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp \
+        && docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp --with-avif \
         && docker-php-ext-enable imagick \
         && docker-php-ext-install \
             intl \

composer.json

@@ -14,7 +14,7 @@
     "require": {
         "php": "^8.1",
         "intervention/gif": "^3.0",
-        "intervention/mimesniffer": "^0.4.2"
+        "intervention/mimesniffer": "^0.5"
     },
     "require-dev": {
         "phpunit/phpunit": "^9",

src/Drivers/Abstract/AbstractImage.php

@@ -94,6 +94,13 @@ public function toBmp(): EncodedImage
         return $this->toBitmap();
     }
 
+    public function toAvif(): EncodedImage
+    {
+        return $this->encode(
+            $this->resolveDriverClass('Encoders\AvifEncoder')
+        );
+    }
+
     public function greyscale(): ImageInterface
     {
         return $this->modify(

src/Drivers/Gd/Encoders/AvifEncoder.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace Intervention\Image\Drivers\Gd\Encoders;
+
+use Intervention\Image\Drivers\Abstract\Encoders\AbstractEncoder;
+use Intervention\Image\EncodedImage;
+use Intervention\Image\Interfaces\EncoderInterface;
+use Intervention\Image\Interfaces\ImageInterface;
+
+class AvifEncoder extends AbstractEncoder implements EncoderInterface
+{
+    public function __construct(int $quality)
+    {
+        $this->quality = $quality;
+    }
+
+    public function encode(ImageInterface $image): EncodedImage
+    {
+        $data = $this->getBuffered(function () use ($image) {
+            imageavif($image->getFrame()->getCore(), null, $this->quality);
+        });
+
+        return new EncodedImage($data, 'image/avif');
+    }
+}

src/Drivers/Imagick/Encoders/AvifEncoder.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace Intervention\Image\Drivers\Imagick\Encoders;
+
+use Imagick;
+use Intervention\Image\Drivers\Abstract\Encoders\AbstractEncoder;
+use Intervention\Image\EncodedImage;
+use Intervention\Image\Interfaces\EncoderInterface;
+use Intervention\Image\Interfaces\ImageInterface;
+
+class AvifEncoder extends AbstractEncoder implements EncoderInterface
+{
+    public function encode(ImageInterface $image): EncodedImage
+    {
+        $format = 'avif';
+        $compression = Imagick::COMPRESSION_ZIP;
+
+        $imagick = $image->getFrame()->getCore();
+        $imagick->setFormat($format);
+        $imagick->setImageFormat($format);
+        $imagick->setCompression($compression);
+        $imagick->setImageCompression($compression);
+
+        return new EncodedImage($imagick->getImagesBlob(), 'image/avif');
+    }
+}

src/Interfaces/ImageInterface.php

@@ -109,6 +109,12 @@ public function toWebp(int $quality = 75): EncodedImage;
      */
     public function toGif(): EncodedImage;
 
+    /**
+     * Encode image to avif format
+     *
+     * @return EncodedImage
+     */
+    public function toAvif(): EncodedImage;
 
     /**
      * Encode image to png format

tests/Drivers/Gd/Encoders/AvifEncoderTest.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace Intervention\Image\Tests\Drivers\Gd\Encoders;
+
+use Intervention\Image\Collection;
+use Intervention\Image\Drivers\Gd\Encoders\AvifEncoder;
+use Intervention\Image\Drivers\Gd\Frame;
+use Intervention\Image\Drivers\Gd\Image;
+use Intervention\Image\Tests\TestCase;
+use Intervention\MimeSniffer\MimeSniffer;
+use Intervention\MimeSniffer\Types\ImageAvif;
+
+/**
+ * @requires extension gd
+ * @covers \Intervention\Image\Drivers\Gd\Encoders\AvifEncoder
+ */
+class AvifEncoderTest extends TestCase
+{
+    protected function getTestImage(): Image
+    {
+        return new Image(new Collection([
+            new Frame(imagecreatetruecolor(3, 2))
+        ]));
+    }
+
+    public function testEncode(): void
+    {
+        $image = $this->getTestImage();
+        $encoder = new AvifEncoder(10);
+        $result = $encoder->encode($image);
+        $this->assertTrue(MimeSniffer::createFromString($result)->matches(new ImageAvif()));
+    }
+}

tests/Drivers/Imagick/Encoders/AvifEncoderTest.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace Intervention\Image\Tests\Drivers\Imagick\Encoders;
+
+use Imagick;
+use ImagickPixel;
+use Intervention\Image\Drivers\Imagick\Encoders\AvifEncoder;
+use Intervention\Image\Drivers\Imagick\Image;
+use Intervention\Image\Tests\TestCase;
+use Intervention\MimeSniffer\MimeSniffer;
+use Intervention\MimeSniffer\Types\ImageAvif;
+
+/**
+ * @requires extension imagick
+ * @covers \Intervention\Image\Drivers\Imagick\Encoders\JpegEncoder
+ */
+class AvifEncoderTest extends TestCase
+{
+    protected function getTestImage(): Image
+    {
+        $imagick = new Imagick();
+        $imagick->newImage(3, 2, new ImagickPixel('red'), 'png');
+
+        return new Image($imagick);
+    }
+
+    public function testEncode(): void
+    {
+        $image = $this->getTestImage();
+        $encoder = new AvifEncoder(10);
+        $result = $encoder->encode($image);
+        $this->assertTrue(MimeSniffer::createFromString($result)->matches(new ImageAvif()));
+    }
+}