fix: unit test error on subcommands

Author: inhere

src/Component/Router.php

@@ -26,12 +26,12 @@
 use function array_merge;
 use function class_exists;
 use function explode;
+use function get_class;
 use function in_array;
 use function is_int;
 use function is_object;
 use function is_string;
 use function is_subclass_of;
-use function method_exists;
 use function preg_match;
 use function strpos;
 use function trim;
@@ -187,9 +187,12 @@ public function addCommand(string $name, string|Closure|CommandInterface $handle
             $name = $name::getName();
         }
 
-        Assert::isFalse(!$name || !$handler, "Command 'name' and 'handler' cannot be empty! name: $name");
-        Assert::isFalse(isset($this->commands[$name]), "Command '$name' have been registered!");
+        if (!$name || !$handler) {
+            $handlerClass = is_object($handler) ? get_class($handler) : $handler;
+            throw new InvalidArgumentException("Command 'name' and 'handler' cannot be empty! name: $name, handler: $handlerClass");
+        }
 
+        Assert::isFalse(isset($this->commands[$name]), "Command '$name' have been registered!");
         $this->validateName($name);
 
         $config['aliases'] = isset($config['aliases']) ? (array)$config['aliases'] : [];

src/Decorate/SubCommandsWareTrait.php

@@ -26,6 +26,7 @@
 use function class_exists;
 use function count;
 use function explode;
+use function get_class;
 use function implode;
 use function in_array;
 use function is_int;
@@ -122,7 +123,7 @@ protected function dispatchSub(string $name, array $args): mixed
         // create and init sub-command
         $subCmd = $this->createSubCommand($subInfo);
         $subCmd->setParent($this);
-        $subCmd->setApp($this->getApp());
+        $subCmd->setApp($this->app);
         $subCmd->setPath($this->path);
         $subCmd->setInputOutput($this->input, $this->output);
 
@@ -168,9 +169,12 @@ public function addSub(string $name, string|CommandInterface $handler = null, ar
             $name = $handler::getName();
         }
 
-        Assert::isFalse(!$name || !$handler, "Command 'name' and 'handler' cannot be empty! name: $name, handler: $handler");
-        Assert::isFalse(isset($this->commands[$name]), "Command '$name' have been registered!");
+        if (!$name || !$handler) {
+            $handlerClass = is_object($handler) ? get_class($handler) : $handler;
+            throw new InvalidArgumentException("Command 'name' and 'handler' cannot be empty! name: $name, handler: $handlerClass");
+        }
 
+        Assert::isFalse(isset($this->commands[$name]), "Command '$name' have been registered!");
         $this->validateName($name);
 
         $config['aliases'] = isset($config['aliases']) ? (array)$config['aliases'] : [];

src/Handler/AbstractHandler.php

@@ -43,13 +43,9 @@
  */
 abstract class AbstractHandler implements CommandHandlerInterface
 {
-    use AttachApplicationTrait;
+    use AttachApplicationTrait, CommandHelpTrait;
 
-    use CommandHelpTrait;
-
-    use InputOutputAwareTrait;
-
-    use UserInteractAwareTrait;
+    use InputOutputAwareTrait, UserInteractAwareTrait;
 
     use SubCommandsWareTrait;