Merge pull request 'Feature: natuerliche Werte' (#8) from feature/natuerliche-werte into master

Reviewed-on: #8

README.md

@@ -11,6 +11,22 @@ Die Modelle müssen mit den Informationen gefüllt werden. Ein nicht geändertes
 Die Werte sind immer reelle Zahlen von '0.0' bis '1.0'. Dadurch sind die Modele vom eigentlichen Einsatz unabhängig.
 Die Klassen haben keinen Alphakanal.
 
+### Natürliche Modelle
+
+Die Modelle werden auch in der 'natürlichen' Darstellung bereitgestellt.
+
+#### CyanMagentaYellowKey
+
+Alle Werte werden in der Prozent-Schreibweise zur Verfügung gestellt.
+
+#### HueSaturationValue
+
+*Hue* wird als Gradzahl und die anderen Werte als Prozent-Schreibweise zur Verfügung gestellt.
+
+#### RedGreenBlue
+
+Die Werte werden als Hexadecimal Zahlen und in der Webschreibweise zur Verfügung gestellt.
+
 ## Hinweise zu den Transformer-Klassen
 
 Das Vorgehen der Umwandlung nimmt die Informationen von 

composer.json

@@ -22,11 +22,13 @@
     },
     "require": {
         "php": "^8.0",
-        "phpunit/php-code-coverage": "^9.2"
+        "phpunit/php-code-coverage": "^9.2",
+        "jetbrains/phpstorm-attributes": "^1.0.0"
     },
     "require-dev": {
         "codeception/codeception": "^4.1.18",
         "codeception/module-phpbrowser": "^1.0.0",
-        "codeception/module-asserts": "^1.0.0"
+        "codeception/module-asserts": "^1.0.0",
+        "phpstan/phpstan" : "^0.12.82"
     }
 }

phpstan.neon

@@ -0,0 +1,6 @@
+parameters:
+	level: 6
+	paths:
+		- src
+		- tests/unit
+		- tests/_support/Helper

resources/uml/Klassen-Aufbau.puml

@@ -0,0 +1,58 @@
+@startuml
+'https://plantuml.com/class-diagram
+
+namespace NaturallyColorModels {
+    class CyanMagentaYellowKey
+    class HueSaturationValue
+    class RedGreenBlue
+}
+
+namespace ColorModels {
+    abstract AbstractColorModel
+    class CyanMagentaYellowKey
+    class HueSaturationValue
+    class RedGreenBlue
+    CyanMagentaYellowKey --|> AbstractColorModel
+    HueSaturationValue --|> AbstractColorModel
+    RedGreenBlue --|> AbstractColorModel
+}
+NaturallyColorModels.CyanMagentaYellowKey o-- ColorModels.CyanMagentaYellowKey
+NaturallyColorModels.HueSaturationValue o-- ColorModels.HueSaturationValue
+NaturallyColorModels.RedGreenBlue o-- ColorModels.RedGreenBlue
+
+
+namespace Transformer {
+    interface ColorModelTransformInterface {
+        + toRedGreenBlue(): RedGreenBlue;
+        + toCyanMagentaYellowKey(): CyanMagentaYellowKey;
+        + toHueSaturationValue(): HueSaturationValue;
+    }
+    class CyanMagentaYellowKeyTransformer
+    class HueSaturationValueTransformer
+    class RedGreenBlueTransformer
+    ColorModelTransformInterface <|-- CyanMagentaYellowKeyTransformer
+    ColorModelTransformInterface <|-- HueSaturationValueTransformer
+    ColorModelTransformInterface <|-- RedGreenBlueTransformer
+    namespace Utilities {
+        abstract AbstractHueSaturationValueToUtility
+        class CyanMagentaYellowKeyToHueSaturationValue
+        class HueSaturationValueToCyanMagentaYellowKey
+        class HueSaturationValueToRedGreenBlue
+        class RedGreenBlueToHueSaturationValue
+        Transformer.Utilities.CyanMagentaYellowKeyToHueSaturationValue --|> Transformer.Utilities.AbstractHueSaturationValueToUtility
+        Transformer.Utilities.HueSaturationValueToCyanMagentaYellowKey --|> Transformer.Utilities.AbstractHueSaturationValueToUtility
+        Transformer.Utilities.HueSaturationValueToRedGreenBlue --|> Transformer.Utilities.AbstractHueSaturationValueToUtility
+        Transformer.Utilities.RedGreenBlueToHueSaturationValue --|> Transformer.Utilities.AbstractHueSaturationValueToUtility
+    }
+    CyanMagentaYellowKeyTransformer o-- Transformer.Utilities.CyanMagentaYellowKeyToHueSaturationValue
+    CyanMagentaYellowKeyTransformer o-- Transformer.Utilities.HueSaturationValueToRedGreenBlue
+
+    HueSaturationValueTransformer o-- Transformer.Utilities.HueSaturationValueToRedGreenBlue
+    HueSaturationValueTransformer o-- Transformer.Utilities.HueSaturationValueToCyanMagentaYellowKey
+
+    RedGreenBlueTransformer o-- Transformer.Utilities.RedGreenBlueToHueSaturationValue
+    RedGreenBlueTransformer o-- Transformer.Utilities.HueSaturationValueToCyanMagentaYellowKey
+}
+ColorModels.AbstractColorModel --o Transformer.ColorModelTransformInterface
+
+@enduml

src/ColorModels/AbstractColorModel.php

@@ -8,7 +8,7 @@ use InvalidArgumentException;
 abstract class AbstractColorModel
 {
 
-    protected function checkValue(float $value)
+    protected function checkValue(float $value): void
     {
         if ($value > 1.0) {
             throw new InvalidArgumentException('Ein Wert größer als 1 ist nicht definierbar.');

src/NaturallyColorModels/CyanMagentaYellowKey.php

@@ -0,0 +1,101 @@
+<?php
+
+
+namespace TorstenHettstedt\Colors\NaturallyColorModels;
+
+use JetBrains\PhpStorm\Pure;
+use TorstenHettstedt\Colors\ColorModels\CyanMagentaYellowKey as PureCyanMagentaYellowKey;
+
+/**
+ * Definition des allgemeinen CMYK-Farbraumes. Die Werte für die eigenschaften sind reelle Zahlen von 0 bis einschließlich 1.
+ * Ohne Änderung der Eigenschaften wird die Farbe *weiß* dargestellt.
+ */
+class CyanMagentaYellowKey
+{
+    /** @var PureCyanMagentaYellowKey : Standard-Color-Modell */
+    protected PureCyanMagentaYellowKey $pureColor;
+    protected Helper\PercentValues     $percentValuesHelper;
+
+    #[Pure] public function __construct()
+    {
+        $this->pureColor = new PureCyanMagentaYellowKey();
+        $this->percentValuesHelper = new Helper\PercentValues();
+    }
+
+    /**
+     * @return int
+     */
+    #[Pure] public function getCyan(): int
+    {
+        return $this->percentValuesHelper->asPercentValue($this->pureColor->getCyan());
+    }
+
+    /**
+     * @param int $cyan
+     * @return CyanMagentaYellowKey
+     */
+    public function setCyan(int $cyan): CyanMagentaYellowKey
+    {
+        $this->percentValuesHelper->checkPercentValue($cyan);
+        $this->pureColor->setCyan($this->percentValuesHelper->fromPercentValue($cyan));
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    #[Pure] public function getMagenta(): int
+    {
+        return $this->percentValuesHelper->asPercentValue($this->pureColor->getMagenta());
+    }
+
+    /**
+     * @param int $magenta
+     * @return CyanMagentaYellowKey
+     */
+    public function setMagenta(int $magenta): CyanMagentaYellowKey
+    {
+        $this->percentValuesHelper->checkPercentValue($magenta);
+        $this->pureColor->setMagenta($this->percentValuesHelper->fromPercentValue($magenta));
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    #[Pure] public function getYellow(): int
+    {
+        return $this->percentValuesHelper->asPercentValue($this->pureColor->getYellow());
+    }
+
+    /**
+     * @param int $yellow
+     * @return CyanMagentaYellowKey
+     */
+    public function setYellow(int $yellow): CyanMagentaYellowKey
+    {
+        $this->percentValuesHelper->checkPercentValue($yellow);
+        $this->pureColor->setYellow($this->percentValuesHelper->fromPercentValue($yellow));
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    #[Pure] public function getKey(): int
+    {
+        return $this->percentValuesHelper->asPercentValue($this->pureColor->getKey());
+    }
+
+    /**
+     * @param int $key
+     * @return CyanMagentaYellowKey
+     */
+    public function setKey(int $key): CyanMagentaYellowKey
+    {
+        $this->percentValuesHelper->checkPercentValue($key);
+        $this->pureColor->setKey($this->percentValuesHelper->fromPercentValue($key));
+        return $this;
+    }
+
+}

src/NaturallyColorModels/Helper/GradValues.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace TorstenHettstedt\Colors\NaturallyColorModels\Helper;
+
+
+use InvalidArgumentException;
+
+class GradValues
+{
+
+    public function asGradValue(float $value): int
+    {
+        return intval($value * 360);
+    }
+
+    public function fromGradValue(int $value): float
+    {
+        return $value / 360.0;
+    }
+
+    public function checkGradValue(int $value): void
+    {
+        if ($value > 360) {
+            throw new InvalidArgumentException('Ein Wert größer als 360° ist nicht definierbar.');
+        }
+        if ($value < 0) {
+            throw new InvalidArgumentException('Ein Wert kleiner als 0° ist nicht definierbar.');
+        }
+    }
+
+}

src/NaturallyColorModels/Helper/HexadecimalValues.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace TorstenHettstedt\Colors\NaturallyColorModels\Helper;
+
+
+use InvalidArgumentException;
+
+class HexadecimalValues
+{
+
+    public function asHexadecimalValue(float $value): int
+    {
+        return intval($value * 0xFF);
+    }
+
+    public function fromHexadecimalValue(int $value): float
+    {
+        return $value / 0xFF;
+    }
+
+    public function checkHexadecimalValue(int $value): void
+    {
+        if ($value > 0xFF) {
+            throw new InvalidArgumentException('Ein Wert größer als "0xFF" ist nicht definierbar.');
+        }
+        if ($value < 0) {
+            throw new InvalidArgumentException('Ein Wert kleiner als "0x00" ist nicht definierbar.');
+        }
+    }
+
+}

src/NaturallyColorModels/Helper/PercentValues.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace TorstenHettstedt\Colors\NaturallyColorModels\Helper;
+
+
+use InvalidArgumentException;
+
+class PercentValues
+{
+
+    public function asPercentValue(float $value): int
+    {
+        return intval($value * 100);
+    }
+
+    public function fromPercentValue(int $value): float
+    {
+        return $value / 100.0;
+    }
+
+    public function checkPercentValue(int $value): void
+    {
+        if ($value > 100) {
+            throw new InvalidArgumentException('Ein Wert größer als 100% ist nicht definierbar.');
+        }
+        if ($value < 0) {
+            throw new InvalidArgumentException('Ein Wert kleiner als 0% ist nicht definierbar.');
+        }
+    }
+
+}

src/NaturallyColorModels/HueSaturationValue.php

@@ -0,0 +1,86 @@
+<?php
+
+
+namespace TorstenHettstedt\Colors\NaturallyColorModels;
+
+
+use JetBrains\PhpStorm\Pure;
+use TorstenHettstedt\Colors\ColorModels\HueSaturationValue as PureHueSaturationValue;
+
+/**
+ * Definition des allgemeinen HSV-Farbraumes. Die Werte für die Eigenschaften sind reelle Zahlen von 0 bis einschließlich 1.
+ * Ohne Änderung der Eigenschaften wird die Farbe *weiß* dargestellt.
+ */
+class HueSaturationValue
+{
+    /** @var PureHueSaturationValue : Standard-Color-Modell */
+    protected PureHueSaturationValue $pureColor;
+    protected Helper\PercentValues $percentValuesHelper;
+    protected Helper\GradValues    $gradValuesHelper;
+
+    #[Pure] public function __construct()
+    {
+        $this->pureColor = new PureHueSaturationValue();
+        $this->percentValuesHelper = new Helper\PercentValues();
+        $this->gradValuesHelper = new Helper\GradValues();
+    }
+
+    /**
+     * @return int
+     */
+    #[Pure] public function getHue(): int
+    {
+        return $this->gradValuesHelper->asGradValue($this->pureColor->getHue());
+    }
+
+    /**
+     * @param int $hue
+     * @return HueSaturationValue
+     */
+    public function setHue(int $hue): HueSaturationValue
+    {
+        $this->gradValuesHelper->checkGradValue($hue);
+        $this->pureColor->setHue($this->gradValuesHelper->fromGradValue($hue));
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    #[Pure] public function getSaturation(): int
+    {
+        return $this->percentValuesHelper->asPercentValue($this->pureColor->getSaturation());
+    }
+
+    /**
+     * @param int $saturation
+     * @return HueSaturationValue
+     */
+    public function setSaturation(int $saturation): HueSaturationValue
+    {
+        $this->percentValuesHelper->checkPercentValue($saturation);
+        $this->pureColor->setSaturation($this->percentValuesHelper->fromPercentValue($saturation));
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    #[Pure] public function getValue(): int
+    {
+        return $this->percentValuesHelper->asPercentValue($this->pureColor->getValue());
+    }
+
+    /**
+     * @param int $value
+     * @return HueSaturationValue
+     */
+    public function setValue(int $value): HueSaturationValue
+    {
+        $this->percentValuesHelper->checkPercentValue($value);
+        $this->pureColor->setValue($this->percentValuesHelper->fromPercentValue($value));
+        return $this;
+    }
+
+
+}

src/NaturallyColorModels/RedGreenBlue.php

@@ -0,0 +1,86 @@
+<?php
+
+namespace TorstenHettstedt\Colors\NaturallyColorModels;
+
+use JetBrains\PhpStorm\Pure;
+use TorstenHettstedt\Colors\ColorModels\RedGreenBlue as PureRedGreenBlue;
+
+/**
+ * Definition des allgemeinen RGB-Farbraumes. Die Werte für die eigenschaften sind reelle Zahlen von 0 bis einschließlich 1.
+ * Ohne Änderung der Eigenschaften wird die Farbe *weiß* dargestellt.
+ */
+class RedGreenBlue
+{
+    /** @var PureRedGreenBlue : Standard-Color-Modell */
+    protected PureRedGreenBlue         $pureColor;
+    protected Helper\HexadecimalValues $hexadecimalValuesHelper;
+
+    #[Pure] public function __construct()
+    {
+        $this->pureColor = new PureRedGreenBlue();
+        $this->hexadecimalValuesHelper = new Helper\HexadecimalValues();
+    }
+
+    /**
+     * @return int
+     */
+    #[Pure] public function getRed(): int
+    {
+        return $this->hexadecimalValuesHelper->asHexadecimalValue($this->pureColor->getRed());
+    }
+
+    /**
+     * @param int $red
+     * @return RedGreenBlue
+     */
+    public function setRed(int $red): RedGreenBlue
+    {
+        $this->hexadecimalValuesHelper->checkHexadecimalValue($red);
+        $this->pureColor->setRed($this->hexadecimalValuesHelper->fromHexadecimalValue($red));
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    #[Pure] public function getGreen(): int
+    {
+        return $this->hexadecimalValuesHelper->asHexadecimalValue($this->pureColor->getGreen());
+    }
+
+    /**
+     * @param int $green
+     * @return RedGreenBlue
+     */
+    public function setGreen(int $green): RedGreenBlue
+    {
+        $this->hexadecimalValuesHelper->checkHexadecimalValue($green);
+        $this->pureColor->setGreen($this->hexadecimalValuesHelper->fromHexadecimalValue($green));
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getBlue(): int
+    {
+        return $this->hexadecimalValuesHelper->asHexadecimalValue($this->pureColor->getBlue());
+    }
+
+    /**
+     * @param int $blue
+     * @return RedGreenBlue
+     */
+    public function setBlue(int $blue): RedGreenBlue
+    {
+        $this->hexadecimalValuesHelper->checkHexadecimalValue($blue);
+        $this->pureColor->setBlue($this->hexadecimalValuesHelper->fromHexadecimalValue($blue));
+        return $this;
+    }
+
+    public function asHtmlNotation(): string
+    {
+        return sprintf('#%X%X%X', $this->getRed(), $this->getGreen(), $this->getBlue());
+    }
+
+}

src/Transformer/Utilities/AbstractHueSaturationValueToUtility.php

@@ -0,0 +1,61 @@
+<?php
+
+
+namespace TorstenHettstedt\Colors\Transformer\Utilities;
+
+
+use TorstenHettstedt\Colors\ColorModels\HueSaturationValue;
+
+abstract class AbstractHueSaturationValueToUtility
+{
+    /** @var int : Größe des Intervals in 1/100 Grad */
+    protected const INTERVAL = 60.0 * 100.0;
+
+    // Daten für HSV
+    /** @var float : Definition des Farbton als Anteil eines Vollkreises '$Hue * π' */
+    protected float $hue;
+    /** @var float : Anteil am Vollkreis in 1/100 Grad  */
+    protected float $hueAsPercentGrad;
+    /** @var float : Definition der Sättigung der Farbe */
+    protected float $saturation;
+    /** @var float : Definition der Helligkeit der Farbe */
+    protected float $value;
+
+    /**
+     * HueSaturationValueToRedGreenBlue constructor.
+     * @param HueSaturationValue $from_color
+     * @noinspection PhpPureAttributeCanBeAddedInspection
+     */
+    public function __construct(HueSaturationValue $from_color)
+    {
+        $this->hue = $from_color->getHue();
+        $this->hueAsPercentGrad = intval($this->hue * self::INTERVAL * 6.0);
+        $this->saturation = $from_color->getSaturation();
+        $this->value = $from_color->getValue();
+    }
+
+
+    protected function processConvert(): void
+    {
+        if ($this->saturation > 0.0) {
+            $this->splitColor();
+        }
+    }
+
+    abstract protected function splitColor(): void;
+
+    /**
+     * @param bool $reciprocal
+     *
+     * @return float
+     */
+    protected function calcColorValue($reciprocal = false): float
+    {
+        // Rest-Anteil am Vollkreis des aktuellen Intervals als Wert '[0,1]'
+        $remainder_grad = $this->hueAsPercentGrad % self::INTERVAL;
+        // Rest-Anteil am Vollkreis des aktuellen Intervals als Wert '[0,1]'
+        $remainder = $remainder_grad / self::INTERVAL;
+        return $this->saturation * ($reciprocal ? (1 - $remainder) : $remainder);
+    }
+
+}

src/Transformer/Utilities/CyanMagentaYellowKeyToHueSaturationValue.php

@@ -2,6 +2,7 @@
 
 namespace TorstenHettstedt\Colors\Transformer\Utilities;
 
+use JetBrains\PhpStorm\Pure;
 use TorstenHettstedt\Colors\ColorModels\CyanMagentaYellowKey;
 use TorstenHettstedt\Colors\ColorModels\HueSaturationValue;
 
@@ -72,6 +73,7 @@ class CyanMagentaYellowKeyToHueSaturationValue
             ->setValue($this->value);
     }
 
+    #[Pure]
     protected function buildHueAmount(): float
     {
         // Wenn beide Werte gleich sind, ist die Endfarbe Grau.

src/Transformer/Utilities/HueSaturationValueToCyanMagentaYellowKey.php

@@ -5,23 +5,9 @@ namespace TorstenHettstedt\Colors\Transformer\Utilities;
 
 
 use TorstenHettstedt\Colors\ColorModels\CyanMagentaYellowKey;
-use TorstenHettstedt\Colors\ColorModels\HueSaturationValue;
 
-class HueSaturationValueToCyanMagentaYellowKey
+class HueSaturationValueToCyanMagentaYellowKey extends AbstractHueSaturationValueToUtility
 {
-    /** @var int : Größe des Intervals in 1/100 Grad */
-    protected const INTERVAL = 60.0 * 100.0;
-
-    // Daten für HSV
-    /** @var float : Definition des Farbton als Anteil eines Vollkreises '$Hue * π' */
-    protected float $hue;
-    /** @var float : Anteil am Vollkreis in 1/100 Grad  */
-    protected float $hueAsPercentGrad;
-    /** @var float : Definition der Sättigung der Farbe */
-    protected float $saturation;
-    /** @var float : Definition der Helligkeit der Farbe */
-    protected float $value;
-
     // Daten für CMYK
     /** @var float : Definition des Cyan-Anteil */
     protected float $cyan = 0.0;
@@ -32,19 +18,6 @@ class HueSaturationValueToCyanMagentaYellowKey
     /** @var float : Definition des Schwarzanteil */
     protected float $key = 0.0;
 
-    /**
-     * HueSaturationValueToRedGreenBlue constructor.
-     * @param HueSaturationValue $from_color
-     * @noinspection PhpPureAttributeCanBeAddedInspection
-     */
-    public function __construct(HueSaturationValue $from_color)
-    {
-        $this->hue = $from_color->getHue();
-        $this->hueAsPercentGrad = intval($this->hue * self::INTERVAL * 6);
-        $this->saturation = $from_color->getSaturation();
-        $this->value = $from_color->getValue();
-    }
-
     public function convert(): CyanMagentaYellowKey
     {
         $this->processConvert();
@@ -60,17 +33,15 @@ class HueSaturationValueToCyanMagentaYellowKey
     protected function processConvert(): void
     {
         $this->key = 1 - $this->value;
-        if ($this->saturation !== 0.0) {
-            $this->splitColor();
-        }
+        parent::processConvert();
     }
 
     protected function splitColor(): void
     {
         // ID des zu nutzenden Interval
-        $interval_id = intdiv($this->hueAsPercentGrad , self::INTERVAL);
+        $interval_id = $this->hueAsPercentGrad / self::INTERVAL;
 
-        switch ($interval_id) {
+        switch ((int)$interval_id) {
             case 1: // Yellow
                 $this->cyan = $this->calcColorValue();
                 $this->yellow = $this->saturation;
@@ -98,13 +69,4 @@ class HueSaturationValueToCyanMagentaYellowKey
         }
     }
 
-    protected function calcColorValue($reciprocal = false): float
-    {
-        // Rest-Anteil am Vollkreis des aktuellen Intervals als Wert '[0,1]'
-        $remainder_grad = $this->hueAsPercentGrad % self::INTERVAL;
-        // Rest-Anteil am Vollkreis des aktuellen Intervals als Wert '[0,1]'
-        $remainder = $remainder_grad / self::INTERVAL;
-        return $this->saturation * ($reciprocal ? (1 - $remainder) : $remainder);
-    }
-
 }

src/Transformer/Utilities/HueSaturationValueToRedGreenBlue.php

@@ -4,24 +4,10 @@
 namespace TorstenHettstedt\Colors\Transformer\Utilities;
 
 
-use TorstenHettstedt\Colors\ColorModels\HueSaturationValue;
 use TorstenHettstedt\Colors\ColorModels\RedGreenBlue;
 
-class HueSaturationValueToRedGreenBlue
+class HueSaturationValueToRedGreenBlue extends AbstractHueSaturationValueToUtility
 {
-    /** @var int : Größe des Intervals in 1/100 Grad */
-    protected const INTERVAL = 60.0 * 100.0;
-
-    // Daten für HSV
-    /** @var float : Definition des Farbton als Anteil eines Vollkreises '$Hue * π' */
-    protected float $hue;
-    /** @var float : Anteil am Vollkreis in 1/100 Grad  */
-    protected float $hueAsPercentGrad;
-    /** @var float : Definition der Sättigung der Farbe */
-    protected float $saturation;
-    /** @var float : Definition der Helligkeit der Farbe */
-    protected float $value;
-
     // Daten für RGB
     /** @var float : Definition des Rotanteil */
     protected float $red = 1.0;
@@ -30,19 +16,6 @@ class HueSaturationValueToRedGreenBlue
     /** @var float : Definition des Blauanteil */
     protected float $blue = 1.0;
 
-    /**
-     * HueSaturationValueToRedGreenBlue constructor.
-     * @param HueSaturationValue $from_color
-     * @noinspection PhpPureAttributeCanBeAddedInspection
-     */
-    public function __construct(HueSaturationValue $from_color)
-    {
-        $this->hue = $from_color->getHue();
-        $this->hueAsPercentGrad = intval($this->hue * self::INTERVAL * 6);
-        $this->saturation = $from_color->getSaturation();
-        $this->value = $from_color->getValue();
-    }
-
     public function convert(): RedGreenBlue
     {
         $this->processConvert();
@@ -57,19 +30,17 @@ class HueSaturationValueToRedGreenBlue
     protected function processConvert(): void
     {
         $this->red = $this->green = $this->blue = $this->value;
-        if ($this->saturation > 0.0) {
-            $this->splitColor();
-        }
+        parent::processConvert();
     }
 
     protected function splitColor(): void
     {
         // ID des zu nutzenden Interval
-        $interval_id = intdiv($this->hueAsPercentGrad , self::INTERVAL);
+        $interval_id = $this->hueAsPercentGrad / self::INTERVAL;
         // Ist der Wert der entgegen gesetzten Farbe.
         $opposite_color_value = $this->value * ( 1 - $this->saturation);
-        
-        switch ($interval_id) {
+
+        switch ((int)$interval_id) {
             case 1:
                 $this->red = $this->calcColorValue();
                 $this->blue = $opposite_color_value;
@@ -99,12 +70,8 @@ class HueSaturationValueToRedGreenBlue
 
     protected function calcColorValue($reciprocal = false): float
     {
-        // Rest-Anteil am Vollkreis in 1/100 Grad
-        $remainder_grad = $this->hueAsPercentGrad % self::INTERVAL;
-        // Rest-Anteil am Vollkreis des aktuellen Intervals als Wert '[0,1]'
-        $remainder = $remainder_grad / self::INTERVAL;
         $color_value = $this->value;
-        $color_value *= 1 - ($this->saturation * ($reciprocal ? (1 - $remainder) : $remainder));
+        $color_value *= 1 - parent::calcColorValue($reciprocal);
         return $color_value;
     }
 

src/Transformer/Utilities/RedGreenBlueToHueSaturationValue.php

@@ -2,6 +2,7 @@
 
 namespace TorstenHettstedt\Colors\Transformer\Utilities;
 
+use JetBrains\PhpStorm\Pure;
 use TorstenHettstedt\Colors\ColorModels\HueSaturationValue;
 use TorstenHettstedt\Colors\ColorModels\RedGreenBlue;
 
@@ -70,6 +71,7 @@ class RedGreenBlueToHueSaturationValue
             ->setValue($this->value);
     }
 
+    #[Pure]
     protected function buildHueAmount(): float
     {
         // Wenn beide Werte gleich sind, ist die Endfarbe Grau.

tests/_support/Helper/ValidColorValuesProvider.php

@@ -11,6 +11,9 @@ class ValidColorValuesProvider
     const RGB  = 'rgb';
     const HSV  = 'hsv';
 
+    /**
+     * @var array<string, array<string, float>[]>
+     */
     protected array $definitions = [
         'weiß'    => [
             self::CMYK => [
@@ -302,6 +305,11 @@ class ValidColorValuesProvider
         ],
     ];
 
+    /**
+     * @param array<string> $order
+     *
+     * @return array<string, array<string, float>[]>
+     */
     public function getValidColorValues(array $order): array
     {
         $values = [];

tests/unit/ColorModels/AbstractColorModelUnit.php

@@ -8,7 +8,7 @@ use Codeception\Test\Unit;
 abstract class AbstractColorModelUnit extends Unit
 {
 
-    abstract public function testConstruct();
+    abstract public function testConstruct(): void;
 
     /**
      * @return float[][]

tests/unit/ColorModels/CyanMagentaYellowKeyTest.php

@@ -8,7 +8,7 @@ use TorstenHettstedt\Colors\ColorModels\CyanMagentaYellowKey;
 class CyanMagentaYellowKeyTest extends AbstractColorModelUnit
 {
 
-    public function testConstruct()
+    public function testConstruct(): void
     {
         $color = new CyanMagentaYellowKey();
 
@@ -23,7 +23,7 @@ class CyanMagentaYellowKeyTest extends AbstractColorModelUnit
      *
      * @dataProvider validValueProvider
      */
-    public function testSetCyanWithValidValue(float $value)
+    public function testSetCyanWithValidValue(float $value): void
     {
         $color = new CyanMagentaYellowKey();
 
@@ -36,7 +36,7 @@ class CyanMagentaYellowKeyTest extends AbstractColorModelUnit
      *
      * @dataProvider validValueProvider
      */
-    public function testSetMagentaWithValidValue(float $value)
+    public function testSetMagentaWithValidValue(float $value): void
     {
         $color = new CyanMagentaYellowKey();
 
@@ -49,7 +49,7 @@ class CyanMagentaYellowKeyTest extends AbstractColorModelUnit
      *
      * @dataProvider validValueProvider
      */
-    public function testSetYellowWithValidValue(float $value)
+    public function testSetYellowWithValidValue(float $value): void
     {
         $color = new CyanMagentaYellowKey();
 
@@ -62,7 +62,7 @@ class CyanMagentaYellowKeyTest extends AbstractColorModelUnit
      *
      * @dataProvider validValueProvider
      */
-    public function testSetKeyWithValidValue(float $value)
+    public function testSetKeyWithValidValue(float $value): void
     {
         $color = new CyanMagentaYellowKey();
 
@@ -75,7 +75,7 @@ class CyanMagentaYellowKeyTest extends AbstractColorModelUnit
      *
      * @dataProvider invalidValueProvider
      */
-    public function testSetCyanWithInvalidValue(float $value)
+    public function testSetCyanWithInvalidValue(float $value): void
     {
         $color = new CyanMagentaYellowKey();
 
@@ -88,7 +88,7 @@ class CyanMagentaYellowKeyTest extends AbstractColorModelUnit
      *
      * @dataProvider invalidValueProvider
      */
-    public function testSetMagentaWithInvalidValue(float $value)
+    public function testSetMagentaWithInvalidValue(float $value): void
     {
         $color = new CyanMagentaYellowKey();
 
@@ -101,7 +101,7 @@ class CyanMagentaYellowKeyTest extends AbstractColorModelUnit
      *
      * @dataProvider invalidValueProvider
      */
-    public function testSetYellowWithInvalidValue(float $value)
+    public function testSetYellowWithInvalidValue(float $value): void
     {
         $color = new CyanMagentaYellowKey();
 
@@ -114,7 +114,7 @@ class CyanMagentaYellowKeyTest extends AbstractColorModelUnit
      *
      * @dataProvider invalidValueProvider
      */
-    public function testSetKeyWithInvalidValue(float $value)
+    public function testSetKeyWithInvalidValue(float $value): void
     {
         $color = new CyanMagentaYellowKey();
 

tests/unit/ColorModels/HueSaturationValueTest.php

@@ -8,7 +8,7 @@ use TorstenHettstedt\Colors\ColorModels\HueSaturationValue;
 class HueSaturationValueTest extends AbstractColorModelUnit
 {
 
-    public function testConstruct()
+    public function testConstruct(): void
     {
         $color = new HueSaturationValue();
 
@@ -22,7 +22,7 @@ class HueSaturationValueTest extends AbstractColorModelUnit
      *
      * @dataProvider validValueProvider
      */
-    public function testSetHueWithValidValue(float $value)
+    public function testSetHueWithValidValue(float $value): void
     {
         $color = new HueSaturationValue();
 
@@ -35,7 +35,7 @@ class HueSaturationValueTest extends AbstractColorModelUnit
      *
      * @dataProvider invalidValueProvider
      */
-    public function testSetHueWithInvalidValue(float $value)
+    public function testSetHueWithInvalidValue(float $value): void
     {
         $color = new HueSaturationValue();
 
@@ -48,7 +48,7 @@ class HueSaturationValueTest extends AbstractColorModelUnit
      *
      * @dataProvider validValueProvider
      */
-    public function testSetSaturationWithValidValue(float $value)
+    public function testSetSaturationWithValidValue(float $value): void
     {
         $color = new HueSaturationValue();
 
@@ -61,7 +61,7 @@ class HueSaturationValueTest extends AbstractColorModelUnit
      *
      * @dataProvider invalidValueProvider
      */
-    public function testSetSaturationWithInvalidValue(float $value)
+    public function testSetSaturationWithInvalidValue(float $value): void
     {
         $color = new HueSaturationValue();
 
@@ -74,7 +74,7 @@ class HueSaturationValueTest extends AbstractColorModelUnit
      *
      * @dataProvider validValueProvider
      */
-    public function testSetValueWithValidValue(float $value)
+    public function testSetValueWithValidValue(float $value): void
     {
         $color = new HueSaturationValue();
 
@@ -87,7 +87,7 @@ class HueSaturationValueTest extends AbstractColorModelUnit
      *
      * @dataProvider invalidValueProvider
      */
-    public function testSetValueWithInvalidValue(float $value)
+    public function testSetValueWithInvalidValue(float $value): void
     {
         $color = new HueSaturationValue();
 

tests/unit/ColorModels/RedGreenBlueTest.php

@@ -8,7 +8,7 @@ use TorstenHettstedt\Colors\ColorModels\RedGreenBlue;
 class RedGreenBlueTest extends AbstractColorModelUnit
 {
 
-    public function testConstruct()
+    public function testConstruct(): void
     {
         $color = new RedGreenBlue();
 
@@ -22,7 +22,7 @@ class RedGreenBlueTest extends AbstractColorModelUnit
      *
      * @dataProvider validValueProvider
      */
-    public function testSetRedWithValidValue(float $value)
+    public function testSetRedWithValidValue(float $value): void
     {
         $color = new RedGreenBlue();
 
@@ -35,7 +35,7 @@ class RedGreenBlueTest extends AbstractColorModelUnit
      *
      * @dataProvider invalidValueProvider
      */
-    public function testSetRedWithInvalidValue(float $value)
+    public function testSetRedWithInvalidValue(float $value): void
     {
         $color = new RedGreenBlue();
 
@@ -47,7 +47,7 @@ class RedGreenBlueTest extends AbstractColorModelUnit
      *
      * @dataProvider validValueProvider
      */
-    public function testSetGreenWithValidValue(float $value)
+    public function testSetGreenWithValidValue(float $value): void
     {
         $color = new RedGreenBlue();
 
@@ -60,7 +60,7 @@ class RedGreenBlueTest extends AbstractColorModelUnit
      *
      * @dataProvider invalidValueProvider
      */
-    public function testSetGreenWithInvalidValue(float $value)
+    public function testSetGreenWithInvalidValue(float $value): void
     {
         $color = new RedGreenBlue();
 
@@ -73,7 +73,7 @@ class RedGreenBlueTest extends AbstractColorModelUnit
      *
      * @dataProvider validValueProvider
      */
-    public function testSetBlueWithValidValue(float $value)
+    public function testSetBlueWithValidValue(float $value): void
     {
         $color = new RedGreenBlue();
 
@@ -86,7 +86,7 @@ class RedGreenBlueTest extends AbstractColorModelUnit
      *
      * @dataProvider invalidValueProvider
      */
-    public function testSetBlueWithInvalidValue(float $value)
+    public function testSetBlueWithInvalidValue(float $value): void
     {
         $color = new RedGreenBlue();
 

tests/unit/NaturallyColorModels/AbstractColorModelUnit.php

@@ -0,0 +1,82 @@
+<?php /** @noinspection PhpArrayShapeAttributeCanBeAddedInspection */
+
+
+namespace TorstenHettstedt\Colors\Tests\Unit\NaturallyColorModels;
+
+use Codeception\Test\Unit;
+
+abstract class AbstractColorModelUnit extends Unit
+{
+
+    abstract public function testConstruct(): void;
+
+    /**
+     * @return int[][]
+     */
+    public function invalidPercentValueProvider(): array
+    {
+        return [
+            'zu klein' => [-1],
+            'zu gross' => [101],
+        ];
+    }
+
+    /**
+     * @return int[][]
+     */
+    public function validPercentValueProvider(): array
+    {
+        return [
+            'niedrigster Wert' => [0],
+            'mittlerer Wert' => [45],
+            'maximaler Wert' => [100],
+        ];
+    }
+
+    /**
+     * @return int[][]
+     */
+    public function invalidGradValueProvider(): array
+    {
+        return [
+            'zu klein' => [-1],
+            'zu gross' => [361],
+        ];
+    }
+
+    /**
+     * @return int[][]
+     */
+    public function validGradValueProvider(): array
+    {
+        return [
+            'niedrigster Wert' => [0],
+            'mittlerer Wert' => [45],
+            'maximaler Wert' => [360],
+        ];
+    }
+
+    /**
+     * @return int[][]
+     */
+    public function invalidHexadecimalValueProvider(): array
+    {
+        return [
+            'zu klein' => [-0x1],
+            'zu gross' => [0x100],
+        ];
+    }
+
+    /**
+     * @return int[][]
+     */
+    public function validHexadecimalValueProvider(): array
+    {
+        return [
+            'niedrigster Wert' => [0x0],
+            'mittlerer Wert' => [0xD9],
+            'maximaler Wert' => [0xFF],
+        ];
+    }
+
+}

tests/unit/NaturallyColorModels/CyanMagentaYellowKeyTest.php

@@ -0,0 +1,128 @@
+<?php
+
+namespace TorstenHettstedt\Colors\Tests\Unit\NaturallyColorModels;
+
+use InvalidArgumentException;
+use TorstenHettstedt\Colors\NaturallyColorModels\CyanMagentaYellowKey;
+
+class CyanMagentaYellowKeyTest extends AbstractColorModelUnit
+{
+
+    public function testConstruct(): void
+    {
+        $color = new CyanMagentaYellowKey();
+
+        $this->assertIsInt($color->getCyan());
+        $this->assertEquals(0, $color->getCyan());
+        $this->assertIsInt($color->getMagenta());
+        $this->assertEquals(0, $color->getMagenta());
+        $this->assertIsInt($color->getCyan());
+        $this->assertEquals(0, $color->getYellow());
+        $this->assertIsInt($color->getKey());
+        $this->assertEquals(0, $color->getKey());
+    }
+
+    /**
+     * @param int $value
+     *
+     * @dataProvider validPercentValueProvider
+     */
+    public function testSetCyanWithValidValue(int $value): void
+    {
+        $color = new CyanMagentaYellowKey();
+
+        $color->setCyan($value);
+        $this->assertEquals($value, $color->getCyan());
+    }
+
+    /**
+     * @param int $value
+     *
+     * @dataProvider validPercentValueProvider
+     */
+    public function testSetMagentaWithValidValue(int $value): void
+    {
+        $color = new CyanMagentaYellowKey();
+
+        $color->setMagenta($value);
+        $this->assertEquals($value, $color->getMagenta());
+    }
+
+    /**
+     * @param int $value
+     *
+     * @dataProvider validPercentValueProvider
+     */
+    public function testSetYellowWithValidValue(int $value): void
+    {
+        $color = new CyanMagentaYellowKey();
+
+        $color->setYellow($value);
+        $this->assertEquals($value, $color->getYellow());
+    }
+
+    /**
+     * @param int $value
+     *
+     * @dataProvider validPercentValueProvider
+     */
+    public function testSetKeyWithValidValue(int $value): void
+    {
+        $color = new CyanMagentaYellowKey();
+
+        $color->setKey($value);
+        $this->assertEquals($value, $color->getKey());
+    }
+
+    /**
+     * @param int $value
+     *
+     * @dataProvider invalidPercentValueProvider
+     */
+    public function testSetCyanWithInvalidValue(int $value): void
+    {
+        $color = new CyanMagentaYellowKey();
+
+        $this->expectException(InvalidArgumentException::class);
+        $color->setCyan($value);
+    }
+
+    /**
+     * @param int $value
+     *
+     * @dataProvider invalidPercentValueProvider
+     */
+    public function testSetMagentaWithInvalidValue(int $value): void
+    {
+        $color = new CyanMagentaYellowKey();
+
+        $this->expectException(InvalidArgumentException::class);
+        $color->setMagenta($value);
+    }
+
+    /**
+     * @param int $value
+     *
+     * @dataProvider invalidPercentValueProvider
+     */
+    public function testSetYellowWithInvalidValue(int $value): void
+    {
+        $color = new CyanMagentaYellowKey();
+
+        $this->expectException(InvalidArgumentException::class);
+        $color->setYellow($value);
+    }
+
+    /**
+     * @param int $value
+     *
+     * @dataProvider invalidPercentValueProvider
+     */
+    public function testSetKeyWithInvalidValue(int $value): void
+    {
+        $color = new CyanMagentaYellowKey();
+
+        $this->expectException(InvalidArgumentException::class);
+        $color->setKey($value);
+    }
+}

tests/unit/NaturallyColorModels/HueSaturationValueTest.php

@@ -0,0 +1,100 @@
+<?php
+
+namespace TorstenHettstedt\Colors\Tests\Unit\NaturallyColorModels;
+
+use InvalidArgumentException;
+use TorstenHettstedt\Colors\NaturallyColorModels\HueSaturationValue;
+
+class HueSaturationValueTest extends AbstractColorModelUnit
+{
+
+    public function testConstruct(): void
+    {
+        $color = new HueSaturationValue();
+
+        $this->assertIsInt($color->getHue());
+        $this->assertEquals(0, $color->getHue());
+        $this->assertIsInt($color->getSaturation());
+        $this->assertEquals(0, $color->getSaturation());
+        $this->assertIsInt($color->getValue());
+        $this->assertEquals(100, $color->getValue());
+    }
+
+    /**
+     * @param int $value
+     *
+     * @dataProvider validGradValueProvider
+     */
+    public function testSetHueWithValidValue(int $value): void
+    {
+        $color = new HueSaturationValue();
+
+        $color->setHue($value);
+        $this->assertEquals($value, $color->getHue());
+    }
+
+    /**
+     * @param int $value
+     *
+     * @dataProvider invalidGradValueProvider
+     */
+    public function testSetHueWithInvalidValue(int $value): void
+    {
+        $color = new HueSaturationValue();
+
+        $this->expectException(InvalidArgumentException::class);
+        $color->setHue($value);
+    }
+
+    /**
+     * @param int $value
+     *
+     * @dataProvider validPercentValueProvider
+     */
+    public function testSetSaturationWithValidValue(int $value): void
+    {
+        $color = new HueSaturationValue();
+
+        $color->setSaturation($value);
+        $this->assertEquals($value, $color->getSaturation());
+    }
+
+    /**
+     * @param int $value
+     *
+     * @dataProvider invalidPercentValueProvider
+     */
+    public function testSetSaturationWithInvalidValue(int $value): void
+    {
+        $color = new HueSaturationValue();
+
+        $this->expectException(InvalidArgumentException::class);
+        $color->setSaturation($value);
+    }
+
+    /**
+     * @param int $value
+     *
+     * @dataProvider validPercentValueProvider
+     */
+    public function testSetValueWithValidValue(int $value): void
+    {
+        $color = new HueSaturationValue();
+
+        $color->setValue($value);
+        $this->assertEquals($value, $color->getValue());
+    }
+
+    /**
+     * @param int $value
+     *
+     * @dataProvider invalidPercentValueProvider
+     */
+    public function testSetValueWithInvalidValue(int $value): void
+    {
+        $color = new HueSaturationValue();
+
+        $this->expectException(InvalidArgumentException::class);
+        $color->setValue($value);
+    }
+}

tests/unit/NaturallyColorModels/RedGreenBlueTest.php

@@ -0,0 +1,109 @@
+<?php
+
+namespace TorstenHettstedt\Colors\Tests\Unit\NaturallyColorModels;
+
+use InvalidArgumentException;
+use TorstenHettstedt\Colors\NaturallyColorModels\RedGreenBlue;
+
+class RedGreenBlueTest extends AbstractColorModelUnit
+{
+
+    public function testConstruct(): void
+    {
+        $color = new RedGreenBlue();
+
+        $this->assertEquals(0xFF, $color->getRed());
+        $this->assertEquals(0xFF, $color->getGreen());
+        $this->assertEquals(0xFF, $color->getBlue());
+    }
+
+    /**
+     * @param int $value
+     *
+     * @dataProvider validHexadecimalValueProvider
+     */
+    public function testSetRedWithValidValue(int $value): void
+    {
+        $color = new RedGreenBlue();
+
+        $color->setRed($value);
+        $this->assertEquals($value, $color->getRed());
+    }
+
+    /**
+     * @param int $value
+     *
+     * @dataProvider invalidHexadecimalValueProvider
+     */
+    public function testSetRedWithInvalidValue(int $value): void
+    {
+        $color = new RedGreenBlue();
+
+        $this->expectException(InvalidArgumentException::class);
+        $color->setRed($value);
+    }
+    /**
+     * @param int $value
+     *
+     * @dataProvider validHexadecimalValueProvider
+     */
+    public function testSetGreenWithValidValue(int $value): void
+    {
+        $color = new RedGreenBlue();
+
+        $color->setGreen($value);
+        $this->assertEquals($value, $color->getGreen());
+    }
+
+    /**
+     * @param int $value
+     *
+     * @dataProvider invalidHexadecimalValueProvider
+     */
+    public function testSetGreenWithInvalidValue(int $value): void
+    {
+        $color = new RedGreenBlue();
+
+        $this->expectException(InvalidArgumentException::class);
+        $color->setGreen($value);
+    }
+
+    /**
+     * @param int $value
+     *
+     * @dataProvider validHexadecimalValueProvider
+     */
+    public function testSetBlueWithValidValue(int $value): void
+    {
+        $color = new RedGreenBlue();
+
+        $color->setBlue($value);
+        $this->assertEquals($value, $color->getBlue());
+    }
+
+    /**
+     * @param int $value
+     *
+     * @dataProvider invalidHexadecimalValueProvider
+     */
+    public function testSetBlueWithInvalidValue(int $value): void
+    {
+        $color = new RedGreenBlue();
+
+        $this->expectException(InvalidArgumentException::class);
+        $color->setBlue($value);
+    }
+
+    public function testHtmlNotation(): void
+    {
+        $color = new RedGreenBlue();
+        $color->setRed(0xA1);
+        $color->setGreen(0xB2);
+        $color->setBlue(0xC3);
+
+        $html = $color->asHtmlNotation();
+
+        $this->assertIsString($html);
+        $this->assertEquals('#A1B2C3', $html);
+    }
+}

tests/unit/Transformer/CyanMagentaYellowKeyTransformerTest.php

@@ -16,7 +16,7 @@ class CyanMagentaYellowKeyTransformerTest extends Unit
     protected CyanMagentaYellowKey $color;
 
     /**
-     * @return float[][][]
+     * @return array<string, array<string, float>[]>
      */
     public function validRgbValuesProvider(): array
     {
@@ -27,7 +27,7 @@ class CyanMagentaYellowKeyTransformerTest extends Unit
     }
 
     /**
-     * @return float[][][]
+     * @return array<string, array<string, float>[]>
      */
     public function validHsvValuesProvider(): array
     {
@@ -38,14 +38,14 @@ class CyanMagentaYellowKeyTransformerTest extends Unit
     }
 
     /**
-     * @param array $cmyk
-     * @param array $rgb
+     * @param array<string, float> $cmyk
+     * @param array<string, float> $rgb
      *
      * @dataProvider validRgbValuesProvider
      *
      * @throws Exception
      */
-    public function testToRedGreenBlue(array $cmyk, array $rgb)
+    public function testToRedGreenBlue(array $cmyk, array $rgb): void
     {
         $this->color = $this->make(CyanMagentaYellowKey::class, $cmyk);
 
@@ -60,13 +60,13 @@ class CyanMagentaYellowKeyTransformerTest extends Unit
     }
 
     /**
-     * @param array $cmyk
+     * @param array<string, float> $cmyk
      *
      * @dataProvider validRgbValuesProvider
      *
      * @throws Exception
      */
-    public function testToCyanMagentaYellowKey(array $cmyk)
+    public function testToCyanMagentaYellowKey(array $cmyk): void
     {
 
         $this->color = $this->make(CyanMagentaYellowKey::class, $cmyk);
@@ -82,15 +82,15 @@ class CyanMagentaYellowKeyTransformerTest extends Unit
     }
 
     /**
-     * @param array $cmyk
-     * @param array $hsv
+     * @param array<string, float> $cmyk
+     * @param array<string, float> $hsv
      *
      * @throws Exception
      *
      * @dataProvider validHsvValuesProvider
      *
      */
-    public function testToHueSaturationValue(array $cmyk, array $hsv)
+    public function testToHueSaturationValue(array $cmyk, array $hsv): void
     {
         $this->color = $this->make(CyanMagentaYellowKey::class, $cmyk);
 

tests/unit/Transformer/HueSaturationValueTransformerTest.php

@@ -16,7 +16,7 @@ class HueSaturationValueTransformerTest extends Unit
     protected HueSaturationValue $color;
 
     /**
-     * @return float[][][]
+     * @return array<string, array<string, float>[]>
      */
     public function validCmykValuesProvider(): array
     {
@@ -27,7 +27,7 @@ class HueSaturationValueTransformerTest extends Unit
     }
 
     /**
-     * @return float[][][]
+     * @return array<string, array<string, float>[]>
      */
     public function validRgbValuesProvider(): array
     {
@@ -38,14 +38,14 @@ class HueSaturationValueTransformerTest extends Unit
     }
 
     /**
-     * @param array $hsv
-     * @param array $rgb
+     * @param array<string, float> $hsv
+     * @param array<string, float> $rgb
      *
      * @dataProvider validRgbValuesProvider
      *
      * @throws Exception
      */
-    public function testToRedGreenBlue(array $hsv, array $rgb)
+    public function testToRedGreenBlue(array $hsv, array $rgb): void
     {
         $this->color = $this->make(HueSaturationValue::class, $hsv);
 
@@ -60,14 +60,14 @@ class HueSaturationValueTransformerTest extends Unit
     }
 
     /**
-     * @param array $hsv
-     * @param array $cmyk
+     * @param array<string, float> $hsv
+     * @param array<string, float> $cmyk
      *
      * @throws Exception
      * @dataProvider validCmykValuesProvider
      *
      */
-    public function testToCyanMagentaYellowKey(array $hsv, array $cmyk)
+    public function testToCyanMagentaYellowKey(array $hsv, array $cmyk): void
     {
 
         $this->color = $this->make(HueSaturationValue::class, $hsv);
@@ -83,12 +83,12 @@ class HueSaturationValueTransformerTest extends Unit
     }
 
     /**
-     * @param array $hsv
+     * @param array<string, float> $hsv
      *
      * @throws Exception
      * @dataProvider validCmykValuesProvider
      */
-    public function testToHueSaturationValue(array $hsv)
+    public function testToHueSaturationValue(array $hsv): void
     {
         $this->color = $this->make(HueSaturationValue::class, $hsv);
 

tests/unit/Transformer/RedGreenBlueTransformerTest.php

@@ -16,7 +16,7 @@ class RedGreenBlueTransformerTest extends Unit
     protected RedGreenBlue $color;
 
     /**
-     * @return float[][][]
+     * @return array<string, array<string, float>[]>
      */
     public function validCmykValuesProvider(): array
     {
@@ -27,7 +27,7 @@ class RedGreenBlueTransformerTest extends Unit
     }
 
     /**
-     * @return float[][][]
+     * @return array<string, array<string, float>[]>
      */
     public function validHsvValuesProvider(): array
     {
@@ -38,13 +38,13 @@ class RedGreenBlueTransformerTest extends Unit
     }
 
     /**
-     * @param array $rgb
+     * @param array<string, float> $rgb
      *
      * @dataProvider validCmykValuesProvider
      *
      * @throws Exception
      */
-    public function testToRedGreenBlue(array $rgb)
+    public function testToRedGreenBlue(array $rgb): void
     {
         $this->color = $this->make(RedGreenBlue::class, $rgb);
 
@@ -59,14 +59,14 @@ class RedGreenBlueTransformerTest extends Unit
     }
 
     /**
-     * @param array $rgb
-     * @param array $cmyk
+     * @param array<string, float> $rgb
+     * @param array<string, float> $cmyk
      *
      * @throws Exception
      * @dataProvider validCmykValuesProvider
      *
      */
-    public function testToCyanMagentaYellowKey(array $rgb, array $cmyk)
+    public function testToCyanMagentaYellowKey(array $rgb, array $cmyk): void
     {
 
         $this->color = $this->make(RedGreenBlue::class, $rgb);
@@ -82,13 +82,13 @@ class RedGreenBlueTransformerTest extends Unit
     }
 
     /**
-     * @param array $rgb
-     * @param array $hsv
+     * @param array<string, float> $rgb
+     * @param array<string, float> $hsv
      *
      * @throws Exception
      * @dataProvider validHsvValuesProvider
      */
-    public function testToHueSaturationValue(array $rgb, array $hsv)
+    public function testToHueSaturationValue(array $rgb, array $hsv): void
     {
         $this->color = $this->make(RedGreenBlue::class, $rgb);