From 356f79e99c6196f688372c70cfe1ef8810c9f227 Mon Sep 17 00:00:00 2001 From: Oliver Vogel Date: Wed, 3 Jan 2024 17:10:52 +0100 Subject: [PATCH 1/5] Adapt gif encoder api to intervention/gif v4 --- src/Drivers/Gd/Encoders/GifEncoder.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Drivers/Gd/Encoders/GifEncoder.php b/src/Drivers/Gd/Encoders/GifEncoder.php index e918a914..294dd751 100644 --- a/src/Drivers/Gd/Encoders/GifEncoder.php +++ b/src/Drivers/Gd/Encoders/GifEncoder.php @@ -27,8 +27,7 @@ class GifEncoder extends DriverSpecializedEncoder { $builder = GifBuilder::canvas( $image->width(), - $image->height(), - $image->loops() + $image->height() ); foreach ($image as $frame) { @@ -38,6 +37,8 @@ class GifEncoder extends DriverSpecializedEncoder ); } + $builder->setLoops($image->loops()); + return new EncodedImage($builder->encode(), 'image/gif'); } } From 72afbe47cf1dcf142a1aef40a298b98cc9839cdf Mon Sep 17 00:00:00 2001 From: Oliver Vogel Date: Thu, 4 Jan 2024 12:33:22 +0100 Subject: [PATCH 2/5] Increase version number of intervention/gif --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 423f2bbe..711b7ed9 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ "require": { "php": "^8.1", "ext-mbstring": "*", - "intervention/gif": "^3" + "intervention/gif": "^4" }, "require-dev": { "phpunit/phpunit": "^9", From fd5a86293991a33e8d4bb0641158e17813e11505 Mon Sep 17 00:00:00 2001 From: Oliver Vogel Date: Sun, 7 Jan 2024 10:04:31 +0100 Subject: [PATCH 3/5] Remove comments --- src/Encoders/FileExtensionEncoder.php | 1 - src/Exceptions/AnimationException.php | 1 - src/Exceptions/ColorException.php | 1 - src/Exceptions/DecoderException.php | 1 - src/Exceptions/FontException.php | 1 - src/Exceptions/GeometryException.php | 1 - src/Exceptions/InputException.php | 1 - src/Exceptions/NotSupportedException.php | 1 - src/Exceptions/NotWritableException.php | 1 - src/Exceptions/RuntimeException.php | 1 - 10 files changed, 10 deletions(-) diff --git a/src/Encoders/FileExtensionEncoder.php b/src/Encoders/FileExtensionEncoder.php index 41b7821f..8eabe21b 100644 --- a/src/Encoders/FileExtensionEncoder.php +++ b/src/Encoders/FileExtensionEncoder.php @@ -2,7 +2,6 @@ namespace Intervention\Image\Encoders; -use Intervention\Gif\Exception\EncoderException; use Intervention\Image\Interfaces\EncodedImageInterface; use Intervention\Image\Interfaces\EncoderInterface; use Intervention\Image\Interfaces\ImageInterface; diff --git a/src/Exceptions/AnimationException.php b/src/Exceptions/AnimationException.php index 0019e2a3..e77279bf 100644 --- a/src/Exceptions/AnimationException.php +++ b/src/Exceptions/AnimationException.php @@ -4,5 +4,4 @@ namespace Intervention\Image\Exceptions; class AnimationException extends \RuntimeException { - // } diff --git a/src/Exceptions/ColorException.php b/src/Exceptions/ColorException.php index 4eda9322..2287c115 100644 --- a/src/Exceptions/ColorException.php +++ b/src/Exceptions/ColorException.php @@ -4,5 +4,4 @@ namespace Intervention\Image\Exceptions; class ColorException extends \RuntimeException { - // } diff --git a/src/Exceptions/DecoderException.php b/src/Exceptions/DecoderException.php index 9271e202..a2cb273e 100644 --- a/src/Exceptions/DecoderException.php +++ b/src/Exceptions/DecoderException.php @@ -4,5 +4,4 @@ namespace Intervention\Image\Exceptions; class DecoderException extends \RuntimeException { - // } diff --git a/src/Exceptions/FontException.php b/src/Exceptions/FontException.php index be32f177..ec3e61c3 100644 --- a/src/Exceptions/FontException.php +++ b/src/Exceptions/FontException.php @@ -4,5 +4,4 @@ namespace Intervention\Image\Exceptions; class FontException extends \RuntimeException { - // } diff --git a/src/Exceptions/GeometryException.php b/src/Exceptions/GeometryException.php index 7bca9ad7..ec80e83c 100644 --- a/src/Exceptions/GeometryException.php +++ b/src/Exceptions/GeometryException.php @@ -4,5 +4,4 @@ namespace Intervention\Image\Exceptions; class GeometryException extends \RuntimeException { - // } diff --git a/src/Exceptions/InputException.php b/src/Exceptions/InputException.php index 5710e09f..b20ec74d 100644 --- a/src/Exceptions/InputException.php +++ b/src/Exceptions/InputException.php @@ -4,5 +4,4 @@ namespace Intervention\Image\Exceptions; class InputException extends \RuntimeException { - // } diff --git a/src/Exceptions/NotSupportedException.php b/src/Exceptions/NotSupportedException.php index e4c88468..05411b8f 100644 --- a/src/Exceptions/NotSupportedException.php +++ b/src/Exceptions/NotSupportedException.php @@ -4,5 +4,4 @@ namespace Intervention\Image\Exceptions; class NotSupportedException extends \RuntimeException { - // } diff --git a/src/Exceptions/NotWritableException.php b/src/Exceptions/NotWritableException.php index 86a9a41a..d93c6781 100644 --- a/src/Exceptions/NotWritableException.php +++ b/src/Exceptions/NotWritableException.php @@ -4,5 +4,4 @@ namespace Intervention\Image\Exceptions; class NotWritableException extends \RuntimeException { - # nothing to override } diff --git a/src/Exceptions/RuntimeException.php b/src/Exceptions/RuntimeException.php index 55a4e9d8..188d86f6 100644 --- a/src/Exceptions/RuntimeException.php +++ b/src/Exceptions/RuntimeException.php @@ -4,5 +4,4 @@ namespace Intervention\Image\Exceptions; class RuntimeException extends \RuntimeException { - // } From 14b64d06110fd7ea8fe8760e54512774dec2f481 Mon Sep 17 00:00:00 2001 From: Oliver Vogel Date: Sun, 7 Jan 2024 10:04:40 +0100 Subject: [PATCH 4/5] Add EncoderException --- src/Exceptions/EncoderException.php | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 src/Exceptions/EncoderException.php diff --git a/src/Exceptions/EncoderException.php b/src/Exceptions/EncoderException.php new file mode 100644 index 00000000..a6ac36b4 --- /dev/null +++ b/src/Exceptions/EncoderException.php @@ -0,0 +1,7 @@ + Date: Sun, 7 Jan 2024 10:06:33 +0100 Subject: [PATCH 5/5] Fix wrong exception types --- src/Encoders/FileExtensionEncoder.php | 1 + src/Encoders/MediaTypeEncoder.php | 2 +- src/Image.php | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Encoders/FileExtensionEncoder.php b/src/Encoders/FileExtensionEncoder.php index 8eabe21b..5637792e 100644 --- a/src/Encoders/FileExtensionEncoder.php +++ b/src/Encoders/FileExtensionEncoder.php @@ -2,6 +2,7 @@ namespace Intervention\Image\Encoders; +use Intervention\Image\Exceptions\EncoderException; use Intervention\Image\Interfaces\EncodedImageInterface; use Intervention\Image\Interfaces\EncoderInterface; use Intervention\Image\Interfaces\ImageInterface; diff --git a/src/Encoders/MediaTypeEncoder.php b/src/Encoders/MediaTypeEncoder.php index b71a531b..1fb6751b 100644 --- a/src/Encoders/MediaTypeEncoder.php +++ b/src/Encoders/MediaTypeEncoder.php @@ -2,7 +2,7 @@ namespace Intervention\Image\Encoders; -use Intervention\Gif\Exception\EncoderException; +use Intervention\Image\Exceptions\EncoderException; use Intervention\Image\Interfaces\EncodedImageInterface; use Intervention\Image\Interfaces\EncoderInterface; use Intervention\Image\Interfaces\ImageInterface; diff --git a/src/Image.php b/src/Image.php index 72ea50bd..5dce3eef 100644 --- a/src/Image.php +++ b/src/Image.php @@ -3,7 +3,6 @@ namespace Intervention\Image; use Traversable; -use Intervention\Gif\Exception\EncoderException; use Intervention\Image\Analyzers\ColorspaceAnalyzer; use Intervention\Image\Analyzers\HeightAnalyzer; use Intervention\Image\Analyzers\PixelColorAnalyzer; @@ -23,6 +22,7 @@ use Intervention\Image\Encoders\MediaTypeEncoder; use Intervention\Image\Encoders\PngEncoder; use Intervention\Image\Encoders\TiffEncoder; use Intervention\Image\Encoders\WebpEncoder; +use Intervention\Image\Exceptions\EncoderException; use Intervention\Image\Geometry\Factories\CircleFactory; use Intervention\Image\Geometry\Factories\EllipseFactory; use Intervention\Image\Geometry\Factories\LineFactory;