add global options for a method help info

Author: inhere

src/Base/AbstractApplication.php

@@ -112,6 +112,14 @@ protected function init()
         set_exception_handler([$this, 'handleException']);
     }
 
+    /**
+     * @return array
+     */
+    public static function getInternalOptions(): array
+    {
+        return self::$internalOptions;
+    }
+
     /**********************************************************
      * app run
      **********************************************************/

src/Base/AbstractCommand.php

@@ -15,6 +15,7 @@
 use Inhere\Console\Traits\InputOutputAwareTrait;
 use Inhere\Console\Traits\UserInteractAwareTrait;
 use Inhere\Console\Utils\Annotation;
+use Inhere\Console\Utils\FormatUtil;
 
 /**
  * Class AbstractCommand
@@ -413,7 +414,7 @@ protected function showHelpByMethodAnnotations($method, $action = null, array $a
         $help = [];
 
         if ($aliases) {
-            $help[] = sprintf("<comment>Alias Name:</comment> %s\n", implode(',', $aliases));
+            $help['Alias Name:'] = implode(',', $aliases);
         }
 
         foreach (array_keys(self::$annotationTags) as $tag) {
@@ -429,10 +430,21 @@ protected function showHelpByMethodAnnotations($method, $action = null, array $a
                 $msg = self::getDescription();
             }
 
-            $help[] = "<comment>$tag:</comment>\n $msg\n";
+            $help[$tag . ':'] = $msg;
         }
 
-        $this->output->write(implode("\n", $help), false);
+        if (isset($help['Description:'])) {
+            $description = $help['Description:'] ?: 'No description message for the command';
+            $this->write(ucfirst($description) . PHP_EOL);
+            unset($help['Description:']);
+        }
+
+        $help['Global Options:'] = FormatUtil::alignmentOptions(Application::getInternalOptions());
+
+        $this->output->mList($help, [
+            'sepChar' => '  ',
+            'lastNewline' => 0,
+        ]);
 
         return 0;
     }
@@ -525,17 +537,17 @@ public function getAnnotationVars(): array
     }
 
     /**
-     * @return ApplicationInterface
+     * @return AbstractApplication
      */
-    public function getApp(): ApplicationInterface
+    public function getApp(): AbstractApplication
     {
         return $this->app;
     }
 
     /**
-     * @param ApplicationInterface $app
+     * @param AbstractApplication $app
      */
-    public function setApp(ApplicationInterface $app)
+    public function setApp(AbstractApplication $app)
     {
         $this->app = $app;
     }

src/Base/BaseCommandInterface.php

@@ -29,9 +29,9 @@ public function run($command = '');
     public function getDefinition();
 
     /**
-     * @return ApplicationInterface
+     * @return AbstractApplication
      */
-    public function getApp(): ApplicationInterface;
+    public function getApp(): AbstractApplication;
 
     /**
      * @return string

src/Controller.php

@@ -220,9 +220,7 @@ final public function showCommandList()
         $this->output->mList([
             'Usage:' => $usage,
             //'Group Name:' => "<info>$sName</info>",
-            'Options:' => [
-                '-h, --help' => 'Show help of the command group or specified command action',
-            ],
+            'Options:' => FormatUtil::alignmentOptions(Application::getInternalOptions()),
             'Commands:' => $commands,
         ], [
             'sepChar' => '  ',

src/Utils/Show.php

@@ -439,8 +439,8 @@ public static function multiList(array $data, array $opts = [])
     public static function mList(array $data, array $opts = [])
     {
         $buffer = [];
-        $ignoreEmpty = $opts['ignoreEmpty'] ?? true;
         $opts['returned'] = true;
+        $ignoreEmpty = $opts['ignoreEmpty'] ?? true;
 
         foreach ($data as $title => $list) {
             if ($ignoreEmpty && !$list) {
@@ -450,7 +450,7 @@ public static function mList(array $data, array $opts = [])
             $buffer[] = self::aList($list, $title, $opts);
         }
 
-        self::write(implode("\n", $buffer));
+        self::write(implode("\n", $buffer), $opts['lastNewline'] ?? true);
     }
 
     /**