up: update group command help render

Author: inhere

examples/Controller/HomeController.php

@@ -36,6 +36,11 @@ class HomeController extends Controller
 
  protected static string $description = 'This is a demo command controller. there are some command usage examples(2)';
 
+ public static function aliases(): array
+ {
+ return ['h'];
+ }
+
  /**
  * @return array
  */

examples/alone

@@ -13,12 +13,13 @@ define('BASE_PATH', dirname(__DIR__));
 
 require dirname(__DIR__) . '/test/bootstrap.php';
 
+// run: php examples/alone
 $input = new Input();
 $ctrl = new HomeController($input, new Output());
-$ctrl->setDetached();
 
 try {
- $ctrl->run([$input->getCommand()]);
+ $ctrl->setDetached();
+ $ctrl->run($input->getFlags());
 } catch (Throwable $e) {
  $message = Color::apply('error', $e->getMessage());
 

src/Concern/ControllerHelpTrait.php

@@ -11,9 +11,9 @@
 
 use Inhere\Console\Console;
 use Inhere\Console\GlobalOption;
-use Inhere\Console\Util\FormatUtil;
 use ReflectionClass;
 use Toolkit\Cli\Color\ColorTag;
+use Toolkit\PFlag\FlagUtil;
 use Toolkit\Stdlib\Str;
 use Toolkit\Stdlib\Util\PhpDoc;
 use function array_merge;
@@ -96,7 +96,7 @@ public function showCommandList(): void
  $this->beforeShowCommandList();
 
  $ref = new ReflectionClass($this);
- $sName = lcfirst(self::getName() ?: $ref->getShortName());
+ $sName = self::getName() ?: lcfirst($ref->getShortName());
 
  if (!($classDes = self::getDesc())) {
  $classDes = PhpDoc::description($ref->getDocComment()) ?: 'No description for the command group';
@@ -124,6 +124,7 @@ public function showCommandList(): void
  $desc = $defaultDes;
  }
 
+ $desc = ucfirst($desc);
  if ($this->isDisabled($cmd)) {
  if (!$showDisabled) {
  continue;
@@ -151,7 +152,6 @@ public function showCommandList(): void
 
  // if is alone running.
  if ($detached = $this->isDetached()) {
- // $name = $sName . ' ';
  $usage = "$script <info>COMMAND</info> [--options ...] [arguments ...]";
  } else {
  $name = $sName . $this->delimiter;
@@ -162,24 +162,25 @@ public function showCommandList(): void
  ];
  }
 
- $globalOptions = [];
- if ($app = $this->app) {
- $globalOptions = $app->getFlags()->getOptsHelpLines();
- }
+ // $globalOptions = [];
+ // if ($app = $this->app) {
+ //  $globalOptions = $app->getFlags()->getOptsHelpLines();
+ // }
 
  $this->output->startBuffer();
  $this->output->write(ucfirst($classDes) . PHP_EOL);
 
+ $alias = '';
  if ($aliases = $this->getAliases()) {
- $this->output->writef("<comment>Alias:</comment> %s\n", implode(',', $aliases));
+ $alias = ' (alias: <info>' . implode(',', $aliases) . '</info>)';
  }
+ $this->output->writef("<comment>Name :</comment> %s%s\n", $sName, $alias);
 
  $groupOptions = $this->flags->getOptsHelpLines();
  $this->output->mList([
  'Usage:' => $usage,
- //'Group Name:' => "<info>$sName</info>",
- 'Group Options:' => FormatUtil::alignOptions($groupOptions),
- 'Global Options:' => FormatUtil::alignOptions($globalOptions),
+ 'Group Options:' => FlagUtil::alignOptions($groupOptions),
+ // 'Global Options:' => FlagUtil::alignOptions($globalOptions),
  'Available Commands:' => $commands,
  ], [
  'sepChar' => ' ',

src/Controller.php

@@ -24,7 +24,6 @@
 use ReflectionObject;
 use RuntimeException;
 use Throwable;
-use Toolkit\Cli\Helper\FlagHelper;
 use Toolkit\PFlag\FlagsParser;
 use Toolkit\PFlag\FlagUtil;
 use Toolkit\PFlag\SFlags;

src/Handler/AbstractHandler.php

@@ -290,7 +290,7 @@ protected function afterInitFlagsParser(FlagsParser $fs): void
  /**
  * @param array $args
  *
- * @return bool|int|mixed
+ * @return mixed
  * @throws Throwable
  */
  public function run(array $args): mixed
@@ -593,9 +593,10 @@ public function getCommandId(bool $useReal = true): string
  */
  public function getAliases(): array
  {
- $aliases = [];
  if ($this->app) {
  $aliases = $this->app->getAliases(self::getName());
+ } else {
+ $aliases = static::aliases();
  }
 
  return $aliases;

src/Util/FormatUtil.php

@@ -141,7 +141,7 @@ public static function wrapText(string $text, int $indent = 0, int $width = 0):
  * @param array $options
  *
  * @return array
- * @deprecated Please use {@see FlagUtil::alignOptions()}
+ * @deprecated Please use FlagUtil::alignOptions {@see FlagUtil::alignOptions()}
  */
  public static function alignOptions(array $options): array
  {