Use Console setter when adding Command

aplus-framework · May 12, 2022 · 9569b0c · 9569b0c
1 parent 66cdbf5
commit 9569b0c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/Command.php b/src/Command.php
@@ -48,11 +48,13 @@ abstract class Command
     /**
      * Command constructor.
      *
-     * @param Console $console
+     * @param Console|null $console
      */
-    public function __construct(Console $console)
+    public function __construct(Console $console = null)
     {
-        $this->console = $console;
+        if ($console) {
+            $this->console = $console;
+        }
     }
 
     /**

diff --git a/src/Console.php b/src/Console.php
@@ -135,8 +135,9 @@ public function getLanguage() : Language
     public function addCommand(Command | string $command) : static
     {
         if (\is_string($command)) {
-            $command = new $command($this);
+            $command = new $command();
         }
+        $command->setConsole($this);
         $this->commands[$command->getName()] = $command;
         return $this;
     }