minor #50317 [Console] Remove redundant method getSaturation() (ivanpepelko)

fabpot · fabpot · commit df086facdeb4 · 2023-05-15T10:49:37.000+02:00
This PR was submitted for the 6.2 branch but it was merged into the 6.3 branch instead. Discussion ---------- [Console] Remove redundant method getSaturation() | Q | A | ------------- | --- | Branch? | 6.2 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | none | License | MIT | Doc PR | none 1. in `getSaturation()`, `$diff` is compared against `int` zero. This will only yield `true` when RGB values contain min/max color value (`0` or `255`). It will be always `false` for floats. 2. in `degradeHexColorToAnsi4()` value returned from `getSaturation()` is `round`ed, which returns float, thus making comparison to `int` zero useless. 3. in the same method, bitwise operations (final `return` statement) will convert number to `int` anyway, so the explicit cast was removed In conclusion, `getSaturation` is redundant. Tests are expanded to show that even in min/max cases everything works fine. Commits ------- 38021b5 [Console] Remove redundant method getSaturation()
diff --git a/src/Symfony/Component/Console/Output/AnsiColorMode.php b/src/Symfony/Component/Console/Output/AnsiColorMode.php
@@ -78,25 +78,7 @@ private function convertFromRGB(int $r, int $g, int $b): int
 
     private function degradeHexColorToAnsi4(int $r, int $g, int $b): int
     {
-        if (0 === round($this->getSaturation($r, $g, $b) / 50)) {
-            return 0;
-        }
-
-        return (int) ((round($b / 255) << 2) | (round($g / 255) << 1) | round($r / 255));
-    }
-
-    private function getSaturation(int $r, int $g, int $b): int
-    {
-        $r = $r / 255;
-        $g = $g / 255;
-        $b = $b / 255;
-        $v = max($r, $g, $b);
-
-        if (0 === $diff = $v - min($r, $g, $b)) {
-            return 0;
-        }
-
-        return (int) ((int) $diff * 100 / $v);
+        return round($b / 255) << 2 | (round($g / 255) << 1) | round($r / 255);
     }
 
     /**
diff --git a/src/Symfony/Component/Console/Tests/Output/AnsiColorModeTest.php b/src/Symfony/Component/Console/Tests/Output/AnsiColorModeTest.php
@@ -64,6 +64,16 @@ public static function provideColorsConversion(): \Generator
             AnsiColorMode::Ansi8->name => 248,
             AnsiColorMode::Ansi4->name => 7,
         ]];
+
+        yield ['#000000', [
+            AnsiColorMode::Ansi8->name => 16,
+            AnsiColorMode::Ansi4->name => 0,
+        ]];
+
+        yield ['#ffffff', [
+            AnsiColorMode::Ansi8->name => 231,
+            AnsiColorMode::Ansi4->name => 7,
+        ]];
     }
 
     public function testColorsConversionWithoutSharp()
