fix: command help vars not replace as value

Author: inhere

src/Component/Formatter/MultiList.php

@@ -17,7 +17,7 @@ class MultiList extends MessageFormatter
      * Format and render multi list
      *
      * ```php
-     * [
+     * $data = [
      *   'list1 title' => [
      *      'name' => 'value text',
      *      'name2' => 'value text 2',
@@ -27,11 +27,15 @@ class MultiList extends MessageFormatter
      *      'name2' => 'value text 2',
      *   ],
      *   ... ...
-     * ]
+     * ];
+     *
+     * MultiList::show($data);
      * ```
      *
      * @param array $data
      * @param array $opts
+     *
+     * @psalm-param array{beforeWrite: callable, lastNewline: bool} $opts
      */
     public static function show(array $data, array $opts = []): void
     {
@@ -45,6 +49,12 @@ public static function show(array $data, array $opts = []): void
             unset($opts['lastNewline']);
         }
 
+        $beforeWrite = null;
+        if (isset($opts['beforeWrite'])) {
+            $beforeWrite = $opts['beforeWrite'];
+            unset($opts['beforeWrite']);
+        }
+
         foreach ($data as $title => $list) {
             if ($ignoreEmpty && !$list) {
                 continue;
@@ -53,6 +63,13 @@ public static function show(array $data, array $opts = []): void
             $stringList[] = SingleList::show($list, (string)$title, $opts);
         }
 
-        Console::write(implode("\n", $stringList), $lastNewline);
+        $str = implode("\n", $stringList);
+
+        // before write handler
+        if ($beforeWrite) {
+            $str = $beforeWrite($str);
+        }
+
+        Console::write($str, $lastNewline);
     }
 }

src/Component/Formatter/Section.php

@@ -68,11 +68,11 @@ public static function show(string $title, $body, array $opts = []): void
             $border = Str::pad($char, $width, $char);
 
             if ($showTBorder) {
-                $topBorder = "{$indentStr}$border\n";
+                $topBorder = "$indentStr$border\n";
             }
 
             if ($showBBorder) {
-                $bottomBorder = "{$indentStr}$border\n";
+                $bottomBorder = "$indentStr$border\n";
             }
         }
 

src/Component/MessageFormatter.php

@@ -32,6 +32,11 @@ abstract class MessageFormatter implements FormatterInterface
      */
     protected $config = [];
 
+    /**
+     * @var callable
+     */
+    protected $beforeWrite;
+
     /**
      * @param array $config
      *
@@ -105,4 +110,20 @@ public function getConfig(): array
     {
         return $this->config;
     }
+
+    /**
+     * @return callable
+     */
+    public function getBeforeWrite(): callable
+    {
+        return $this->beforeWrite;
+    }
+
+    /**
+     * @param callable $beforeWrite
+     */
+    public function setBeforeWrite(callable $beforeWrite): void
+    {
+        $this->beforeWrite = $beforeWrite;
+    }
 }

src/Concern/CommandHelpTrait.php

@@ -158,6 +158,7 @@ public function showHelpByFlagsParser(FlagsParser $fs, array $aliases = [], stri
         $this->output->mList($help, [
             'sepChar'     => '    ',
             'lastNewline' => false,
+            'beforeWrite' => [$this, 'parseCommentsVars'],
         ]);
 
         return 0;

src/Util/FormatUtil.php

@@ -94,20 +94,20 @@ public static function applyIndent(string $string, int $indent = 2, string $inde
      *     amet.
      * ```
      *
-     * @param string  $text   the text to be wrapped
+     * @param string $text   the text to be wrapped
      * @param integer $indent number of spaces to use for indentation.
      * @param integer $width
      *
      * @return string the wrapped text.
      * @from yii2
      */
-    public static function wrapText($text, $indent = 0, $width = 0): string
+    public static function wrapText(string $text, int $indent = 0, int $width = 0): string
     {
         if (!$text) {
             return $text;
         }
 
-        if ((int)$width <= 0) {
+        if ($width <= 0) {
             $size = Sys::getScreenSize();
 
             if ($size === false || $size[0] <= $indent) {
@@ -156,8 +156,8 @@ public static function alignOptions(array $options): array
                 continue;
             }
 
+            // padding length equals to '-h, '
             if (!strpos($name, ',')) {
-                // padding length equals to '-h, '
                 $name = '    ' . $name;
             } else {
                 $name = str_replace([' ', ','], ['', ', '], $name);