fix: fix some error for run sub cmd

inhere · May 10, 2022 · fdcf1c6 · fdcf1c6
1 parent a09383d
commit fdcf1c6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/Decorate/CommandHelpTrait.php b/src/Decorate/CommandHelpTrait.php
@@ -136,12 +136,11 @@ public function showHelpByFlagsParser(FlagsParser $fs, array $aliases = [], stri
 
         $binName = $this->input->getBinName();
         $cmdPath = $binName . ' ' . $this->getPath();
-        // if ($action) {
-        //     $group = $this->getGroupName();
-        //     $cmdPath  = "$binName $group $action";
-        // }
 
-        if ($this->hasSubs()) {
+        if ($action) {
+            // $group = $this->getGroupName();
+            $cmdPath .= " $action";
+        } elseif ($this->hasSubs()) {
             $cmdPath .= ' <cyan>SUBCOMMAND</cyan>';
         }
 
@@ -153,7 +152,8 @@ public function showHelpByFlagsParser(FlagsParser $fs, array $aliases = [], stri
         $help['Options:']  = FlagUtil::alignOptions($fs->getOptsHelpLines());
         $help['Argument:'] = $fs->getArgsHelpLines();
 
-        if ($subCmds = $this->getSubsForHelp()) {
+        // fix: action should not have sub-commands
+        if (!$action && ($subCmds = $this->getSubsForHelp())) {
             // sort commands
             ksort($subCmds);
             $help['Commands:'] = $subCmds;

diff --git a/src/Decorate/SubCommandsWareTrait.php b/src/Decorate/SubCommandsWareTrait.php
@@ -265,9 +265,9 @@ public function getRoot(): static
     }
 
     /**
-     * @return static|null
+     * @return AbstractHandler|null
      */
-    public function getParent(): ?static
+    public function getParent(): ?AbstractHandler
     {
         return $this->parent;
     }