Add tests, improve code

src/Config.php

@@ -9,10 +9,6 @@
 
 class Config implements ConfigInterface
 {
-    public const AUTO_ORIENTATION = 'autoOrientation';
-    public const DECODE_ANIMATION = 'decodeAnimation';
-    public const BLENDING_COLOR = 'blendingColor';
-
     /**
      * Create config object instance
      *
@@ -22,26 +18,12 @@ class Config implements ConfigInterface
      * @return void
      */
     public function __construct(
-        protected bool $autoOrientation = true,
-        protected bool $decodeAnimation = true,
-        protected mixed $blendingColor = 'ffffff00',
+        public bool $autoOrientation = true,
+        public bool $decodeAnimation = true,
+        public mixed $blendingColor = 'ffffff',
     ) {
     }
 
-    /**
-     * {@inheritdoc}
-     *
-     * @see ConfigInterface::option()
-     */
-    public function option(string $name, mixed $default = null): mixed
-    {
-        if (!property_exists($this, $name)) {
-            return $default;
-        }
-
-        return $this->{$name};
-    }
-
     /**
      * {@inheritdoc}
      *

src/Drivers/Gd/Decoders/BinaryImageDecoder.php

@@ -4,7 +4,6 @@
 
 namespace Intervention\Image\Drivers\Gd\Decoders;
 
-use Intervention\Image\Config;
 use Intervention\Image\Exceptions\RuntimeException;
 use Intervention\Image\Interfaces\ColorInterface;
 use Intervention\Image\Interfaces\DecoderInterface;
@@ -61,7 +60,7 @@ private function decodeBinary(string $input): ImageInterface
         }
 
         // adjust image orientation
-        if ($this->driver()->config()->option(Config::AUTO_ORIENTATION) === true) {
+        if ($this->driver()->config()->autoOrientation === true) {
             $image->modify(new AlignRotationModifier());
         }
 

src/Drivers/Gd/Decoders/FilePathImageDecoder.php

@@ -4,7 +4,6 @@
 
 namespace Intervention\Image\Drivers\Gd\Decoders;
 
-use Intervention\Image\Config;
 use Intervention\Image\Exceptions\DecoderException;
 use Intervention\Image\Interfaces\ColorInterface;
 use Intervention\Image\Interfaces\DecoderInterface;
@@ -51,7 +50,7 @@ public function decode(mixed $input): ImageInterface|ColorInterface
         $image->setExif($this->extractExifData($input));
 
         // adjust image orientation
-        if ($this->driver()->config()->option(Config::AUTO_ORIENTATION) === true) {
+        if ($this->driver()->config()->autoOrientation === true) {
             $image->modify(new AlignRotationModifier());
         }
 

src/Drivers/Gd/Decoders/NativeObjectDecoder.php

@@ -7,7 +7,6 @@
 use GdImage;
 use Intervention\Gif\Decoder as GifDecoder;
 use Intervention\Gif\Splitter as GifSplitter;
-use Intervention\Image\Config;
 use Intervention\Image\Drivers\Gd\Core;
 use Intervention\Image\Drivers\Gd\Frame;
 use Intervention\Image\Exceptions\DecoderException;
@@ -61,7 +60,7 @@ public function decode(mixed $input): ImageInterface|ColorInterface
     protected function decodeGif(mixed $input): ImageInterface
     {
         // create non-animated image depending on config
-        if (!$this->driver()->config()->option(Config::DECODE_ANIMATION) === true) {
+        if (!$this->driver()->config()->decodeAnimation === true) {
             $native = match (true) {
                 $this->isGifFormat($input) => @imagecreatefromstring($input),
                 default => @imagecreatefromgif($input),

src/Drivers/Gd/Encoders/JpegEncoder.php

@@ -14,7 +14,14 @@ class JpegEncoder extends GenericJpegEncoder implements SpecializedInterface
 {
     public function encode(ImageInterface $image): EncodedImage
     {
-        $output = Cloner::cloneBlended($image->core()->native(), background: $image->blendingColor());
+        $blendingColor = $this->driver()->handleInput(
+            $this->driver()->config()->blendingColor
+        );
+
+        $output = Cloner::cloneBlended(
+            $image->core()->native(),
+            background: $blendingColor
+        );
 
         $data = $this->buffered(function () use ($output) {
             imageinterlace($output, $this->progressive);

src/Drivers/Gd/Modifiers/BlendTransparencyModifier.php

@@ -15,7 +15,7 @@ public function apply(ImageInterface $image): ImageInterface
     {
         // decode blending color
         $color = $this->driver()->handleInput(
-            $this->color ? $this->color : $image->blendingColor()
+            $this->color ? $this->color : $this->driver()->config()->blendingColor
         );
 
         foreach ($image as $frame) {

src/Drivers/Gd/Modifiers/ContainModifier.php

@@ -23,7 +23,9 @@ public function apply(ImageInterface $image): ImageInterface
         $crop = $this->getCropSize($image);
         $resize = $this->getResizeSize($image);
         $background = $this->driver()->handleInput($this->background);
-        $blendingColor = $image->blendingColor();
+        $blendingColor = $this->driver()->handleInput(
+            $this->driver()->config()->blendingColor
+        );
 
         foreach ($image as $frame) {
             $this->modify($frame, $crop, $resize, $background, $blendingColor);

src/Drivers/Gd/Modifiers/QuantizeColorsModifier.php

@@ -31,9 +31,13 @@ public function apply(ImageInterface $image): ImageInterface
             $this->driver()->handleInput($this->background)
         );
 
+        $blendingColor = $this->driver()->handleInput(
+            $this->driver()->config()->blendingColor
+        );
+
         foreach ($image as $frame) {
             // create new image for color quantization
-            $reduced = Cloner::cloneEmpty($frame->native(), background: $image->blendingColor());
+            $reduced = Cloner::cloneEmpty($frame->native(), background: $blendingColor);
 
             // fill with background
             imagefill($reduced, 0, 0, $background);

src/Drivers/Imagick/Decoders/NativeObjectDecoder.php

@@ -5,7 +5,6 @@
 namespace Intervention\Image\Drivers\Imagick\Decoders;
 
 use Imagick;
-use Intervention\Image\Config;
 use Intervention\Image\Drivers\Imagick\Core;
 use Intervention\Image\Drivers\SpecializableDecoder;
 use Intervention\Image\Exceptions\DecoderException;
@@ -41,12 +40,12 @@ public function decode(mixed $input): ImageInterface|ColorInterface
         );
 
         // discard animation depending on config
-        if (!$this->driver()->config()->option(Config::DECODE_ANIMATION) === true) {
+        if (!$this->driver()->config()->decodeAnimation === true) {
             $image->modify(new RemoveAnimationModifier());
         }
 
         // adjust image rotatation
-        if ($this->driver()->config()->option(Config::AUTO_ORIENTATION) === true) {
+        if ($this->driver()->config()->autoOrientation === true) {
             $image->modify(new AlignRotationModifier());
         }
 

src/Drivers/Imagick/Encoders/JpegEncoder.php

@@ -16,11 +16,14 @@ public function encode(ImageInterface $image): EncodedImage
     {
         $format = 'jpeg';
         $compression = Imagick::COMPRESSION_JPEG;
+        $blendingColor = $this->driver()->handleInput(
+            $this->driver()->config()->blendingColor
+        );
 
         // resolve blending color because jpeg has no transparency
         $background = $this->driver()
             ->colorProcessor($image->colorspace())
-            ->colorToNative($image->blendingColor());
+            ->colorToNative($blendingColor);
 
         // set alpha value to 1 because Imagick renders
         // possible full transparent colors as black

src/Drivers/Imagick/Modifiers/BlendTransparencyModifier.php

@@ -15,7 +15,7 @@ public function apply(ImageInterface $image): ImageInterface
     {
         // decode blending color
         $color = $this->driver()->handleInput(
-            $this->color ? $this->color : $image->blendingColor()
+            $this->color ? $this->color : $this->driver()->config()->blendingColor
         );
 
         // get imagickpixel from color

src/Image.php

@@ -408,7 +408,7 @@ public function pickColors(int $x, int $y): CollectionInterface
     public function blendingColor(): ColorInterface
     {
         return $this->driver()->handleInput(
-            $this->driver()->config()->option(Config::BLENDING_COLOR)
+            $this->driver()->config()->blendingColor
         );
     }
 
@@ -419,9 +419,8 @@ public function blendingColor(): ColorInterface
      */
     public function setBlendingColor(mixed $color): ImageInterface
     {
-        $this->driver()->config()->setOption(
-            Config::BLENDING_COLOR,
-            $this->driver()->handleInput($color)
+        $this->driver()->config()->setOptions(
+            blendingColor: $this->driver()->handleInput($color)
         );
 
         return $this;

src/Interfaces/ConfigInterface.php

@@ -8,14 +8,6 @@
 
 interface ConfigInterface
 {
-    /**
-     * Return value of given config option
-     *
-     * @param string $name
-     * @return mixed
-     */
-    public function option(string $name, mixed $default = null): mixed;
-
     /**
      * Set value of given config option
      *

tests/Unit/ConfigTest.php

@@ -16,9 +16,9 @@ public function testConstructor(): void
         $config = new Config();
         $this->assertInstanceOf(Config::class, $config);
 
-        $this->assertTrue($config->option('autoOrientation'));
-        $this->assertTrue($config->option('decodeAnimation'));
-        $this->assertEquals('ffffff00', $config->option('blendingColor'));
+        $this->assertTrue($config->autoOrientation);
+        $this->assertTrue($config->decodeAnimation);
+        $this->assertEquals('ffffff', $config->blendingColor);
 
         $config = new Config(
             autoOrientation: false,
@@ -27,43 +27,40 @@ public function testConstructor(): void
         );
         $this->assertInstanceOf(Config::class, $config);
 
-        $this->assertFalse($config->option('autoOrientation'));
-        $this->assertFalse($config->option('decodeAnimation'));
-        $this->assertEquals('f00', $config->option('blendingColor'));
+        $this->assertFalse($config->autoOrientation);
+        $this->assertFalse($config->decodeAnimation);
+        $this->assertEquals('f00', $config->blendingColor);
     }
 
     public function testGetSetOptions(): void
     {
         $config = new Config();
-        $this->assertTrue($config->option('autoOrientation'));
-        $this->assertTrue($config->option('decodeAnimation'));
-        $this->assertEquals('ffffff00', $config->option('blendingColor'));
+        $this->assertTrue($config->autoOrientation);
+        $this->assertTrue($config->decodeAnimation);
+        $this->assertEquals('ffffff', $config->blendingColor);
 
         $result = $config->setOptions(
             autoOrientation: false,
             decodeAnimation: false,
             blendingColor: 'f00',
         );
 
-        $this->assertFalse($config->option('autoOrientation'));
-        $this->assertFalse($config->option('decodeAnimation'));
-        $this->assertEquals('f00', $config->option('blendingColor'));
+        $this->assertFalse($config->autoOrientation);
+        $this->assertFalse($config->decodeAnimation);
+        $this->assertEquals('f00', $config->blendingColor);
 
-        $this->assertFalse($result->option('autoOrientation'));
-        $this->assertFalse($result->option('decodeAnimation'));
-        $this->assertEquals('f00', $result->option('blendingColor'));
+        $this->assertFalse($result->autoOrientation);
+        $this->assertFalse($result->decodeAnimation);
+        $this->assertEquals('f00', $result->blendingColor);
 
         $result = $config->setOption('blendingColor', '000');
 
-        $this->assertFalse($config->option('autoOrientation'));
-        $this->assertFalse($config->option('decodeAnimation'));
-        $this->assertEquals('000', $config->option('blendingColor'));
+        $this->assertFalse($config->autoOrientation);
+        $this->assertFalse($config->decodeAnimation);
+        $this->assertEquals('000', $config->blendingColor);
 
-        $this->assertFalse($result->option('autoOrientation'));
-        $this->assertFalse($result->option('decodeAnimation'));
-        $this->assertEquals('000', $result->option('blendingColor'));
-
-        $this->assertNull($config->option('unknown'));
-        $this->assertEquals('test', $config->option('unknown', 'test'));
+        $this->assertFalse($result->autoOrientation);
+        $this->assertFalse($result->decodeAnimation);
+        $this->assertEquals('000', $result->blendingColor);
     }
 }

tests/Unit/Drivers/Gd/ImageTest.php

@@ -7,7 +7,6 @@
 use Intervention\Image\Analyzers\WidthAnalyzer;
 use Intervention\Image\Collection;
 use Intervention\Image\Colors\Hsl\Colorspace;
-use Intervention\Image\Colors\Rgb\Color;
 use Intervention\Image\Drivers\Gd\Core;
 use Intervention\Image\Drivers\Gd\Driver;
 use Intervention\Image\Drivers\Gd\Frame;
@@ -280,17 +279,16 @@ public function testText(): void
         $this->assertInstanceOf(Image::class, $this->image->text('test', 0, 0, new Font()));
     }
 
-    public function testSetGetBlendingColor(): void
+    public function testBlendTransparencyDefault(): void
     {
         $image = $this->readTestImage('gradient.gif');
-        $this->assertInstanceOf(ColorInterface::class, $image->blendingColor());
-        $this->assertColor(255, 255, 255, 0, $image->blendingColor());
-        $result = $image->setBlendingColor(new Color(1, 2, 3, 4));
-        $this->assertColor(1, 2, 3, 4, $result->blendingColor());
-        $this->assertColor(1, 2, 3, 4, $image->blendingColor());
+        $this->assertColor(0, 0, 0, 0, $image->pickColor(1, 0));
+        $result = $image->blendTransparency();
+        $this->assertColor(255, 255, 255, 255, $image->pickColor(1, 0));
+        $this->assertColor(255, 255, 255, 255, $result->pickColor(1, 0));
     }
 
-    public function testBlendTransparency(): void
+    public function testBlendTransparencyArgument(): void
     {
         $image = $this->readTestImage('gradient.gif');
         $this->assertColor(0, 0, 0, 0, $image->pickColor(1, 0));

tests/Unit/Drivers/Imagick/ImageTest.php

@@ -8,7 +8,6 @@
 use Intervention\Image\Analyzers\WidthAnalyzer;
 use Intervention\Image\Collection;
 use Intervention\Image\Colors\Cmyk\Colorspace as CmykColorspace;
-use Intervention\Image\Colors\Rgb\Color;
 use Intervention\Image\Colors\Rgb\Colorspace as RgbColorspace;
 use Intervention\Image\Drivers\Imagick\Core;
 use Intervention\Image\Drivers\Imagick\Driver;
@@ -263,17 +262,16 @@ public function testSharpen(): void
         $this->assertInstanceOf(Image::class, $this->image->sharpen(12));
     }
 
-    public function testSetGetBlendingColor(): void
+    public function testBlendTransparencyDefault(): void
     {
         $image = $this->readTestImage('gradient.gif');
-        $this->assertInstanceOf(ColorInterface::class, $image->blendingColor());
-        $this->assertColor(255, 255, 255, 0, $image->blendingColor());
-        $result = $image->setBlendingColor(new Color(1, 2, 3, 4));
-        $this->assertColor(1, 2, 3, 4, $result->blendingColor());
-        $this->assertColor(1, 2, 3, 4, $image->blendingColor());
+        $this->assertColor(0, 0, 0, 0, $image->pickColor(1, 0));
+        $result = $image->blendTransparency();
+        $this->assertColor(255, 255, 255, 255, $image->pickColor(1, 0));
+        $this->assertColor(255, 255, 255, 255, $result->pickColor(1, 0));
     }
 
-    public function testBlendTransparency(): void
+    public function testBlendTransparencyArgument(): void
     {
         $image = $this->readTestImage('gradient.gif');
         $this->assertColor(0, 0, 0, 0, $image->pickColor(1, 0));