Merge pull request #1247 from Intervention/epic/gif4

Adapt gif encoder api to intervention/gif v4

composer.json

@@ -14,7 +14,7 @@
     "require": {
         "php": "^8.1",
         "ext-mbstring": "*",
-        "intervention/gif": "^3"
+        "intervention/gif": "^4"
     },
     "require-dev": {
         "phpunit/phpunit": "^9",

src/Drivers/Gd/Encoders/GifEncoder.php

@@ -27,8 +27,7 @@ class GifEncoder extends DriverSpecializedEncoder
     {
         $builder = GifBuilder::canvas(
             $image->width(),
-            $image->height(),
+            $image->height()
-            $image->loops()
         );
 
         foreach ($image as $frame) {
@@ -38,6 +37,8 @@ class GifEncoder extends DriverSpecializedEncoder
             );
         }
 
+        $builder->setLoops($image->loops());
+
         return new EncodedImage($builder->encode(), 'image/gif');
     }
 }

src/Encoders/FileExtensionEncoder.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;

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;

src/Exceptions/AnimationException.php

@@ -4,5 +4,4 @@ namespace Intervention\Image\Exceptions;
 
 class AnimationException extends \RuntimeException
 {
-    //
 }

src/Exceptions/ColorException.php

@@ -4,5 +4,4 @@ namespace Intervention\Image\Exceptions;
 
 class ColorException extends \RuntimeException
 {
-    //
 }

src/Exceptions/DecoderException.php

@@ -4,5 +4,4 @@ namespace Intervention\Image\Exceptions;
 
 class DecoderException extends \RuntimeException
 {
-    //
 }

src/Exceptions/EncoderException.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace Intervention\Image\Exceptions;
+
+class EncoderException extends \RuntimeException
+{
+}

src/Exceptions/FontException.php

@@ -4,5 +4,4 @@ namespace Intervention\Image\Exceptions;
 
 class FontException extends \RuntimeException
 {
-    //
 }

src/Exceptions/GeometryException.php

@@ -4,5 +4,4 @@ namespace Intervention\Image\Exceptions;
 
 class GeometryException extends \RuntimeException
 {
-    //
 }

src/Exceptions/InputException.php

@@ -4,5 +4,4 @@ namespace Intervention\Image\Exceptions;
 
 class InputException extends \RuntimeException
 {
-    //
 }

src/Exceptions/NotSupportedException.php

@@ -4,5 +4,4 @@ namespace Intervention\Image\Exceptions;
 
 class NotSupportedException extends \RuntimeException
 {
-    //
 }

src/Exceptions/NotWritableException.php

@@ -4,5 +4,4 @@ namespace Intervention\Image\Exceptions;
 
 class NotWritableException extends \RuntimeException
 {
-    # nothing to override
 }

src/Exceptions/RuntimeException.php

@@ -4,5 +4,4 @@ namespace Intervention\Image\Exceptions;
 
 class RuntimeException extends \RuntimeException
 {
-    //
 }

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;