upsome

Author: inhere

src/Color.php

@@ -46,7 +46,7 @@
  */
 class Color
 {
-    public const RESET  = 0;
+    public const RESET = 0;
 
     public const NORMAL = 0;
 
@@ -63,87 +63,87 @@ class Color
     public const BG_EXTRA = 100;
 
     // Foreground color
-    public const FG_BLACK   = 30;
+    public const FG_BLACK = 30;
 
-    public const FG_RED     = 31;
+    public const FG_RED = 31;
 
-    public const FG_GREEN   = 32;
+    public const FG_GREEN = 32;
 
-    public const FG_BROWN   = 33; // like yellow
+    public const FG_BROWN = 33; // like yellow
 
-    public const FG_BLUE    = 34;
+    public const FG_BLUE = 34;
 
-    public const FG_CYAN    = 36;
+    public const FG_CYAN = 36;
 
-    public const FG_WHITE   = 37;
+    public const FG_WHITE = 37;
 
     public const FG_DEFAULT = 39;
 
     // extra Foreground color
-    public const FG_DARK_GRAY     = 90;
+    public const FG_DARK_GRAY = 90;
 
-    public const FG_LIGHT_RED     = 91;
+    public const FG_LIGHT_RED = 91;
 
-    public const FG_LIGHT_GREEN   = 92;
+    public const FG_LIGHT_GREEN = 92;
 
-    public const FG_LIGHT_YELLOW  = 93;
+    public const FG_LIGHT_YELLOW = 93;
 
-    public const FG_LIGHT_BLUE    = 94;
+    public const FG_LIGHT_BLUE = 94;
 
     public const FG_LIGHT_MAGENTA = 95;
 
-    public const FG_LIGHT_CYAN    = 96;
+    public const FG_LIGHT_CYAN = 96;
 
-    public const FG_LIGHT_WHITE   = 97;
+    public const FG_LIGHT_WHITE = 97;
 
     // Background color
-    public const BG_BLACK   = 40;
+    public const BG_BLACK = 40;
 
-    public const BG_RED     = 41;
+    public const BG_RED = 41;
 
-    public const BG_GREEN   = 42;
+    public const BG_GREEN = 42;
 
-    public const BG_BROWN   = 43; // like yellow
+    public const BG_BROWN = 43; // like yellow
 
-    public const BG_BLUE    = 44;
+    public const BG_BLUE = 44;
 
-    public const BG_CYAN    = 46;
+    public const BG_CYAN = 46;
 
-    public const BG_WHITE   = 47;
+    public const BG_WHITE = 47;
 
     public const BG_DEFAULT = 49;
 
     // extra Background color
-    public const BG_DARK_GRAY     = 100;
+    public const BG_DARK_GRAY = 100;
 
-    public const BG_LIGHT_RED     = 101;
+    public const BG_LIGHT_RED = 101;
 
-    public const BG_LIGHT_GREEN   = 102;
+    public const BG_LIGHT_GREEN = 102;
 
-    public const BG_LIGHT_YELLOW  = 103;
+    public const BG_LIGHT_YELLOW = 103;
 
-    public const BG_LIGHT_BLUE    = 104;
+    public const BG_LIGHT_BLUE = 104;
 
     public const BG_LIGHT_MAGENTA = 105;
 
-    public const BG_LIGHT_CYAN    = 106;
+    public const BG_LIGHT_CYAN = 106;
 
-    public const BG_WHITE_W       = 107;
+    public const BG_WHITE_W = 107;
 
     // color option
-    public const BOLD       = 1;      // 加粗
+    public const BOLD = 1;      // 加粗
 
-    public const FUZZY      = 2;      // 模糊(不是所有的终端仿真器都支持)
+    public const FUZZY = 2;      // 模糊(不是所有的终端仿真器都支持)
 
-    public const ITALIC     = 3;      // 斜体(不是所有的终端仿真器都支持)
+    public const ITALIC = 3;      // 斜体(不是所有的终端仿真器都支持)
 
     public const UNDERSCORE = 4;      // 下划线
 
-    public const BLINK      = 5;      // 闪烁
+    public const BLINK = 5;      // 闪烁
 
-    public const REVERSE    = 7;      // 颠倒的 交换背景色与前景色
+    public const REVERSE = 7;      // 颠倒的 交换背景色与前景色
 
-    public const CONCEALED  = 8;      // 隐匿的
+    public const CONCEALED = 8;      // 隐匿的
 
     /**
      * There are some internal styles
@@ -155,15 +155,19 @@ class Color
         // basic
         'normal'      => '39',// no color
         'red'         => '0;31',
+        'red1'        => '1;31',
         'blue'        => '0;34',
         'cyan'        => '0;36',
+        'cyan1'       => '1;36',
         'black'       => '0;30',
         'green'       => '0;32',
+        'green1'      => '1;32',
         'brown'       => '0;33',
+        'brown1'      => '1;33',
         'white'       => '1;37',
         'ylw0'        => '0;33',
-        'yellow0'     => '0;33',
         'ylw'         => '1;33',
+        'yellow0'     => '0;33',
         'yellow'      => '1;33',
         'mga0'        => '0;35',
         'magenta0'    => '0;35',
@@ -340,11 +344,11 @@ public static function render(string $text, $style = null): string
         if (is_string($style)) {
             $color = self::STYLES[$style] ?? '';
 
-        // custom style: [self::FG_GREEN, self::BG_WHITE, self::UNDERSCORE]
+            // custom style: [self::FG_GREEN, self::BG_WHITE, self::UNDERSCORE]
         } elseif (is_array($style)) {
             $color = implode(';', $style);
 
-        // user color tag: <info>message</info>
+            // user color tag: <info>message</info>
         } elseif (strpos($text, '</') > 0) {
             return self::parseTag($text);
         }

test/ColorTest.php

@@ -26,6 +26,12 @@ public function testRender(): void
             return;
         }
 
+        $this->assertTrue(Color::isShouldRenderColor());
+
+        Color::println('text', '');
+        $text = Color::render('text', '');
+        $this->assertSame("text", $text);
+
         $text = Color::render('text', 'info');
         $this->assertStringContainsString(Color::STYLES['info'], $text);