From 6e104b6594d64bca359e0b24533d4e9c38844eaa Mon Sep 17 00:00:00 2001
From: Oliver Vogel <oliver@olivervogel.com>
Date: Wed, 10 Apr 2024 15:17:36 +0200
Subject: [PATCH] Add ability to read Imagick or GDImage directly (#1329)

---
 src/Decoders/NativeObjectDecoder.php                  | 11 +++++++++++
 src/Drivers/Gd/Decoders/BinaryImageDecoder.php        |  2 +-
 src/Drivers/Gd/Decoders/FilePathImageDecoder.php      |  2 +-
 .../{GdImageDecoder.php => NativeObjectDecoder.php}   |  7 ++++++-
 src/Drivers/Gd/InputHandler.php                       |  2 ++
 src/Drivers/Imagick/Decoders/BinaryImageDecoder.php   |  2 +-
 src/Drivers/Imagick/Decoders/FilePathImageDecoder.php |  2 +-
 ...magickImageDecoder.php => NativeObjectDecoder.php} |  2 +-
 src/Drivers/Imagick/InputHandler.php                  |  2 ++
 tests/Unit/Drivers/Gd/InputHandlerTest.php            |  7 +++++++
 tests/Unit/Drivers/Imagick/InputHandlerTest.php       | 11 +++++++++++
 11 files changed, 44 insertions(+), 6 deletions(-)
 create mode 100644 src/Decoders/NativeObjectDecoder.php
 rename src/Drivers/Gd/Decoders/{GdImageDecoder.php => NativeObjectDecoder.php} (88%)
 rename src/Drivers/Imagick/Decoders/{ImagickImageDecoder.php => NativeObjectDecoder.php} (96%)

diff --git a/src/Decoders/NativeObjectDecoder.php b/src/Decoders/NativeObjectDecoder.php
new file mode 100644
index 00000000..ff83cd95
--- /dev/null
+++ 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
index 67d31d06..c71b3232 100644
--- a/src/Drivers/Gd/Decoders/BinaryImageDecoder.php
+++ b/src/Drivers/Gd/Decoders/BinaryImageDecoder.php
@@ -12,7 +12,7 @@ use Intervention\Image\Drivers\Gd\Decoders\Traits\CanDecodeGif;
 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
index 3cd69185..f83252ba 100644
--- a/src/Drivers/Gd/Decoders/FilePathImageDecoder.php
+++ b/src/Drivers/Gd/Decoders/FilePathImageDecoder.php
@@ -11,7 +11,7 @@ use Intervention\Image\Interfaces\DecoderInterface;
 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 b/src/Drivers/Gd/Decoders/NativeObjectDecoder.php
similarity index 88%
rename from src/Drivers/Gd/Decoders/GdImageDecoder.php
rename to src/Drivers/Gd/Decoders/NativeObjectDecoder.php
index d48b4659..ca1bc38d 100644
--- a/src/Drivers/Gd/Decoders/GdImageDecoder.php
+++ b/src/Drivers/Gd/Decoders/NativeObjectDecoder.php
@@ -13,8 +13,13 @@ use Intervention\Image\Image;
 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/InputHandler.php b/src/Drivers/Gd/InputHandler.php
index 35d1a637..62eec6a4 100644
--- a/src/Drivers/Gd/InputHandler.php
+++ b/src/Drivers/Gd/InputHandler.php
@@ -19,11 +19,13 @@ use Intervention\Image\Drivers\Gd\Decoders\FilePathImageDecoder;
 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/Imagick/Decoders/BinaryImageDecoder.php b/src/Drivers/Imagick/Decoders/BinaryImageDecoder.php
index b96e6290..177a36e6 100644
--- a/src/Drivers/Imagick/Decoders/BinaryImageDecoder.php
+++ b/src/Drivers/Imagick/Decoders/BinaryImageDecoder.php
@@ -10,7 +10,7 @@ use Intervention\Image\Exceptions\DecoderException;
 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
index 34834381..639c0c88 100644
--- a/src/Drivers/Imagick/Decoders/FilePathImageDecoder.php
+++ b/src/Drivers/Imagick/Decoders/FilePathImageDecoder.php
@@ -10,7 +10,7 @@ use Intervention\Image\Exceptions\DecoderException;
 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/src/Drivers/Imagick/Decoders/ImagickImageDecoder.php b/src/Drivers/Imagick/Decoders/NativeObjectDecoder.php
similarity index 96%
rename from src/Drivers/Imagick/Decoders/ImagickImageDecoder.php
rename to src/Drivers/Imagick/Decoders/NativeObjectDecoder.php
index 501d74d9..15d61b8d 100644
--- a/src/Drivers/Imagick/Decoders/ImagickImageDecoder.php
+++ b/src/Drivers/Imagick/Decoders/NativeObjectDecoder.php
@@ -14,7 +14,7 @@ use Intervention\Image\Interfaces\ColorInterface;
 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/InputHandler.php b/src/Drivers/Imagick/InputHandler.php
index 43dc287b..de590ff9 100644
--- a/src/Drivers/Imagick/InputHandler.php
+++ b/src/Drivers/Imagick/InputHandler.php
@@ -19,11 +19,13 @@ use Intervention\Image\Drivers\Imagick\Decoders\FilePathImageDecoder;
 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/tests/Unit/Drivers/Gd/InputHandlerTest.php b/tests/Unit/Drivers/Gd/InputHandlerTest.php
index 43e119d6..f2e2e475 100644
--- a/tests/Unit/Drivers/Gd/InputHandlerTest.php
+++ b/tests/Unit/Drivers/Gd/InputHandlerTest.php
@@ -34,6 +34,13 @@ final class InputHandlerTest extends BaseTestCase
         $this->assertInstanceOf(Image::class, $result);
     }
 
+    public function testHandleGdImage(): void
+    {
+        $handler = new InputHandler();
+        $result = $handler->handle(imagecreatetruecolor(3, 2));
+        $this->assertInstanceOf(Image::class, $result);
+    }
+
     public function testHandleSplFileInfo(): void
     {
         $handler = new InputHandler();
diff --git a/tests/Unit/Drivers/Imagick/InputHandlerTest.php b/tests/Unit/Drivers/Imagick/InputHandlerTest.php
index 16449d4e..1b4fbf39 100644
--- a/tests/Unit/Drivers/Imagick/InputHandlerTest.php
+++ b/tests/Unit/Drivers/Imagick/InputHandlerTest.php
@@ -4,6 +4,8 @@ declare(strict_types=1);
 
 namespace Intervention\Image\Tests\Unit\Drivers\Imagick;
 
+use Imagick;
+use ImagickPixel;
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\RequiresPhpExtension;
 use Intervention\Image\Colors\Cmyk\Color as CmykColor;
@@ -34,6 +36,15 @@ final class InputHandlerTest extends BaseTestCase
         $this->assertInstanceOf(Image::class, $result);
     }
 
+    public function testHandleImagick(): void
+    {
+        $imagick = new Imagick();
+        $imagick->newImage(3, 2, new ImagickPixel('rgba(255, 255, 255, 255)'), 'png');
+        $handler = new InputHandler();
+        $result = $handler->handle($imagick);
+        $this->assertInstanceOf(Image::class, $result);
+    }
+
     public function testHandleSplFileInfo(): void
     {
         $handler = new InputHandler();