Revert alpha channels to integer values

Author: olivervogel

changelog.md

@@ -126,5 +126,6 @@ caller, Operation fails after valid input
 
 - Removed topLeftPoint() and bottomRightPoint() from Rectangle::class
 - Removed ColorChannelInterface::__construct() from interface
+- Removed ColorInterface::toArray()
 - Method ImageManagerInterface::animate() is replaced by universal ImageManagerInterface::createImage()
 - Method DriverInterface::createAnimation() was removed

src/Colors/AbstractColor.php

@@ -65,19 +65,6 @@ public function normalizedChannelValues(): array
         );
     }
 
-    /**
-     * {@inheritdoc}
-     *
-     * @see ColorInterface::toArray()
-     */
-    public function toArray(): array
-    {
-        return array_map(
-            fn(ColorChannelInterface $channel): int|float => $channel->value(),
-            $this->channels()
-        );
-    }
-
     /**
      * {@inheritdoc}
      *
@@ -110,7 +97,7 @@ public function __debugInfo(): array
     {
         return array_reduce($this->channels(), function (array $result, ColorChannelInterface $item) {
             $key = strtolower((new ReflectionClass($item))->getShortName());
-            $result[$key] = $item->value();
+            $result[$key] = $item->toString();
             return $result;
         }, []);
     }

src/Colors/AlphaColorChannel.php

@@ -4,8 +4,51 @@
 
 namespace Intervention\Image\Colors;
 
-abstract class AlphaColorChannel extends FloatColorChannel
+use Intervention\Image\Exceptions\InvalidArgumentException;
+
+abstract class AlphaColorChannel extends AbstractColorChannel
 {
+    /**
+     * Main color channel value
+     */
+    protected int $value;
+
+    /**
+     * @throws InvalidArgumentException
+     */
+    final public function __construct(float $value)
+    {
+        $this->value = intval(round($this->validValueOrFail($value) * $this->max()));
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @see ColorChannelInterface::fromNormalized()
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function fromNormalized(float $normalized): self
+    {
+        if ($normalized < 0 || $normalized > 1) {
+            throw new InvalidArgumentException(
+                'Normalized color channel value of ' . static::class . ' must be in range 0 to 1',
+            );
+        }
+
+        return new static($normalized);
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @see ColorChannelInterface::value()
+     */
+    public function value(): int
+    {
+        return $this->value;
+    }
+
     /**
      * {@inheritdoc}
      *
@@ -23,6 +66,16 @@ public static function min(): float
      */
     public static function max(): float
     {
-        return 1;
+        return 255;
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @see ColorChannelInterface::toString()
+     */
+    public function toString(): string
+    {
+        return strval(round($this->value() / $this->max(), 2));
     }
 }

src/Colors/Cmyk/Color.php

@@ -23,14 +23,13 @@ class Color extends AbstractColor
     /**
      * Create new instance.
      */
-    public function __construct(int $c, int $m, int $y, int $k)
+    public function __construct(int|Cyan $c, int|Magenta $m, int|Yellow $y, int|Key $k)
     {
-        /** @throws void */
         $this->channels = [
-            new Cyan($c),
-            new Magenta($m),
-            new Yellow($y),
-            new Key($k),
+            is_int($c) ? new Cyan($c) : $c,
+            is_int($m) ? new Magenta($m) : $m,
+            is_int($y) ? new Yellow($y) : $y,
+            is_int($k) ? new Key($k) : $k,
         ];
     }
 

src/Colors/Cmyk/Colorspace.php

@@ -39,7 +39,7 @@ class Colorspace implements ColorspaceInterface
     public static function colorFromNormalized(array $normalized): CmykColor
     {
         return new Color(...array_map(
-            fn(string $classname, float $normalized) => $classname::fromNormalized($normalized)->value(),
+            fn(string $classname, float $normalized) => $classname::fromNormalized($normalized),
             self::$channels,
             $normalized,
         ));

src/Colors/Hsl/Color.php

@@ -9,7 +9,7 @@
 use Intervention\Image\Colors\Hsl\Channels\Hue;
 use Intervention\Image\Colors\Hsl\Channels\Luminance;
 use Intervention\Image\Colors\Hsl\Channels\Saturation;
-use Intervention\Image\Colors\Rgb\Colorspace as RgbColorspace;
+use Intervention\Image\Colors\Rgb\Colorspace as Rgb;
 use Intervention\Image\Exceptions\ColorDecoderException;
 use Intervention\Image\Exceptions\DriverException;
 use Intervention\Image\Exceptions\InvalidArgumentException;
@@ -23,14 +23,13 @@ class Color extends AbstractColor
     /**
      * Create new color object.
      */
-    public function __construct(int $h, int $s, int $l, float $a = 1)
+    public function __construct(int|Hue $h, int|Saturation $s, int|Luminance $l, float|Alpha $a = 1)
     {
-        /** @throws void */
         $this->channels = [
-            new Hue($h),
-            new Saturation($s),
-            new Luminance($l),
-            new Alpha($a),
+            is_int($h) ? new Hue($h) : $h,
+            is_int($s) ? new Saturation($s) : $s,
+            is_int($l) ? new Luminance($l) : $l,
+            is_float($a) ? new Alpha($a) : $a,
         ];
     }
 
@@ -137,7 +136,7 @@ public function toHex(string $prefix = ''): string
             );
         }
 
-        return $this->toColorspace(RgbColorspace::class)->toHex($prefix);
+        return $this->toColorspace(Rgb::class)->toHex($prefix);
     }
 
     /**
@@ -147,8 +146,18 @@ public function toHex(string $prefix = ''): string
      */
     public function toString(): string
     {
+        if ($this->isTransparent()) {
+            return sprintf(
+                'hsl(%d %d %d / %s)',
+                $this->hue()->value(),
+                $this->saturation()->value(),
+                $this->luminance()->value(),
+                $this->alpha()->toString(),
+            );
+        }
+
         return sprintf(
-            'hsl(%d %d%% %d%%)',
+            'hsl(%d %d %d)',
             $this->hue()->value(),
             $this->saturation()->value(),
             $this->luminance()->value()

src/Colors/Hsl/Colorspace.php

@@ -48,7 +48,7 @@ public static function colorFromNormalized(array $normalized): HslColor
         return new Color(...array_map(
             function (string $channel, null|float $normalized) {
                 try {
-                    return $channel::fromNormalized($normalized)->value();
+                    return $channel::fromNormalized($normalized);
                 } catch (TypeError $e) {
                     throw new InvalidArgumentException(
                         'Normalized color value must be in range 0 to 1',
@@ -122,7 +122,7 @@ private function importRgbColor(RgbColor $color): HslColor
             intval(round($hue)),
             intval(round($saturation * 100)),
             intval(round($luminance * 100)),
-            $color->alpha()->value(),
+            $color->alpha()->normalizedValue(),
         );
     }
 
@@ -152,7 +152,7 @@ private function importHsvColor(HsvColor $color): HslColor
             intval(round($h * 360)),
             intval(round($saturation * 100)),
             intval(round($luminance * 100)),
-            $color->alpha()->value(),
+            $color->alpha()->normalizedValue(),
         );
     }
 

src/Colors/Hsv/Color.php

@@ -23,14 +23,13 @@ class Color extends AbstractColor
     /**
      * Create new color object.
      */
-    public function __construct(int $h, int $s, int $v, float $a = 1)
+    public function __construct(int|Hue $h, int|Saturation $s, int|Value $v, float|Alpha $a = 1)
     {
-        /** @throws void */
         $this->channels = [
-            new Hue($h),
-            new Saturation($s),
-            new Value($v),
-            new Alpha($a),
+            is_int($h) ? new Hue($h) : $h,
+            is_int($s) ? new Saturation($s) : $s,
+            is_int($v) ? new Value($v) : $v,
+            is_float($a) ? new Alpha($a) : $a,
         ];
     }
 
@@ -152,7 +151,7 @@ public function toString(): string
                 $this->hue()->value(),
                 $this->saturation()->value(),
                 $this->value()->value(),
-                round($this->alpha()->value(), 2),
+                $this->alpha()->toString(),
             );
         }
 

src/Colors/Hsv/Colorspace.php

@@ -48,7 +48,7 @@ public static function colorFromNormalized(array $normalized): HsvColor
         return new Color(...array_map(
             function (string $channel, null|float $normalized) {
                 try {
-                    return $channel::fromNormalized($normalized)->value();
+                    return $channel::fromNormalized($normalized);
                 } catch (TypeError $e) {
                     throw new InvalidArgumentException(
                         'Normalized color value must be in range 0 to 1',
@@ -127,7 +127,7 @@ private function importRgbColor(RgbColor $color): HsvColor
             intval(round($h)),
             intval(round($s)),
             intval(round($v)),
-            $color->alpha()->value(),
+            $color->alpha()->normalizedValue(),
         );
     }
 

src/Colors/Oklab/Color.php

@@ -5,6 +5,10 @@
 namespace Intervention\Image\Colors\Oklab;
 
 use Intervention\Image\Colors\AbstractColor;
+use Intervention\Image\Colors\Oklab\Channels\A;
+use Intervention\Image\Colors\Oklab\Channels\B;
+use Intervention\Image\Colors\Oklab\Channels\Alpha;
+use Intervention\Image\Colors\Oklab\Channels\Lightness;
 use Intervention\Image\Colors\Rgb\Colorspace as RgbColorspace;
 use Intervention\Image\Exceptions\ColorDecoderException;
 use Intervention\Image\Exceptions\DriverException;
@@ -19,14 +23,13 @@ class Color extends AbstractColor
     /**
      * Create new color object.
      */
-    public function __construct(float $l, float $a, float $b, float $alpha = 1)
+    public function __construct(float|Lightness $l, float|A $a, float|B $b, float|Alpha $alpha = 1)
     {
-        /** @throws void */
         $this->channels = [
-            new Channels\Lightness($l),
-            new Channels\A($a),
-            new Channels\B($b),
-            new Channels\Alpha($alpha),
+            is_float($l) ? new Lightness($l) : $l,
+            is_float($a) ? new A($a) : $a,
+            is_float($b) ? new B($b) : $b,
+            is_float($alpha) ? new Alpha($alpha) : $alpha,
         ];
     }
 
@@ -86,7 +89,7 @@ public function colorspace(): ColorspaceInterface
     public function lightness(): ColorChannelInterface
     {
         /** @throws void */
-        return $this->channel(Channels\Lightness::class);
+        return $this->channel(Lightness::class);
     }
 
     /**
@@ -95,7 +98,7 @@ public function lightness(): ColorChannelInterface
     public function a(): ColorChannelInterface
     {
         /** @throws void */
-        return $this->channel(Channels\A::class);
+        return $this->channel(A::class);
     }
 
     /**
@@ -104,7 +107,7 @@ public function a(): ColorChannelInterface
     public function b(): ColorChannelInterface
     {
         /** @throws void */
-        return $this->channel(Channels\B::class);
+        return $this->channel(B::class);
     }
 
     /**
@@ -113,7 +116,7 @@ public function b(): ColorChannelInterface
     public function alpha(): ColorChannelInterface
     {
         /** @throws void */
-        return $this->channel(Channels\Alpha::class);
+        return $this->channel(Alpha::class);
     }
 
     /**
@@ -148,7 +151,7 @@ public function toString(): string
                 $this->lightness()->value(),
                 $this->a()->value(),
                 $this->b()->value(),
-                round($this->alpha()->value(), 2)
+                $this->alpha()->toString(),
             );
         }