Merge branch 'develop' into feature/output-stream

.github/FUNDING.yml

@@ -1,2 +1,3 @@
 github: [Intervention]
+ko_fi: interventionphp
 custom: https://paypal.me/interventionio

.github/workflows/run-tests.yml

@@ -8,7 +8,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [ '8.1', '8.2', '8.3' ]
+        php: [ '8.1', '8.2', '8.3', '8.4' ]
         imagemagick: [ '6.9.12-55', '7.1.1-32' ]
         imagick: [ '3.7.0' ]
         stability: [ prefer-stable ]

readme.md

@@ -4,6 +4,7 @@
 [![Latest Version](https://img.shields.io/packagist/v/intervention/image.svg)](https://packagist.org/packages/intervention/image)
 [![Build Status](https://github.com/Intervention/image/actions/workflows/run-tests.yml/badge.svg)](https://github.com/Intervention/image/actions)
 [![Monthly Downloads](https://img.shields.io/packagist/dm/intervention/image.svg)](https://packagist.org/packages/intervention/image/stats)
+[![Support me on Ko-fi](https://raw.githubusercontent.com/Intervention/image/develop/.github/images/support.svg)](https://ko-fi.com/interventionphp)
 
 Intervention Image is a **PHP image processing library** that provides a simple
 and expressive way to create, edit, and compose images. It features a unified

src/Colors/Cmyk/Color.php

@@ -152,4 +152,14 @@ public function isTransparent(): bool
     {
         return false;
     }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @see ColorInterface::isClear()
+     */
+    public function isClear(): bool
+    {
+        return false;
+    }
 }

src/Colors/Hsl/Color.php

@@ -16,6 +16,14 @@
 
 class Color extends AbstractColor
 {
+    /**
+     * Create new color object
+     *
+     * @param int $h
+     * @param int $s
+     * @param int $l
+     * @return void
+     */
     public function __construct(int $h, int $s, int $l)
     {
         /** @throws void */
@@ -120,4 +128,14 @@ public function isTransparent(): bool
     {
         return false;
     }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @see ColorInterface::isClear()
+     */
+    public function isClear(): bool
+    {
+        return false;
+    }
 }

src/Colors/Hsv/Color.php

@@ -16,6 +16,14 @@
 
 class Color extends AbstractColor
 {
+    /**
+     * Create new color object
+     *
+     * @param int $h
+     * @param int $s
+     * @param int $v
+     * @return void
+     */
     public function __construct(int $h, int $s, int $v)
     {
         /** @throws void */
@@ -120,4 +128,14 @@ public function isTransparent(): bool
     {
         return false;
     }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @see ColorInterface::isClear()
+     */
+    public function isClear(): bool
+    {
+        return false;
+    }
 }

src/Colors/Rgb/Color.php

@@ -178,4 +178,14 @@ public function isTransparent(): bool
     {
         return $this->alpha()->value() < $this->alpha()->max();
     }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @see ColorInterface::isClear()
+     */
+    public function isClear(): bool
+    {
+        return $this->alpha()->value() == 0;
+    }
 }

src/Colors/Rgb/Decoders/TransparentColorDecoder.php

@@ -10,6 +10,11 @@
 
 class TransparentColorDecoder extends HexColorDecoder
 {
+    /**
+     * {@inheritdoc}
+     *
+     * @see DecoderInterface::decode()
+     */
     public function decode(mixed $input): ImageInterface|ColorInterface
     {
         if (!is_string($input)) {

src/Decoders/EncodedImageObjectDecoder.php

@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Intervention\Image\Decoders;
+
+use Intervention\Image\Drivers\SpecializableDecoder;
+
+class EncodedImageObjectDecoder extends SpecializableDecoder
+{
+}

src/Drivers/Gd/Analyzers/ColorspaceAnalyzer.php

@@ -11,6 +11,11 @@
 
 class ColorspaceAnalyzer extends GenericColorspaceAnalyzer implements SpecializedInterface
 {
+    /**
+     * {@inheritdoc}
+     *
+     * @see AnalyzerInterface::analyze()
+     */
     public function analyze(ImageInterface $image): mixed
     {
         return new Colorspace();

src/Drivers/Gd/Analyzers/HeightAnalyzer.php

@@ -10,6 +10,11 @@
 
 class HeightAnalyzer extends GenericHeightAnalyzer implements SpecializedInterface
 {
+    /**
+     * {@inheritdoc}
+     *
+     * @see AnalyzerInterface::analyze()
+     */
     public function analyze(ImageInterface $image): mixed
     {
         return imagesy($image->core()->native());

src/Drivers/Gd/Analyzers/PixelColorAnalyzer.php

@@ -15,6 +15,11 @@
 
 class PixelColorAnalyzer extends GenericPixelColorAnalyzer implements SpecializedInterface
 {
+    /**
+     * {@inheritdoc}
+     *
+     * @see AnalyzerInterface::analyze()
+     */
     public function analyze(ImageInterface $image): mixed
     {
         return $this->colorAt(

src/Drivers/Gd/Analyzers/PixelColorsAnalyzer.php

@@ -9,6 +9,11 @@
 
 class PixelColorsAnalyzer extends PixelColorAnalyzer
 {
+    /**
+     * {@inheritdoc}
+     *
+     * @see AnalyzerInterface::analyze()
+     */
     public function analyze(ImageInterface $image): mixed
     {
         $colors = new Collection();

src/Drivers/Gd/Analyzers/ResolutionAnalyzer.php

@@ -11,6 +11,11 @@
 
 class ResolutionAnalyzer extends GenericResolutionAnalyzer implements SpecializedInterface
 {
+    /**
+     * {@inheritdoc}
+     *
+     * @see AnalyzerInterface::analyze()
+     */
     public function analyze(ImageInterface $image): mixed
     {
         return new Resolution(...imageresolution($image->core()->native()));

src/Drivers/Gd/Analyzers/WidthAnalyzer.php

@@ -10,6 +10,11 @@
 
 class WidthAnalyzer extends GenericWidthAnalyzer implements SpecializedInterface
 {
+    /**
+     * {@inheritdoc}
+     *
+     * @see AnalyzerInterface::analyze()
+     */
     public function analyze(ImageInterface $image): mixed
     {
         return imagesx($image->core()->native());

src/Drivers/Gd/Cloner.php

@@ -5,6 +5,7 @@
 namespace Intervention\Image\Drivers\Gd;
 
 use GdImage;
+use Intervention\Image\Colors\Rgb\Channels\Alpha;
 use Intervention\Image\Colors\Rgb\Color;
 use Intervention\Image\Exceptions\ColorException;
 use Intervention\Image\Geometry\Rectangle;
@@ -50,10 +51,7 @@ public static function cloneEmpty(
         ColorInterface $background = new Color(255, 255, 255, 0)
     ): GdImage {
         // define size
-        $size = match (true) {
-            is_null($size) => new Rectangle(imagesx($gd), imagesy($gd)),
-            default => $size,
-        };
+        $size = $size ? $size : new Rectangle(imagesx($gd), imagesy($gd));
 
         // create new gd image with same size or new given size
         $clone = imagecreatetruecolor($size->width(), $size->height());
@@ -70,6 +68,12 @@ public static function cloneEmpty(
         imagealphablending($clone, true);
         imagesavealpha($clone, true);
 
+        // set background image as transparent if alpha channel value if color is below .5
+        // comes into effect when the end format only supports binary transparency (like GIF)
+        if ($background->channel(Alpha::class)->value() < 128) {
+            imagecolortransparent($clone, $processor->colorToNative($background));
+        }
+
         return $clone;
     }
 

src/Drivers/Gd/ColorProcessor.php

@@ -17,10 +17,21 @@
 
 class ColorProcessor implements ColorProcessorInterface
 {
+    /**
+     * Create new color processor object
+     *
+     * @param ColorspaceInterface $colorspace
+     * @return void
+     */
     public function __construct(protected ColorspaceInterface $colorspace = new Colorspace())
     {
     }
 
+    /**
+     * {@inheritdoc}
+     *
+     * @see ColorProcessorInterface::colorToNative()
+     */
     public function colorToNative(ColorInterface $color): int
     {
         // convert color to colorspace
@@ -39,6 +50,11 @@ public function colorToNative(ColorInterface $color): int
         return ($a << 24) + ($r << 16) + ($g << 8) + $b;
     }
 
+    /**
+     * {@inheritdoc}
+     *
+     * @see ColorProcessorInterface::nativeToColor()
+     */
     public function nativeToColor(mixed $value): ColorInterface
     {
         if (!is_int($value)) {

src/Drivers/Gd/Decoders/Base64ImageDecoder.php

@@ -11,6 +11,11 @@
 
 class Base64ImageDecoder extends BinaryImageDecoder implements DecoderInterface
 {
+    /**
+     * {@inheritdoc}
+     *
+     * @see DecoderInterface::decode()
+     */
     public function decode(mixed $input): ImageInterface|ColorInterface
     {
         if (!$this->isValidBase64($input)) {

src/Drivers/Gd/Decoders/DataUriImageDecoder.php

@@ -11,6 +11,11 @@
 
 class DataUriImageDecoder extends BinaryImageDecoder implements DecoderInterface
 {
+    /**
+     * {@inheritdoc}
+     *
+     * @see DecoderInterface::decode()
+     */
     public function decode(mixed $input): ImageInterface|ColorInterface
     {
         if (!is_string($input)) {

src/Drivers/Gd/Decoders/EncodedImageObjectDecoder.php

@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Intervention\Image\Drivers\Gd\Decoders;
+
+use Intervention\Image\EncodedImage;
+use Intervention\Image\Exceptions\DecoderException;
+use Intervention\Image\Interfaces\ImageInterface;
+use Intervention\Image\Interfaces\ColorInterface;
+
+class EncodedImageObjectDecoder extends BinaryImageDecoder
+{
+    /**
+     * {@inheritdoc}
+     *
+     * @see DecoderInterface::decode()
+     */
+    public function decode(mixed $input): ImageInterface|ColorInterface
+    {
+        if (!is_a($input, EncodedImage::class)) {
+            throw new DecoderException('Unable to decode input');
+        }
+
+        return parent::decode($input->toString());
+    }
+}

src/Drivers/Gd/Decoders/FilePathImageDecoder.php

@@ -13,6 +13,11 @@
 
 class FilePathImageDecoder extends NativeObjectDecoder implements DecoderInterface
 {
+    /**
+     * {@inheritdoc}
+     *
+     * @see DecoderInterface::decode()
+     */
     public function decode(mixed $input): ImageInterface|ColorInterface
     {
         if (!$this->isFile($input)) {

src/Drivers/Gd/Decoders/FilePointerImageDecoder.php

@@ -10,6 +10,11 @@
 
 class FilePointerImageDecoder extends BinaryImageDecoder
 {
+    /**
+     * {@inheritdoc}
+     *
+     * @see DecoderInterface::decode()
+     */
     public function decode(mixed $input): ImageInterface|ColorInterface
     {
         if (!is_resource($input) || !in_array(get_resource_type($input), ['file', 'stream'])) {

src/Drivers/Gd/Decoders/SplFileInfoImageDecoder.php

@@ -12,6 +12,11 @@
 
 class SplFileInfoImageDecoder extends FilePathImageDecoder implements DecoderInterface
 {
+    /**
+     * {@inheritdoc}
+     *
+     * @see DecoderInterface::decode()
+     */
     public function decode(mixed $input): ImageInterface|ColorInterface
     {
         if (!is_a($input, SplFileInfo::class)) {

src/Drivers/Gd/Encoders/AvifEncoder.php

@@ -11,6 +11,11 @@
 
 class AvifEncoder extends GenericAvifEncoder implements SpecializedInterface
 {
+    /**
+     * {@inheritdoc}
+     *
+     * @see EncoderInterface::encode()
+     */
     public function encode(ImageInterface $image): EncodedImage
     {
         $gd = $image->core()->native();