update some

Author: inhere

src/Component/Style/Style.php

@@ -11,6 +11,7 @@
 namespace Inhere\Console\Component\Style;
 
 use Toolkit\Cli\Cli;
+use Toolkit\Cli\ColorTag;
 
 /**
  * Class Style
@@ -49,11 +50,6 @@ class Style
      */
     public const COLOR_TAG = '/<([a-zA-Z=;]+)>(.*?)<\/\\1>/s';
 
-    /**
-     * Regex used for removing color codes
-     */
-    public const STRIP_TAG = '/<[\/]?[a-zA-Z=;]+>/';
-
     /**
      * @var self
      */
@@ -147,20 +143,30 @@ protected function loadDefaultStyles(): void
     /**
      * Process a string use style
      * @param string $style
-     * @param        $text
+     * @param string $text
      * @return string
      */
-    public function apply(string $style, $text): string
+    public function apply(string $style, string $text): string
     {
         return $this->format(self::wrap($text, $style));
     }
 
     /**
      * Process a string.
-     * @param $text
+     * @param string $text
+     * @return mixed
+     */
+    public function t(string $text)
+    {
+        return $this->format($text);
+    }
+
+    /**
+     * Process a string.
+     * @param string $text
      * @return mixed
      */
-    public function render($text)
+    public function render(string $text)
     {
         return $this->format($text);
     }
@@ -177,10 +183,10 @@ public function format(string $text)
 
         // if don't support output color text, clear color tag.
         if (!Cli::isSupportColor() || self::isNoColor()) {
-            return static::stripColor($text);
+            return self::stripColor($text);
         }
 
-        if (!\preg_match_all(self::COLOR_TAG, $text, $matches)) {
+        if (!$matches = ColorTag::matchAll($text)) {
             return $text;
         }
 
@@ -222,8 +228,7 @@ protected function replaceColor($text, $tag, $match, $style): string
      */
     public static function stripColor(string $string)
     {
-        // $text = strip_tags($text);
-        return \preg_replace(self::STRIP_TAG, '', $string);
+        return ColorTag::strip($string);
     }
 
     /****************************************************************************

src/IO/Output.php

@@ -108,7 +108,7 @@ public function read($question = null, $nl = false): string
             $this->write($question, $nl);
         }
 
-        return trim(fgets(\STDIN));
+        return \trim(\fgets(\STDIN));
     }
 
     /**
@@ -121,7 +121,7 @@ public function stderr($text = '', $nl = true): self
     {
         $text = $this->getStyle()->format($text);
 
-        fwrite($this->errorStream, $text . ($nl ? "\n" : null));
+        \fwrite($this->errorStream, $text . ($nl ? "\n" : null));
 
         return $this;
     }

src/Traits/FormatOutputAwareTrait.php

@@ -78,6 +78,16 @@ public function writeRaw($text, $nl = true, $quit = false, array $opts = []): in
         return Show::writeRaw($text, $nl, $quit, $opts);
     }
 
+    /**
+     * @param string $text
+     * @param string $tag
+     * @return int
+     */
+    public function colored(string $text, string $tag = 'info'): int
+    {
+        return $this->writeln(\sprintf('<%s>%s</%s>', $tag, $text, $tag));
+    }
+
     /**
      * @inheritdoc
      * @see Show::block()