Merge pull request 'clean-code' (#4) from clean-code into master

Reviewed-on: http://localhost:3000/TorstenHettstedt/PHP-Packages-Colors/pulls/4

README.md

@@ -13,4 +13,6 @@ Die Klassen haben keinen Alphakanal.
 
 ## Hinweise zu den Transformer-Klassen
 
-Das Vorgehen der Umwandlung nimmt die Informationen von [Wikipedia - Liste der Farbräume](https://de.wikipedia.org/wiki/Liste_der_Farbr%C3%A4ume) auf.
+Das Vorgehen der Umwandlung nimmt die Informationen von 
+[Wikipedia - Liste der Farbräume](https://de.wikipedia.org/wiki/Liste_der_Farbr%C3%A4ume)
+und [Die Chemie-Schule - HSV-Farbraum](https://www.chemie-schule.de/KnowHow/HSV-Farbraum) auf.

codeception.dist.yml

@@ -0,0 +1,14 @@
+paths:
+    tests: tests
+    output: tests/_output
+    data: tests/_data
+    support: tests/_support
+    envs: tests/_envs
+actor_suffix: Tester
+extensions:
+    enabled:
+        - Codeception\Extension\RunFailed
+coverage:
+    enabled: true
+    include:
+        - src/*

composer.json

@@ -16,15 +16,19 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "TorstenHettstedtUnitTests\\Colors\\" : "tests/unit"
+            "TorstenHettstedt\\Colors\\Tests\\Unit\\" : "tests/unit",
+            "TorstenHettstedt\\Colors\\Tests\\Helper\\" : "tests/_support/Helper"
         }
     },
     "require": {
-        "php": "^8.0"
+        "php": "^8.0",
+        "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

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/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,9 +73,12 @@ class CyanMagentaYellowKeyToHueSaturationValue
             ->setValue($this->value);
     }
 
+    #[Pure]
     protected function buildHueAmount(): float
     {
-        if ($this->maxCmyProperty === 0.0) {
+        // Wenn beide Werte gleich sind, ist die Endfarbe Grau.
+        // Damit wird auch in {@sse hueAmount()} eine Division durch Null verhindert.
+        if ($this->maxCmyProperty === $this->minCmyProperty) {
             return 0.0;
         }
 
@@ -91,30 +95,32 @@ class CyanMagentaYellowKeyToHueSaturationValue
      */
     private function hueAmount(string $property): float
     {
-        static $amount_share = 2.0;
-
+        // Wertebereich: [0.0, 1.0]
         $divisor = $this->maxCmyProperty - $this->minCmyProperty;
+        // Wertebereich: [1.0, 5.0]
+        $amount = 0.0;
+        // Wertebereich: [-1.0, +1.0]
+        $dividend = 0.0;
 
         switch ($property) {
             case self::PROPERTY_YELLOW:
-                $amount = 0; // 0.167
+                $amount = 1.0; // 0.167
                 $dividend = $this->cyan - $this->magenta;
                 break;
             case self::PROPERTY_CYAN:
-                $amount = 1; // 0.500
+                $amount = 3.0; // 0.500
                 $dividend = $this->magenta -$this->yellow;
                 break;
             case self::PROPERTY_MAGENTA:
-                $amount = 2; // 0.833
+                $amount = 5.0; // 0.833
                 $dividend = $this->yellow - $this->cyan;
                 break;
-            default:
-                return 0;
         }
 
-        $start_amount = ($amount * $amount_share) + 1.0;
+        // Wertebereich: [-1.0, +1.0]
         $expansion_amount = $dividend / $divisor;
-        return ($start_amount + $expansion_amount) / 6.0;
+        // Wertebereich: [+0.0, +6.0]
+        return ($amount + $expansion_amount) / 6.0;
     }
 
 }

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,51 +33,40 @@ 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->calcRemainder();
+                $this->cyan = $this->calcColorValue();
                 $this->yellow = $this->saturation;
                 break;
             case 2:
                 $this->cyan = $this->saturation;
-                $this->yellow = $this->calcRemainder(true);
+                $this->yellow = $this->calcColorValue(true);
                 break;
             case 3: // Cyan
                 $this->cyan = $this->saturation;
-                $this->magenta = $this->calcRemainder();
+                $this->magenta = $this->calcColorValue();
                 break;
             case 4:
-                $this->cyan = $this->calcRemainder(true);
+                $this->cyan = $this->calcColorValue(true);
                 $this->magenta = $this->saturation;
                 break;
             case 5: // Magenta
                 $this->magenta = $this->saturation;
-                $this->yellow = $this->calcRemainder();
+                $this->yellow = $this->calcColorValue();
                 break;
             default:
-                $this->magenta = $this->calcRemainder(true);
+                $this->magenta = $this->calcColorValue(true);
                 $this->yellow = $this->saturation;
                 break;
         }
     }
 
-    protected function calcRemainder($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,41 +4,17 @@
 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 * 100;
-
-    // Daten für HSV
-    /** @var float : Definition des Farbton als Anteil eines Vollkreises '$Hue * π' */
-    protected float $hue;
-    /** @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;
     /** @var float : Definition des Grünanteil */
     protected float $green = 1.0;
     /** @var float : Definition des Blauanteil */
-    protected float $blu = 1.0;
-
-    /**
-     * HueSaturationValueToRedGreenBlue constructor.
-     * @param HueSaturationValue $from_color
-     * @noinspection PhpPureAttributeCanBeAddedInspection
-     */
-    public function __construct(HueSaturationValue $from_color)
-    {
-        $this->hue = $from_color->getHue();
-        $this->saturation = $from_color->getSaturation();
-        $this->value = $from_color->getValue();
-    }
+    protected float $blue = 1.0;
 
     public function convert(): RedGreenBlue
     {
@@ -47,65 +23,56 @@ class HueSaturationValueToRedGreenBlue
         return (new RedGreenBlue())
             ->setRed($this->red)
             ->setGreen($this->green)
-            ->setBlue($this->blu);
+            ->setBlue($this->blue);
     }
 
 
     protected function processConvert(): void
     {
-        if ($this->saturation === 0.0) {
-            $this->red = $this->green = $this->blu = $this->value;
-        } else {
-            $this->splitColor();
-        }
+        $this->red = $this->green = $this->blue = $this->value;
+        parent::processConvert();
     }
 
     protected function splitColor(): void
     {
-        // Anteil am Vollkreis in 1/100 Grad
-        $percent_grad = intval($this->hue * 360 * 100);
         // ID des zu nutzenden Interval
-        $interval_id = intdiv($percent_grad , self::INTERVAL);
-        // Rest-Anteil am Vollkreis des aktuellen Intervals als Wert '[0,1]'
-        $remainder = (($percent_grad % self::INTERVAL) / self::INTERVAL);
-        $help_values = [
-            $this->value,
-            $this->value * ( 1 - $this->saturation),
-            $this->value * ( 1 - $this->saturation * $remainder),
-            $this->value * ( 1 - $this->saturation * (1 - $remainder)),
-        ];
-        switch ($interval_id) {
+        $interval_id = $this->hueAsPercentGrad / self::INTERVAL;
+        // Ist der Wert der entgegen gesetzten Farbe.
+        $opposite_color_value = $this->value * ( 1 - $this->saturation);
+
+        switch ((int)$interval_id) {
             case 1:
-                $this->red = $help_values[2];
-                $this->green = $help_values[0];
-                $this->blu = $help_values[1];
+                $this->red = $this->calcColorValue();
+                $this->blue = $opposite_color_value;
                 break;
-            case 2:
-                $this->red = $help_values[1];
-                $this->green = $help_values[0];
-                $this->blu = $help_values[3];
+            case 2: // Green
+                $this->red = $opposite_color_value;
+                $this->blue = $this->calcColorValue(true);
                 break;
             case 3:
-                $this->red = $help_values[1];
-                $this->green = $help_values[2];
-                $this->blu = $help_values[0];
+                $this->red = $opposite_color_value;
+                $this->green = $this->calcColorValue();
                 break;
-            case 4:
-                $this->red = $help_values[3];
-                $this->green = $help_values[1];
-                $this->blu = $help_values[0];
+            case 4: // Blue
+                $this->red = $this->calcColorValue(true);
+                $this->green = $opposite_color_value;
                 break;
             case 5:
-                $this->red = $help_values[0];
-                $this->green = $help_values[1];
-                $this->blu = $help_values[2];
+                $this->green = $opposite_color_value;
+                $this->blue = $this->calcColorValue();
                 break;
-            default:
-                $this->red = $help_values[0];
-                $this->green = $help_values[3];
-                $this->blu = $help_values[1];
+            default: // Red
+                $this->green = $this->calcColorValue(true);
+                $this->blue = $opposite_color_value;
                 break;
         }
     }
 
+    protected function calcColorValue($reciprocal = false): float
+    {
+        $color_value = $this->value;
+        $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;
 
@@ -58,10 +59,6 @@ class RedGreenBlueToHueSaturationValue
         while($this->hue < 0.0) {
             $this->hue += 1.0;
         }
-
-        while($this->hue > 1.0) {
-            $this->hue -= 1.0;
-        }
     }
 
     public function convert(): HueSaturationValue
@@ -74,8 +71,11 @@ class RedGreenBlueToHueSaturationValue
             ->setValue($this->value);
     }
 
+    #[Pure]
     protected function buildHueAmount(): float
     {
+        // Wenn beide Werte gleich sind, ist die Endfarbe Grau.
+        // Damit wird auch in {@sse hueAmount()} eine Division durch Null verhindert.
         if ($this->maxRgbProperty === $this->minRgbProperty) {
             return 0.0;
         }
@@ -105,30 +105,32 @@ class RedGreenBlueToHueSaturationValue
      */
     private function hueAmount(string $property): float
     {
-        static $amount_share = 2.0;
-
+        // Wertebereich: [0.0, 1.0]
         $divisor = $this->maxRgbProperty - $this->minRgbProperty;
+        // Wertebereich: [1.0, 5.0]
+        $amount = 0.0;
+        // Wertebereich: [-1.0, +1.0]
+        $dividend = 0.0;
 
         switch ($property) {
             case self::PROPERTY_RED:
-                $amount = 0; // 0.0
+                $amount = 0.0; // 0.0
                 $dividend = $this->green - $this->blu;
                 break;
             case self::PROPERTY_GREEN:
-                $amount = 1; // 0.333
+                $amount = 2.0; // 0.333
                 $dividend = $this->blu -$this->red;
                 break;
             case self::PROPERTY_BLUE:
-                $amount = 2; // 0.999
+                $amount = 4.0; // 0.999
                 $dividend = $this->red - $this->green;
                 break;
-            default:
-                return 0;
         }
 
-        $start_amount = $amount * $amount_share;
+        // Wertebereich: [-1.0, +1.0]
         $expansion_amount = $dividend / $divisor;
-        return ($start_amount + $expansion_amount) / 6.0;
+        // Wertebereich: [-1.0, +5.0]
+        return ($amount + $expansion_amount) / 6.0;
     }
 
 }

tests/_support/Helper/ValidColorValuesProvider.php

@@ -1,7 +1,7 @@
 <?php
 
 
-namespace TorstenHettstedtUnitTests\Colors\Transformer;
+namespace TorstenHettstedt\Colors\Tests\Helper;
 
 
 class ValidColorValuesProvider
@@ -11,6 +11,9 @@ class ValidColorValuesProvider
     const RGB  = 'rgb';
     const HSV  = 'hsv';
 
+    /**
+     * @var array<string, array<string, float>[]>
+     */
     protected array $definitions = [
         'weiß'    => [
             self::CMYK => [
@@ -30,6 +33,42 @@ class ValidColorValuesProvider
                 'value'      => 1.0,
             ],
         ],
+        'hellgrau' => [
+            self::CMYK => [
+                'cyan'    => 0.0,
+                'magenta' => 0.0,
+                'yellow'  => 0.0,
+                'key'     => 2.0 / 3.0,
+            ],
+            self::RGB  => [
+                'red'   => 1.0 / 3.0,
+                'green' => 1.0 / 3.0,
+                'blue'  => 1.0 / 3.0,
+            ],
+            self::HSV  => [
+                'hue'        => 0.0,
+                'saturation' => 0.0,
+                'value'      => 1.0 / 3.0,
+            ],
+        ],
+        'dunkelgrau' => [
+            self::CMYK => [
+                'cyan'    => 0.0,
+                'magenta' => 0.0,
+                'yellow'  => 0.0,
+                'key'     => 1.0 / 3.0,
+            ],
+            self::RGB  => [
+                'red'   => 2.0 / 3.0,
+                'green' => 2.0 / 3.0,
+                'blue'  => 2.0 / 3.0,
+            ],
+            self::HSV  => [
+                'hue'        => 0.0,
+                'saturation' => 0.0,
+                'value'      => 2.0 / 3.0,
+            ],
+        ],
         'schwarz' => [
             self::CMYK => [
                 'cyan'    => 0.0,
@@ -156,6 +195,24 @@ class ValidColorValuesProvider
                 'value'      => 1.0,
             ],
         ],
+        'dunkellachs' => [
+            self::CMYK => [
+                'cyan'    => 0.0,
+                'magenta' => 0.54,
+                'yellow'  => 0.72,
+                'key'     => 0.30,
+            ],
+            self::RGB  => [
+                'red'   => 0.7,
+                'green' => 0.3216,
+                'blue'  => 0.1961,
+            ],
+            self::HSV  => [
+                'hue'        => 0.0417,
+                'saturation' => 0.72,
+                'value'      => 0.70,
+            ],
+        ],
         'gold'    => [
             self::CMYK => [
                 'cyan'    => 0.0,
@@ -174,6 +231,42 @@ class ValidColorValuesProvider
                 'value'      => 0.87,
             ],
         ],
+        'grasgrün' => [
+            self::CMYK => [
+                'cyan'    => 0.495,
+                'magenta' => 0.0,
+                'yellow'  => 1.0,
+                'key'     => 0.51,
+            ],
+            self::RGB  => [
+                'red'   => 0.247,
+                'green' => 0.490,
+                'blue'  => 0.0,
+            ],
+            self::HSV  => [
+                'hue'        => 0.2492,
+                'saturation' => 1.00,
+                'value'      => 0.49,
+            ],
+        ],
+        'aquamarin' => [
+            self::CMYK => [
+                'cyan'    => 0.501,
+                'magenta' => 0.0,
+                'yellow'  => 0.168,
+                'key'     => 0.00,
+            ],
+            self::RGB  => [
+                'red'   => 0.49804,
+                'green' => 1.0,
+                'blue'  => 0.83285,
+            ],
+            self::HSV  => [
+                'hue'        => 0.4445,
+                'saturation' => 0.50196,
+                'value'      => 1.0,
+            ],
+        ],
         'violet'  => [
             self::CMYK => [
                 'cyan'    => 0.191,
@@ -192,8 +285,31 @@ class ValidColorValuesProvider
                 'value'      => 0.71,
             ],
         ],
+        'pflaume'  => [
+            self::CMYK => [
+                'cyan'    => 0.0,
+                'magenta' => 0.2755,
+                'yellow'  => 0.0,
+                'key'     => 0.1335,
+            ],
+            self::RGB  => [
+                'red'   => 0.8667,
+                'green' => 0.6274,
+                'blue'  => 0.8667,
+            ],
+            self::HSV  => [
+                'hue'        => 0.83333,
+                'saturation' => 0.27601,
+                'value'      => 0.86666,
+            ],
+        ],
     ];
 
+    /**
+     * @param array<string> $order
+     *
+     * @return array<string, array<string, float>[]>
+     */
     public function getValidColorValues(array $order): array
     {
         $values = [];

tests/unit/ColorModels/AbstractColorModelUnit.php

@@ -1,14 +1,14 @@
 <?php /** @noinspection PhpArrayShapeAttributeCanBeAddedInspection */
 
 
-namespace TorstenHettstedtUnitTests\Colors\ColorModels;
+namespace TorstenHettstedt\Colors\Tests\Unit\ColorModels;
 
 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

@@ -1,6 +1,6 @@
 <?php
 
-namespace TorstenHettstedtUnitTests\Colors\ColorModels;
+namespace TorstenHettstedt\Colors\Tests\Unit\ColorModels;
 
 use InvalidArgumentException;
 use TorstenHettstedt\Colors\ColorModels\CyanMagentaYellowKey;
@@ -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

@@ -1,6 +1,6 @@
 <?php
 
-namespace TorstenHettstedtUnitTests\Colors\ColorModels;
+namespace TorstenHettstedt\Colors\Tests\Unit\ColorModels;
 
 use InvalidArgumentException;
 use TorstenHettstedt\Colors\ColorModels\HueSaturationValue;
@@ -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

@@ -1,6 +1,6 @@
-<?php /** @noinspection PhpArrayShapeAttributeCanBeAddedInspection */
+<?php
 
-namespace TorstenHettstedtUnitTests\Colors\ColorModels;
+namespace TorstenHettstedt\Colors\Tests\Unit\ColorModels;
 
 use InvalidArgumentException;
 use TorstenHettstedt\Colors\ColorModels\RedGreenBlue;
@@ -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/Transformer/CyanMagentaYellowKeyTransformerTest.php

@@ -1,10 +1,11 @@
-<?php /** @noinspection PhpArrayShapeAttributeCanBeAddedInspection */
+<?php
 
-namespace TorstenHettstedtUnitTests\Colors\Transformer;
+namespace TorstenHettstedt\Colors\Tests\Unit\Transformer;
 
 use Codeception\Test\Unit;
 use Exception;
 use TorstenHettstedt\Colors\ColorModels\CyanMagentaYellowKey;
+use TorstenHettstedt\Colors\Tests\Helper\ValidColorValuesProvider;
 use TorstenHettstedt\Colors\Transformer\CyanMagentaYellowKeyTransformer;
 
 class CyanMagentaYellowKeyTransformerTest extends Unit
@@ -15,7 +16,7 @@ class CyanMagentaYellowKeyTransformerTest extends Unit
     protected CyanMagentaYellowKey $color;
 
     /**
-     * @return float[][][]
+     * @return array<string, array<string, float>[]>
      */
     public function validRgbValuesProvider(): array
     {
@@ -26,7 +27,7 @@ class CyanMagentaYellowKeyTransformerTest extends Unit
     }
 
     /**
-     * @return float[][][]
+     * @return array<string, array<string, float>[]>
      */
     public function validHsvValuesProvider(): array
     {
@@ -37,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);
 
@@ -59,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);
@@ -81,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

@@ -1,10 +1,11 @@
-<?php /** @noinspection PhpArrayShapeAttributeCanBeAddedInspection */
+<?php
 
-namespace TorstenHettstedtUnitTests\Colors\Transformer;
+namespace TorstenHettstedt\Colors\Tests\Unit\Transformer;
 
 use Codeception\Test\Unit;
 use Exception;
 use TorstenHettstedt\Colors\ColorModels\HueSaturationValue;
+use TorstenHettstedt\Colors\Tests\Helper\ValidColorValuesProvider;
 use TorstenHettstedt\Colors\Transformer\HueSaturationValueTransformer;
 
 class HueSaturationValueTransformerTest extends Unit
@@ -15,7 +16,7 @@ class HueSaturationValueTransformerTest extends Unit
     protected HueSaturationValue $color;
 
     /**
-     * @return float[][][]
+     * @return array<string, array<string, float>[]>
      */
     public function validCmykValuesProvider(): array
     {
@@ -26,7 +27,7 @@ class HueSaturationValueTransformerTest extends Unit
     }
 
     /**
-     * @return float[][][]
+     * @return array<string, array<string, float>[]>
      */
     public function validRgbValuesProvider(): array
     {
@@ -37,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);
 
@@ -59,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);
@@ -82,15 +83,12 @@ class HueSaturationValueTransformerTest extends Unit
     }
 
     /**
-     * @param array $hsv
-     * @param array $cmyk
+     * @param array<string, float> $hsv
      *
      * @throws Exception
-     *
      * @dataProvider validCmykValuesProvider
-     *
      */
-    public function testToHueSaturationValue(array $hsv, array $cmyk)
+    public function testToHueSaturationValue(array $hsv): void
     {
         $this->color = $this->make(HueSaturationValue::class, $hsv);
 

tests/unit/Transformer/RedGreenBlueTransformerTest.php

@@ -1,10 +1,11 @@
-<?php /** @noinspection PhpArrayShapeAttributeCanBeAddedInspection */
+<?php
 
-namespace TorstenHettstedtUnitTests\Colors\Transformer;
+namespace TorstenHettstedt\Colors\Tests\Unit\Transformer;
 
 use Codeception\Test\Unit;
 use Exception;
 use TorstenHettstedt\Colors\ColorModels\RedGreenBlue;
+use TorstenHettstedt\Colors\Tests\Helper\ValidColorValuesProvider;
 use TorstenHettstedt\Colors\Transformer\RedGreenBlueTransformer;
 
 class RedGreenBlueTransformerTest extends Unit
@@ -15,7 +16,7 @@ class RedGreenBlueTransformerTest extends Unit
     protected RedGreenBlue $color;
 
     /**
-     * @return float[][][]
+     * @return array<string, array<string, float>[]>
      */
     public function validCmykValuesProvider(): array
     {
@@ -26,7 +27,7 @@ class RedGreenBlueTransformerTest extends Unit
     }
 
     /**
-     * @return float[][][]
+     * @return array<string, array<string, float>[]>
      */
     public function validHsvValuesProvider(): array
     {
@@ -37,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);
 
@@ -58,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);
@@ -81,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);