feature #39976 [Console] Add bright colors to console. (CupOfTea696)

jderusse · jderusse · commit 0f4c905b8cbe · 2021-01-28T23:09:26.000+01:00
This PR was squashed before being merged into the 5.3-dev branch. Discussion ---------- [Console] Add bright colors to console. | Q | A | ------------- | --- | Branch? | 5.x  | Bug fix? |no | New feature? | yes  | Deprecations? |no  | Tickets | Fix #39869  | License | MIT | Doc PR | symfony/symfony-docs#14884  Add the "bright" ANSI colours to symfony/console. This adds ANSI escape codes 90-97 and 100-107.  Commits ------- dbb9452 [Console] Add bright colors to console.
diff --git a/src/Symfony/Component/Console/CHANGELOG.md b/src/Symfony/Component/Console/CHANGELOG.md
@@ -9,6 +9,7 @@ CHANGELOG
  * Add the `Command::$defaultDescription` static property and the `description` attribute
    on the `console.command` tag to allow the `list` command to instantiate commands lazily
  * Add option `--short` to the `list` command
+ * Add support for bright colors
 
 5.2.0
 -----
diff --git a/src/Symfony/Component/Console/Color.php b/src/Symfony/Component/Console/Color.php
@@ -30,6 +30,17 @@ final class Color
         'default' => 9,
     ];
 
+    private const BRIGHT_COLORS = [
+        'gray' => 0,
+        'bright-red' => 1,
+        'bright-green' => 2,
+        'bright-yellow' => 3,
+        'bright-blue' => 4,
+        'bright-magenta' => 5,
+        'bright-cyan' => 6,
+        'bright-white' => 7,
+    ];
+
     private const AVAILABLE_OPTIONS = [
         'bold' => ['set' => 1, 'unset' => 22],
         'underscore' => ['set' => 4, 'unset' => 24],
@@ -45,7 +56,7 @@ final class Color
     public function __construct(string $foreground = '', string $background = '', array $options = [])
     {
         $this->foreground = $this->parseColor($foreground);
-        $this->background = $this->parseColor($background);
+        $this->background = $this->parseColor($background, true);
 
         foreach ($options as $option) {
             if (!isset(self::AVAILABLE_OPTIONS[$option])) {
@@ -65,10 +76,10 @@ public function set(): string
     {
         $setCodes = [];
         if ('' !== $this->foreground) {
-            $setCodes[] = '3'.$this->foreground;
+            $setCodes[] = $this->foreground;
         }
         if ('' !== $this->background) {
-            $setCodes[] = '4'.$this->background;
+            $setCodes[] = $this->background;
         }
         foreach ($this->options as $option) {
             $setCodes[] = $option['set'];
@@ -99,7 +110,7 @@ public function unset(): string
         return sprintf("\033[%sm", implode(';', $unsetCodes));
     }
 
-    private function parseColor(string $color): string
+    private function parseColor(string $color, bool $background = false): string
     {
         if ('' === $color) {
             return '';
@@ -116,14 +127,18 @@ private function parseColor(string $color): string
                 throw new InvalidArgumentException(sprintf('Invalid "%s" color.', $color));
             }
 
-            return $this->convertHexColorToAnsi(hexdec($color));
+            return ($background ? '4' : '3').$this->convertHexColorToAnsi(hexdec($color));
+        }
+
+        if (isset(self::COLORS[$color])) {
+            return ($background ? '4' : '3').self::COLORS[$color];
         }
 
-        if (!isset(self::COLORS[$color])) {
-            throw new InvalidArgumentException(sprintf('Invalid "%s" color; expected one of (%s).', $color, implode(', ', array_keys(self::COLORS))));
+        if (isset(self::BRIGHT_COLORS[$color])) {
+            return ($background ? '10' : '9').self::BRIGHT_COLORS[$color];
         }
 
-        return (string) self::COLORS[$color];
+        throw new InvalidArgumentException(sprintf('Invalid "%s" color; expected one of (%s).', $color, implode(', ', array_merge(array_keys(self::COLORS), array_keys(self::BRIGHT_COLORS)))));
     }
 
     private function convertHexColorToAnsi(int $color): string
diff --git a/src/Symfony/Component/Console/Tests/ColorTest.php b/src/Symfony/Component/Console/Tests/ColorTest.php
@@ -24,6 +24,9 @@ public function testAnsiColors()
         $color = new Color('red', 'yellow');
         $this->assertSame("\033[31;43m \033[39;49m", $color->apply(' '));
 
+        $color = new Color('bright-red', 'bright-yellow');
+        $this->assertSame("\033[91;103m \033[39;49m", $color->apply(' '));
+
         $color = new Color('red', 'yellow', ['underscore']);
         $this->assertSame("\033[31;43;4m \033[39;49;24m", $color->apply(' '));
     }

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,9 @@ public function testAnsiColors()`
`24`	`24`	`$color = new Color('red', 'yellow');`
`25`	`25`	`$this->assertSame("\033[31;43m \033[39;49m", $color->apply(' '));`
`26`	`26`
	`27`	`+ $color = new Color('bright-red', 'bright-yellow');`
	`28`	`+ $this->assertSame("\033[91;103m \033[39;49m", $color->apply(' '));`
	`29`	`+`
`27`	`30`	`$color = new Color('red', 'yellow', ['underscore']);`
`28`	`31`	`$this->assertSame("\033[31;43;4m \033[39;49;24m", $color->apply(' '));`
`29`	`32`	`}`