update some logic for group options

Author: inhere

examples/Controller/HomeController.php

@@ -47,6 +47,16 @@ protected function init(): void
         $this->addCommentsVar('internalFonts', implode(',', ArtFont::getInternalFonts()));
     }
 
+    /**
+     * @return array
+     */
+    protected function groupOptions(): array
+    {
+        return [
+            '-c, --common' => 'This is a common option for all sub-commands',
+        ];
+    }
+
     protected function disabledCommands(): array
     {
         return ['disabled'];

examples/Controller/ShowController.php

@@ -39,11 +39,11 @@ public static function commandAliases(): array
     /**
      * @return array
      */
-    protected function commonOptions(): array
+    protected function groupOptions(): array
     {
-        return \array_merge(parent::commonOptions(), [
-            '-c, --command' => 'This is a common option for all sub-commands',
-        ]);
+        return [
+            '-c, --common' => 'This is a common option for all sub-commands',
+        ];
     }
 
     /**

src/AbstractApplication.php

@@ -62,6 +62,7 @@ abstract class AbstractApplication implements ApplicationInterface
         'publishAt'    => '2017.03.24',
         'updateAt'     => '2019.01.01',
         'rootPath'     => '',
+        'strictMode'   => false,
         'hideRootPath' => true,
 
         // 'timeZone' => 'Asia/Shanghai',
@@ -481,7 +482,7 @@ public function getConfig(): array
     }
 
     /**
-     * get config param value
+     * Get config param value
      * @param null|string $name
      * @param null|string $default
      * @return array|string
@@ -491,6 +492,14 @@ public function getParam(string $name, $default = null)
         return $this->config[$name] ?? $default;
     }
 
+    /**
+     * @return bool
+     */
+    public function isStrictMode(): bool
+    {
+        return (bool)$this->config['strictMode'];
+    }
+
     /**
      * get current debug level value
      * @return int

src/AbstractHandler.php

@@ -64,9 +64,6 @@ abstract class AbstractHandler implements CommandHandlerInterface
     /** @var Application */
     protected $app;
 
-    /** @var array common options for all sub-commands */
-    private $commonOptions;
-
     /** @var InputDefinition|null */
     private $definition;
 
@@ -110,7 +107,6 @@ public function __construct(Input $input, Output $output, InputDefinition $defin
             $this->definition = $definition;
         }
 
-        $this->commonOptions = $this->commonOptions();
         $this->commentsVars  = $this->annotationVars();
 
         $this->init();
@@ -142,17 +138,6 @@ protected function createDefinition(): InputDefinition
         return $this->definition;
     }
 
-    /**
-     * you can set common options for all sub-commands
-     * @return array
-     */
-    protected function commonOptions(): array
-    {
-        return [
-            '--skip-invalid' => 'Whether ignore invalid arguments and options, when use input definition',
-        ];
-    }
-
     /**
      * Provides parsable substitution variables for command annotations. Can be used in comments in commands
      * 为命令注解提供可解析的替换变量. 可以在命令的注释中使用
@@ -574,9 +559,11 @@ protected function showHelpByMethodAnnotations(string $method, string $action =
             unset($help['Description:']);
         }
 
-        $help['Global Options:'] = FormatUtil::alignOptions(
-            \array_merge(Application::getGlobalOptions(), $this->commonOptions)
-        );
+        $help['Group Options:'] = null;
+        $help['Global Options:'] = FormatUtil::alignOptions(Application::getGlobalOptions());
+
+        $this->beforeRenderCommandHelp($help);
+
         $this->output->mList($help, [
             'sepChar'     => '  ',
             'lastNewline' => 0,
@@ -585,6 +572,10 @@ protected function showHelpByMethodAnnotations(string $method, string $action =
         return 0;
     }
 
+    protected function beforeRenderCommandHelp(array &$help): void
+    {
+    }
+
     /**************************************************************************
      * getter/setter methods
      **************************************************************************/
@@ -707,14 +698,6 @@ public function setDefinition(InputDefinition $definition): void
         $this->definition = $definition;
     }
 
-    /**
-     * @return array
-     */
-    public function getCommonOptions(): array
-    {
-        return $this->commonOptions;
-    }
-
     /**
      * @return array
      */

src/Command.php

@@ -52,6 +52,7 @@ abstract class Command extends AbstractHandler implements CommandInterface
      */
     protected function showHelp(): bool
     {
+        // help info has been build by input definition.
         if (true === parent::showHelp()) {
             return true;
         }

src/Controller.php

@@ -49,8 +49,11 @@ abstract class Controller extends AbstractHandler implements ControllerInterface
     /** @var string */
     protected $notFoundCallback = 'notFound';
 
+    /** @var array Common options for all sub-commands in the group */
+    private $groupOptions = [];
+
     /** @var array From disabledCommands() */
-    protected $disabledCommands = [];
+    private $disabledCommands = [];
 
     /**
      * define command alias map
@@ -70,12 +73,26 @@ protected function init(): void
         // save to property
         $this->disabledCommands = $list ? \array_flip($list) : [];
         self::$commandAliases   = static::commandAliases();
+        $this->groupOptions = $this->groupOptions();
 
         if (!$this->actionSuffix) {
             $this->actionSuffix = 'Command';
         }
     }
 
+    /**
+     * Options for the group all commands.
+     * you can set common options for all sub-commands
+     *
+     * @return array
+     */
+    protected function groupOptions(): array
+    {
+        return [
+            // '--skip-invalid' => 'Whether ignore invalid arguments and options, when use input definition',
+        ];
+    }
+
     /**
      * define disabled command list.
      * @return array
@@ -184,13 +201,27 @@ final public function execute($input, $output)
      */
     protected function showHelp(): bool
     {
+        // help info has been build by input definition.
         if (true === parent::showHelp()) {
             return true;
         }
 
         return $this->helpCommand();
     }
 
+    protected function beforeRenderCommandHelp(array &$help): void
+    {
+        $help['Group Options:'] = FormatUtil::alignOptions($this->groupOptions);
+    }
+
+    /**
+     * @return array
+     */
+    public function getGroupOptions(): array
+    {
+        return $this->groupOptions;
+    }
+
     /**
      * Show help of the controller command group or specified command action
      * @usage <info>{name}:[command] -h</info> OR <info>{command} [command]</info> OR <info>{name} [command] -h</info>