Merge branch 'develop' into feature/php-8.4

Intervention · Apr 14, 2024 · 2d5acba · 2d5acba
2 parents 2d289da + 3ff1573
commit 2d5acba
Show file tree

Hide file tree

Showing 73 changed files with 1,812 additions and 550 deletions.
diff --git a/composer.json b/composer.json
@@ -21,7 +21,7 @@
     "require": {
         "php": "^8.1",
         "ext-mbstring": "*",
-        "intervention/gif": "^4.0.1"
+        "intervention/gif": "^4.1"
     },
     "require-dev": {
         "phpunit/phpunit": "^10.0",

diff --git a/src/Decoders/NativeObjectDecoder.php b/src/Decoders/NativeObjectDecoder.php
@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Intervention\Image\Decoders;
+
+use Intervention\Image\Drivers\SpecializableDecoder;
+
+class NativeObjectDecoder extends SpecializableDecoder
+{
+}
diff --git a/src/Drivers/Gd/Decoders/BinaryImageDecoder.php b/src/Drivers/Gd/Decoders/BinaryImageDecoder.php
@@ -12,7 +12,7 @@
 use Intervention\Image\Exceptions\DecoderException;
 use Intervention\Image\Modifiers\AlignRotationModifier;
 
-class BinaryImageDecoder extends GdImageDecoder implements DecoderInterface
+class BinaryImageDecoder extends NativeObjectDecoder implements DecoderInterface
 {
     use CanDecodeGif;
 

diff --git a/src/Drivers/Gd/Decoders/FilePathImageDecoder.php b/src/Drivers/Gd/Decoders/FilePathImageDecoder.php
@@ -11,7 +11,7 @@
 use Intervention\Image\Interfaces\ImageInterface;
 use Intervention\Image\Modifiers\AlignRotationModifier;
 
-class FilePathImageDecoder extends GdImageDecoder implements DecoderInterface
+class FilePathImageDecoder extends NativeObjectDecoder implements DecoderInterface
 {
     use CanDecodeGif;
 

diff --git a/src/Drivers/Gd/Decoders/GdImageDecoder.php → ...ivers/Gd/Decoders/NativeObjectDecoder.php b/src/Drivers/Gd/Decoders/GdImageDecoder.php → ...ivers/Gd/Decoders/NativeObjectDecoder.php
@@ -13,8 +13,13 @@
 use Intervention\Image\Interfaces\ImageInterface;
 use Intervention\Image\Interfaces\ColorInterface;
 
-class GdImageDecoder extends AbstractDecoder
+class NativeObjectDecoder extends AbstractDecoder
 {
+    /**
+     * {@inheritdoc}
+     *
+     * @see DecoderInterface::decode()
+     */
     public function decode(mixed $input): ImageInterface|ColorInterface
     {
         if (!is_object($input)) {

diff --git a/src/Drivers/Gd/Driver.php b/src/Drivers/Gd/Driver.php
@@ -6,14 +6,18 @@
 
 use Intervention\Image\Drivers\AbstractDriver;
 use Intervention\Image\Exceptions\DriverException;
+use Intervention\Image\Exceptions\NotSupportedException;
 use Intervention\Image\Exceptions\RuntimeException;
+use Intervention\Image\Format;
+use Intervention\Image\FileExtension;
 use Intervention\Image\Image;
 use Intervention\Image\Interfaces\ColorInterface;
 use Intervention\Image\Interfaces\ColorProcessorInterface;
 use Intervention\Image\Interfaces\ColorspaceInterface;
 use Intervention\Image\Interfaces\DriverInterface;
 use Intervention\Image\Interfaces\FontProcessorInterface;
 use Intervention\Image\Interfaces\ImageInterface;
+use Intervention\Image\MediaType;
 
 class Driver extends AbstractDriver
 {
@@ -138,4 +142,28 @@ public function fontProcessor(): FontProcessorInterface
     {
         return new FontProcessor();
     }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @see DriverInterface::supports()
+     */
+    public function supports(string|Format|FileExtension|MediaType $identifier): bool
+    {
+        try {
+            $format = Format::create($identifier);
+        } catch (NotSupportedException) {
+            return false;
+        }
+
+        return match ($format) {
+            Format::JPEG => boolval(imagetypes() & IMG_JPEG),
+            Format::WEBP => boolval(imagetypes() & IMG_WEBP),
+            Format::GIF => boolval(imagetypes() & IMG_GIF),
+            Format::PNG => boolval(imagetypes() & IMG_PNG),
+            Format::AVIF => boolval(imagetypes() & IMG_AVIF),
+            Format::BMP => boolval(imagetypes() & IMG_BMP),
+            default => false,
+        };
+    }
 }
diff --git a/src/Drivers/Gd/Encoders/GifEncoder.php b/src/Drivers/Gd/Encoders/GifEncoder.php
@@ -23,7 +23,9 @@ public function encode(ImageInterface $image): EncodedImage
 
         $gd = $image->core()->native();
         $data = $this->buffered(function () use ($gd) {
+            imageinterlace($gd, $this->interlaced);
             imagegif($gd);
+            imageinterlace($gd, false);
         });
 
         return new EncodedImage($data, 'image/gif');
@@ -41,8 +43,9 @@ protected function encodeAnimated(ImageInterface $image): EncodedImage
 
         foreach ($image as $frame) {
             $builder->addFrame(
-                (string) $this->encode($frame->toImage($image->driver())),
-                $frame->delay()
+                source: (string) $this->encode($frame->toImage($image->driver())),
+                delay: $frame->delay(),
+                interlaced: $this->interlaced
             );
         }
 

diff --git a/src/Drivers/Gd/Encoders/JpegEncoder.php b/src/Drivers/Gd/Encoders/JpegEncoder.php
@@ -17,6 +17,7 @@ public function encode(ImageInterface $image): EncodedImage
         $output = Cloner::cloneBlended($image->core()->native(), background: $image->blendingColor());
 
         $data = $this->buffered(function () use ($output) {
+            imageinterlace($output, $this->progressive);
             imagejpeg($output, null, $this->quality);
         });
 

diff --git a/src/Drivers/Gd/Encoders/PngEncoder.php b/src/Drivers/Gd/Encoders/PngEncoder.php
@@ -13,8 +13,11 @@ class PngEncoder extends GenericPngEncoder implements SpecializedInterface
 {
     public function encode(ImageInterface $image): EncodedImage
     {
-        $data = $this->buffered(function () use ($image) {
-            imagepng($image->core()->native(), null, -1);
+        $gd = $image->core()->native();
+        $data = $this->buffered(function () use ($gd) {
+            imageinterlace($gd, $this->interlaced);
+            imagepng($gd, null, -1);
+            imageinterlace($gd, false);
         });
 
         return new EncodedImage($data, 'image/png');

diff --git a/src/Drivers/Gd/InputHandler.php b/src/Drivers/Gd/InputHandler.php
@@ -19,11 +19,13 @@
 use Intervention\Image\Drivers\Gd\Decoders\BinaryImageDecoder;
 use Intervention\Image\Drivers\Gd\Decoders\DataUriImageDecoder;
 use Intervention\Image\Drivers\Gd\Decoders\Base64ImageDecoder;
+use Intervention\Image\Drivers\Gd\Decoders\NativeObjectDecoder;
 use Intervention\Image\Drivers\Gd\Decoders\SplFileInfoImageDecoder;
 
 class InputHandler extends AbstractInputHandler
 {
     protected array $decoders = [
+        NativeObjectDecoder::class,
         ImageObjectDecoder::class,
         ColorObjectDecoder::class,
         RgbHexColorDecoder::class,

diff --git a/src/Drivers/Gd/Modifiers/TrimModifier.php b/src/Drivers/Gd/Modifiers/TrimModifier.php
@@ -0,0 +1,82 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Intervention\Image\Drivers\Gd\Modifiers;
+
+use Intervention\Image\Exceptions\AnimationException;
+use Intervention\Image\Exceptions\NotSupportedException;
+use Intervention\Image\Exceptions\RuntimeException;
+use Intervention\Image\Geometry\Point;
+use Intervention\Image\Interfaces\ImageInterface;
+use Intervention\Image\Interfaces\SpecializedInterface;
+use Intervention\Image\Modifiers\TrimModifier as GenericTrimModifier;
+
+class TrimModifier extends GenericTrimModifier implements SpecializedInterface
+{
+    public function apply(ImageInterface $image): ImageInterface
+    {
+        if ($image->isAnimated()) {
+            throw new NotSupportedException('Trim modifier cannot be applied to animated images.');
+        }
+
+        // apply tolerance with a min. value of .5 because the default tolerance of '0' should
+        // already trim away similar colors which is not the case with imagecropauto.
+        $trimmed = imagecropauto(
+            $image->core()->native(),
+            IMG_CROP_THRESHOLD,
+            max([.5, $this->tolerance / 10]),
+            $this->trimColor($image)
+        );
+
+        // if the tolerance is very high, it is possible that no image is left.
+        // imagick returns a 1x1 pixel image in this case. this does the same.
+        if ($trimmed === false) {
+            $trimmed = $this->driver()->createImage(1, 1)->core()->native();
+        }
+
+        $image->core()->setNative($trimmed);
+
+        return $image;
+    }
+
+    /**
+     * Create an average color from the colors of the four corner points of the given image
+     *
+     * @param ImageInterface $image
+     * @throws RuntimeException
+     * @throws AnimationException
+     * @return int
+     */
+    private function trimColor(ImageInterface $image): int
+    {
+        // trim color base
+        $red = 0;
+        $green = 0;
+        $blue = 0;
+
+        // corner coordinates
+        $size = $image->size();
+        $cornerPoints = [
+            new Point(0, 0),
+            new Point($size->width() - 1, 0),
+            new Point(0, $size->height() - 1),
+            new Point($size->width() - 1, $size->height() - 1),
+        ];
+
+        // create an average color to be used in trim operation
+        foreach ($cornerPoints as $pos) {
+            $cornerColor = imagecolorat($image->core()->native(), $pos->x(), $pos->y());
+            $rgb = imagecolorsforindex($image->core()->native(), $cornerColor);
+            $red += round(round(($rgb['red'] / 51)) * 51);
+            $green += round(round(($rgb['green'] / 51)) * 51);
+            $blue += round(round(($rgb['blue'] / 51)) * 51);
+        }
+
+        $red = (int) round($red / 4);
+        $green = (int) round($green / 4);
+        $blue = (int) round($blue / 4);
+
+        return imagecolorallocate($image->core()->native(), $red, $green, $blue);
+    }
+}
diff --git a/src/Drivers/Imagick/Decoders/BinaryImageDecoder.php b/src/Drivers/Imagick/Decoders/BinaryImageDecoder.php
@@ -10,7 +10,7 @@
 use Intervention\Image\Interfaces\ColorInterface;
 use Intervention\Image\Interfaces\ImageInterface;
 
-class BinaryImageDecoder extends ImagickImageDecoder
+class BinaryImageDecoder extends NativeObjectDecoder
 {
     public function decode(mixed $input): ImageInterface|ColorInterface
     {

diff --git a/src/Drivers/Imagick/Decoders/FilePathImageDecoder.php b/src/Drivers/Imagick/Decoders/FilePathImageDecoder.php
@@ -10,7 +10,7 @@
 use Intervention\Image\Interfaces\ColorInterface;
 use Intervention\Image\Interfaces\ImageInterface;
 
-class FilePathImageDecoder extends ImagickImageDecoder
+class FilePathImageDecoder extends NativeObjectDecoder
 {
     public function decode(mixed $input): ImageInterface|ColorInterface
     {

diff --git a/.../Imagick/Decoders/ImagickImageDecoder.php → .../Imagick/Decoders/NativeObjectDecoder.php b/.../Imagick/Decoders/ImagickImageDecoder.php → .../Imagick/Decoders/NativeObjectDecoder.php
@@ -14,7 +14,7 @@
 use Intervention\Image\Interfaces\ImageInterface;
 use Intervention\Image\Modifiers\AlignRotationModifier;
 
-class ImagickImageDecoder extends SpecializableDecoder
+class NativeObjectDecoder extends SpecializableDecoder
 {
     public function decode(mixed $input): ImageInterface|ColorInterface
     {

diff --git a/src/Drivers/Imagick/Driver.php b/src/Drivers/Imagick/Driver.php
@@ -8,14 +8,18 @@
 use ImagickPixel;
 use Intervention\Image\Drivers\AbstractDriver;
 use Intervention\Image\Exceptions\DriverException;
+use Intervention\Image\Exceptions\NotSupportedException;
 use Intervention\Image\Exceptions\RuntimeException;
+use Intervention\Image\Format;
+use Intervention\Image\FileExtension;
 use Intervention\Image\Image;
 use Intervention\Image\Interfaces\ColorInterface;
 use Intervention\Image\Interfaces\ColorProcessorInterface;
 use Intervention\Image\Interfaces\ColorspaceInterface;
 use Intervention\Image\Interfaces\DriverInterface;
 use Intervention\Image\Interfaces\FontProcessorInterface;
 use Intervention\Image\Interfaces\ImageInterface;
+use Intervention\Image\MediaType;
 
 class Driver extends AbstractDriver
 {
@@ -141,4 +145,15 @@ public function fontProcessor(): FontProcessorInterface
     {
         return new FontProcessor();
     }
+
+    public function supports(string|Format|FileExtension|MediaType $identifier): bool
+    {
+        try {
+            $format = Format::create($identifier);
+        } catch (NotSupportedException) {
+            return false;
+        }
+
+        return count(Imagick::queryFormats($format->name)) >= 1;
+    }
 }
diff --git a/src/Drivers/Imagick/Encoders/GifEncoder.php b/src/Drivers/Imagick/Encoders/GifEncoder.php
@@ -24,6 +24,10 @@ public function encode(ImageInterface $image): EncodedImage
         $imagick->setCompression($compression);
         $imagick->setImageCompression($compression);
 
+        if ($this->interlaced) {
+            $imagick->setInterlaceScheme(Imagick::INTERLACE_LINE);
+        }
+
         return new EncodedImage($imagick->getImagesBlob(), 'image/gif');
     }
 }
diff --git a/src/Drivers/Imagick/Encoders/JpegEncoder.php b/src/Drivers/Imagick/Encoders/JpegEncoder.php
@@ -37,6 +37,10 @@ public function encode(ImageInterface $image): EncodedImage
         $imagick->setImageCompressionQuality($this->quality);
         $imagick->setImageAlphaChannel(Imagick::ALPHACHANNEL_REMOVE);
 
+        if ($this->progressive) {
+            $imagick->setInterlaceScheme(Imagick::INTERLACE_PLANE);
+        }
+
         return new EncodedImage($imagick->getImagesBlob(), 'image/jpeg');
     }
 }
diff --git a/src/Drivers/Imagick/Encoders/PngEncoder.php b/src/Drivers/Imagick/Encoders/PngEncoder.php
@@ -23,6 +23,10 @@ public function encode(ImageInterface $image): EncodedImage
         $imagick->setCompression($compression);
         $imagick->setImageCompression($compression);
 
+        if ($this->interlaced) {
+            $imagick->setInterlaceScheme(Imagick::INTERLACE_LINE);
+        }
+
         return new EncodedImage($imagick->getImagesBlob(), 'image/png');
     }
 }
diff --git a/src/Drivers/Imagick/InputHandler.php b/src/Drivers/Imagick/InputHandler.php
@@ -19,11 +19,13 @@
 use Intervention\Image\Drivers\Imagick\Decoders\BinaryImageDecoder;
 use Intervention\Image\Drivers\Imagick\Decoders\DataUriImageDecoder;
 use Intervention\Image\Drivers\Imagick\Decoders\Base64ImageDecoder;
+use Intervention\Image\Drivers\Imagick\Decoders\NativeObjectDecoder;
 use Intervention\Image\Drivers\Imagick\Decoders\SplFileInfoImageDecoder;
 
 class InputHandler extends AbstractInputHandler
 {
     protected array $decoders = [
+        NativeObjectDecoder::class,
         ImageObjectDecoder::class,
         ColorObjectDecoder::class,
         RgbHexColorDecoder::class,

diff --git a/src/Drivers/Imagick/Modifiers/TrimModifier.php b/src/Drivers/Imagick/Modifiers/TrimModifier.php
@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Intervention\Image\Drivers\Imagick\Modifiers;
+
+use Intervention\Image\Exceptions\NotSupportedException;
+use Intervention\Image\Interfaces\ImageInterface;
+use Intervention\Image\Interfaces\SpecializedInterface;
+use Intervention\Image\Modifiers\TrimModifier as GenericTrimModifier;
+
+class TrimModifier extends GenericTrimModifier implements SpecializedInterface
+{
+    public function apply(ImageInterface $image): ImageInterface
+    {
+        if ($image->isAnimated()) {
+            throw new NotSupportedException('Trim modifier cannot be applied to animated images.');
+        }
+
+        $imagick = $image->core()->native();
+        $imagick->trimImage(($this->tolerance / 100 * $imagick->getQuantum()) / 1.5);
+        $imagick->setImagePage(0, 0, 0, 0);
+
+        return $image;
+    }
+}