From bd9eac43b2b225d6efb39b359630a19359cd2dc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torsten=20L=C3=BCcke?= Date: Fri, 4 Mar 2022 19:24:58 +0100 Subject: [PATCH 1/2] feature: Erneuerung der benutzten PHP-Pakete --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 7e8f131..5090b8a 100644 --- a/composer.json +++ b/composer.json @@ -28,7 +28,7 @@ "require-dev": { "codeception/codeception": "^4.1.18", "codeception/module-phpbrowser": "^1.0.0", - "codeception/module-asserts": "^1.0.0", - "phpstan/phpstan" : "^0.12.82" + "codeception/module-asserts": "^1.3.1", + "phpstan/phpstan" : "^1.4.7" } } From c9540dc12614acfed6e6b8e963340d09b250892f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torsten=20L=C3=BCcke?= Date: Fri, 4 Mar 2022 19:33:25 +0100 Subject: [PATCH 2/2] =?UTF-8?q?refactor:=20Texte=20=C3=BCberarbeiten?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/ColorModels/CyanMagentaYellowKey.php | 6 +++--- src/ColorModels/HueSaturationValue.php | 2 +- src/ColorModels/RedGreenBlue.php | 6 +++--- src/NaturallyColorModels/RedGreenBlue.php | 4 ++-- .../Utilities/AbstractHueSaturationValueToUtility.php | 4 ++-- .../CyanMagentaYellowKeyToHueSaturationValue.php | 10 +++++----- .../HueSaturationValueToCyanMagentaYellowKey.php | 6 +++--- .../Utilities/HueSaturationValueToRedGreenBlue.php | 8 ++++---- .../Utilities/RedGreenBlueToHueSaturationValue.php | 10 +++++----- tests/_support/Helper/ValidColorValuesProvider.php | 4 ++-- .../Helper/ValidNaturallyColorValuesProvider.php | 4 ++-- .../CyanMagentaYellowKeyTransformerTest.php | 6 +++--- .../HueSaturationValueTransformerTest.php | 6 +++--- .../RedGreenBlueTransformerTest.php | 6 +++--- .../CyanMagentaYellowKeyTransformerTest.php | 4 ++-- .../Transformer/HueSaturationValueTransformerTest.php | 4 ++-- tests/unit/Transformer/RedGreenBlueTransformerTest.php | 4 ++-- 17 files changed, 47 insertions(+), 47 deletions(-) diff --git a/src/ColorModels/CyanMagentaYellowKey.php b/src/ColorModels/CyanMagentaYellowKey.php index 4ec5e1d..b1ee527 100644 --- a/src/ColorModels/CyanMagentaYellowKey.php +++ b/src/ColorModels/CyanMagentaYellowKey.php @@ -9,11 +9,11 @@ namespace TorstenHettstedt\Colors\ColorModels; */ class CyanMagentaYellowKey extends AbstractColorModel { - /** @var float : Definition des Cyan-Anteil */ + /** @var float : Definition des Cyan-Anteils */ protected float $cyan = 0.0; - /** @var float : Definition des Magenta-Anteil */ + /** @var float : Definition des Magenta-Anteils */ protected float $magenta = 0.0; - /** @var float : Definition des Gelbanteil */ + /** @var float : Definition des Gelbanteiles */ protected float $yellow = 0.0; /** @var float : Definition des Schwarzanteil */ protected float $key = 0.0; diff --git a/src/ColorModels/HueSaturationValue.php b/src/ColorModels/HueSaturationValue.php index ccd8634..ccb7225 100644 --- a/src/ColorModels/HueSaturationValue.php +++ b/src/ColorModels/HueSaturationValue.php @@ -9,7 +9,7 @@ namespace TorstenHettstedt\Colors\ColorModels; */ class HueSaturationValue extends AbstractColorModel { - /** @var float : Definition des Farbton als Anteil eines Vollkreises '$Hue * π' */ + /** @var float : Definition des Farbtones als Anteil eines Vollkreises '$Hue * π' */ protected float $hue = 0.0; /** @var float : Definition der Sättigung der Farbe */ protected float $saturation = 0.0; diff --git a/src/ColorModels/RedGreenBlue.php b/src/ColorModels/RedGreenBlue.php index f38e7e1..285df29 100644 --- a/src/ColorModels/RedGreenBlue.php +++ b/src/ColorModels/RedGreenBlue.php @@ -8,11 +8,11 @@ namespace TorstenHettstedt\Colors\ColorModels; */ class RedGreenBlue extends AbstractColorModel { - /** @var float : Definition des Rotanteil */ + /** @var float : Definition des Rot-Anteils */ protected float $red = 1.0; - /** @var float : Definition des Grünanteil */ + /** @var float : Definition des Grün-Anteils */ protected float $green = 1.0; - /** @var float : Definition des Grünanteil */ + /** @var float : Definition des Blau-Anteils */ protected float $blue = 1.0; /** diff --git a/src/NaturallyColorModels/RedGreenBlue.php b/src/NaturallyColorModels/RedGreenBlue.php index 2c60e70..c109a50 100644 --- a/src/NaturallyColorModels/RedGreenBlue.php +++ b/src/NaturallyColorModels/RedGreenBlue.php @@ -70,7 +70,7 @@ class RedGreenBlue /** * @return int */ - public function getBlue(): int + #[Pure] public function getBlue(): int { return $this->hexadecimalValuesHelper->asHexadecimalValue($this->pureColor->getBlue()); } @@ -86,7 +86,7 @@ class RedGreenBlue return $this; } - public function asHtmlNotation(): string + #[Pure] public function asHtmlNotation(): string { return sprintf('#%X%X%X', $this->getRed(), $this->getGreen(), $this->getBlue()); } diff --git a/src/Transformer/Utilities/AbstractHueSaturationValueToUtility.php b/src/Transformer/Utilities/AbstractHueSaturationValueToUtility.php index 0588376..ca07276 100644 --- a/src/Transformer/Utilities/AbstractHueSaturationValueToUtility.php +++ b/src/Transformer/Utilities/AbstractHueSaturationValueToUtility.php @@ -8,11 +8,11 @@ use TorstenHettstedt\Colors\ColorModels\HueSaturationValue; abstract class AbstractHueSaturationValueToUtility { - /** @var int : Größe des Intervals in 1/100 Grad */ + /** @var float : 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 * π' */ + /** @var float : Definition des Farbtones als Anteil eines Vollkreises '$Hue * π' */ protected float $hue; /** @var float : Anteil am Vollkreis in 1/100 Grad */ protected float $hueAsPercentGrad; diff --git a/src/Transformer/Utilities/CyanMagentaYellowKeyToHueSaturationValue.php b/src/Transformer/Utilities/CyanMagentaYellowKeyToHueSaturationValue.php index ae42ca4..684d821 100644 --- a/src/Transformer/Utilities/CyanMagentaYellowKeyToHueSaturationValue.php +++ b/src/Transformer/Utilities/CyanMagentaYellowKeyToHueSaturationValue.php @@ -15,11 +15,11 @@ class CyanMagentaYellowKeyToHueSaturationValue const PROPERTY_KEY = 'key'; // Daten für CMYK - /** @var float : Definition des Cyan-Anteil */ + /** @var float : Definition des Cyan-Anteils */ protected float $cyan; - /** @var float : Definition des Magenta-Anteil */ + /** @var float : Definition des Magenta-Anteils */ protected float $magenta; - /** @var float : Definition des Gelbanteil */ + /** @var float : Definition des Gelbanteils */ protected float $yellow; /** @var float : Definition des Schwarzanteil */ protected float $key; @@ -30,7 +30,7 @@ class CyanMagentaYellowKeyToHueSaturationValue protected float $minCmyProperty; // Daten für HSV - /** @var float : Definition des Farbton als Anteil eines Vollkreises '$Hue * π' */ + /** @var float : Definition des Farbtones als Anteil eines Vollkreises '$Hue * π' */ protected float $hue = 0.0; /** @var float : Definition der Sättigung der Farbe */ protected float $saturation = 0.0; @@ -77,7 +77,7 @@ class CyanMagentaYellowKeyToHueSaturationValue protected function buildHueAmount(): float { // Wenn beide Werte gleich sind, ist die Endfarbe Grau. - // Damit wird auch in {@sse hueAmount()} eine Division durch Null verhindert. + // Damit wird auch in {@sse hueAmount()} eine Division durch '0' verhindert. if ($this->maxCmyProperty === $this->minCmyProperty) { return 0.0; } diff --git a/src/Transformer/Utilities/HueSaturationValueToCyanMagentaYellowKey.php b/src/Transformer/Utilities/HueSaturationValueToCyanMagentaYellowKey.php index c66e963..eef474f 100644 --- a/src/Transformer/Utilities/HueSaturationValueToCyanMagentaYellowKey.php +++ b/src/Transformer/Utilities/HueSaturationValueToCyanMagentaYellowKey.php @@ -9,11 +9,11 @@ use TorstenHettstedt\Colors\ColorModels\CyanMagentaYellowKey; class HueSaturationValueToCyanMagentaYellowKey extends AbstractHueSaturationValueToUtility { // Daten für CMYK - /** @var float : Definition des Cyan-Anteil */ + /** @var float : Definition des Cyan-Anteils */ protected float $cyan = 0.0; - /** @var float : Definition des Magenta-Anteil */ + /** @var float : Definition des Magenta-Anteils */ protected float $magenta = 0.0; - /** @var float : Definition des Gelbanteil */ + /** @var float : Definition des Gelbanteils */ protected float $yellow = 0.0; /** @var float : Definition des Schwarzanteil */ protected float $key = 0.0; diff --git a/src/Transformer/Utilities/HueSaturationValueToRedGreenBlue.php b/src/Transformer/Utilities/HueSaturationValueToRedGreenBlue.php index 3520d92..cfffc37 100644 --- a/src/Transformer/Utilities/HueSaturationValueToRedGreenBlue.php +++ b/src/Transformer/Utilities/HueSaturationValueToRedGreenBlue.php @@ -9,11 +9,11 @@ use TorstenHettstedt\Colors\ColorModels\RedGreenBlue; class HueSaturationValueToRedGreenBlue extends AbstractHueSaturationValueToUtility { // Daten für RGB - /** @var float : Definition des Rotanteil */ + /** @var float : Definition des Rotanteils */ protected float $red = 1.0; - /** @var float : Definition des Grünanteil */ + /** @var float : Definition des Grünanteils */ protected float $green = 1.0; - /** @var float : Definition des Blauanteil */ + /** @var float : Definition des Blauanteils */ protected float $blue = 1.0; public function convert(): RedGreenBlue @@ -37,7 +37,7 @@ class HueSaturationValueToRedGreenBlue extends AbstractHueSaturationValueToUtili { // ID des zu nutzenden Interval $interval_id = $this->hueAsPercentGrad / self::INTERVAL; - // Ist der Wert der entgegen gesetzten Farbe. + // der Wert der entgegen gesetzten Farbe $opposite_color_value = $this->value * ( 1 - $this->saturation); switch ((int)$interval_id) { diff --git a/src/Transformer/Utilities/RedGreenBlueToHueSaturationValue.php b/src/Transformer/Utilities/RedGreenBlueToHueSaturationValue.php index d243770..c15523a 100644 --- a/src/Transformer/Utilities/RedGreenBlueToHueSaturationValue.php +++ b/src/Transformer/Utilities/RedGreenBlueToHueSaturationValue.php @@ -13,11 +13,11 @@ class RedGreenBlueToHueSaturationValue const PROPERTY_BLUE = 'blue'; // Daten für RGB - /** @var float : Definition des Rotanteil */ + /** @var float : Definition des Rot-Anteils */ protected float $red; - /** @var float : Definition des Grünanteil */ + /** @var float : Definition des Grün-Anteils */ protected float $green; - /** @var float : Definition des Blauanteil */ + /** @var float : Definition des Blau-Anteils */ protected float $blu; /** @var float : Der größte RGB-Farbwert */ @@ -26,7 +26,7 @@ class RedGreenBlueToHueSaturationValue protected float $minRgbProperty; // Daten für HSV - /** @var float : Definition des Farbton als Anteil eines Vollkreises '$Hue * π' */ + /** @var float : Definition des Farbtones als Anteil eines Vollkreises '$Hue * π' */ protected float $hue = 0.0; /** @var float : Definition der Sättigung der Farbe */ protected float $saturation = 0.0; @@ -75,7 +75,7 @@ class RedGreenBlueToHueSaturationValue protected function buildHueAmount(): float { // Wenn beide Werte gleich sind, ist die Endfarbe Grau. - // Damit wird auch in {@sse hueAmount()} eine Division durch Null verhindert. + // Damit wird auch in {@sse hueAmount()} eine Division durch '0' verhindert. if ($this->maxRgbProperty === $this->minRgbProperty) { return 0.0; } diff --git a/tests/_support/Helper/ValidColorValuesProvider.php b/tests/_support/Helper/ValidColorValuesProvider.php index 58680d7..4ebf5da 100644 --- a/tests/_support/Helper/ValidColorValuesProvider.php +++ b/tests/_support/Helper/ValidColorValuesProvider.php @@ -12,7 +12,7 @@ class ValidColorValuesProvider const HSV = 'hsv'; /** - * @var array[]> + * @var array>> */ protected array $definitions = [ 'weiß' => [ @@ -308,7 +308,7 @@ class ValidColorValuesProvider /** * @param array $order * - * @return array[]> + * @return array>> */ public function getValidColorValues(array $order): array { diff --git a/tests/_support/Helper/ValidNaturallyColorValuesProvider.php b/tests/_support/Helper/ValidNaturallyColorValuesProvider.php index 8fc9bb6..ef58a5e 100644 --- a/tests/_support/Helper/ValidNaturallyColorValuesProvider.php +++ b/tests/_support/Helper/ValidNaturallyColorValuesProvider.php @@ -12,7 +12,7 @@ class ValidNaturallyColorValuesProvider const HSV = 'hsv'; /** - * @var array[]> + * @var array>> */ protected array $definitions = [ 'weiß' => [ @@ -111,7 +111,7 @@ class ValidNaturallyColorValuesProvider * @param string $pure_color * @param string $test_color * - * @return array[]> + * @return array>> */ public function getValidColorValues(string $pure_color, string $test_color): array { diff --git a/tests/unit/NaturallyTransformer/CyanMagentaYellowKeyTransformerTest.php b/tests/unit/NaturallyTransformer/CyanMagentaYellowKeyTransformerTest.php index 835b1db..a4192de 100644 --- a/tests/unit/NaturallyTransformer/CyanMagentaYellowKeyTransformerTest.php +++ b/tests/unit/NaturallyTransformer/CyanMagentaYellowKeyTransformerTest.php @@ -14,7 +14,7 @@ class CyanMagentaYellowKeyTransformerTest extends Unit protected CyanMagentaYellowKey $color; /** - * @return array[]> + * @return array>> */ public function validRgbValuesProvider(): array { @@ -25,7 +25,7 @@ class CyanMagentaYellowKeyTransformerTest extends Unit } /** - * @return array[]> + * @return array>> */ public function validHsvValuesProvider(): array { @@ -36,7 +36,7 @@ class CyanMagentaYellowKeyTransformerTest extends Unit } /** - * @return array[]> + * @return array>> */ public function validCmykValuesProvider(): array { diff --git a/tests/unit/NaturallyTransformer/HueSaturationValueTransformerTest.php b/tests/unit/NaturallyTransformer/HueSaturationValueTransformerTest.php index b30a793..2a6c663 100644 --- a/tests/unit/NaturallyTransformer/HueSaturationValueTransformerTest.php +++ b/tests/unit/NaturallyTransformer/HueSaturationValueTransformerTest.php @@ -14,7 +14,7 @@ class HueSaturationValueTransformerTest extends Unit protected HueSaturationValue $color; /** - * @return array[]> + * @return array>> */ public function validCmykValuesProvider(): array { @@ -25,7 +25,7 @@ class HueSaturationValueTransformerTest extends Unit } /** - * @return array[]> + * @return array>> */ public function validRgbValuesProvider(): array { @@ -36,7 +36,7 @@ class HueSaturationValueTransformerTest extends Unit } /** - * @return array[]> + * @return array>> */ public function validHsvValuesProvider(): array { diff --git a/tests/unit/NaturallyTransformer/RedGreenBlueTransformerTest.php b/tests/unit/NaturallyTransformer/RedGreenBlueTransformerTest.php index 15f8e9f..2a046e1 100644 --- a/tests/unit/NaturallyTransformer/RedGreenBlueTransformerTest.php +++ b/tests/unit/NaturallyTransformer/RedGreenBlueTransformerTest.php @@ -14,7 +14,7 @@ class RedGreenBlueTransformerTest extends Unit protected RedGreenBlue $color; /** - * @return array[]> + * @return array>> */ public function validCmykValuesProvider(): array { @@ -25,7 +25,7 @@ class RedGreenBlueTransformerTest extends Unit } /** - * @return array[]> + * @return array>> */ public function validHsvValuesProvider(): array { @@ -36,7 +36,7 @@ class RedGreenBlueTransformerTest extends Unit } /** - * @return array[]> + * @return array>> */ public function validRgbValuesProvider(): array { diff --git a/tests/unit/Transformer/CyanMagentaYellowKeyTransformerTest.php b/tests/unit/Transformer/CyanMagentaYellowKeyTransformerTest.php index 26a00db..4f27f2f 100644 --- a/tests/unit/Transformer/CyanMagentaYellowKeyTransformerTest.php +++ b/tests/unit/Transformer/CyanMagentaYellowKeyTransformerTest.php @@ -16,7 +16,7 @@ class CyanMagentaYellowKeyTransformerTest extends Unit protected CyanMagentaYellowKey $color; /** - * @return array[]> + * @return array>> */ public function validRgbValuesProvider(): array { @@ -27,7 +27,7 @@ class CyanMagentaYellowKeyTransformerTest extends Unit } /** - * @return array[]> + * @return array>> */ public function validHsvValuesProvider(): array { diff --git a/tests/unit/Transformer/HueSaturationValueTransformerTest.php b/tests/unit/Transformer/HueSaturationValueTransformerTest.php index 4f2633a..fc3a40b 100644 --- a/tests/unit/Transformer/HueSaturationValueTransformerTest.php +++ b/tests/unit/Transformer/HueSaturationValueTransformerTest.php @@ -16,7 +16,7 @@ class HueSaturationValueTransformerTest extends Unit protected HueSaturationValue $color; /** - * @return array[]> + * @return array>> */ public function validCmykValuesProvider(): array { @@ -27,7 +27,7 @@ class HueSaturationValueTransformerTest extends Unit } /** - * @return array[]> + * @return array>> */ public function validRgbValuesProvider(): array { diff --git a/tests/unit/Transformer/RedGreenBlueTransformerTest.php b/tests/unit/Transformer/RedGreenBlueTransformerTest.php index b42b4cd..cf11e56 100644 --- a/tests/unit/Transformer/RedGreenBlueTransformerTest.php +++ b/tests/unit/Transformer/RedGreenBlueTransformerTest.php @@ -16,7 +16,7 @@ class RedGreenBlueTransformerTest extends Unit protected RedGreenBlue $color; /** - * @return array[]> + * @return array>> */ public function validCmykValuesProvider(): array { @@ -27,7 +27,7 @@ class RedGreenBlueTransformerTest extends Unit } /** - * @return array[]> + * @return array>> */ public function validHsvValuesProvider(): array {