Fix bug in getCommands()

Author: Robin de Graaf

.gitignore

@@ -1,4 +1,5 @@
+.DS_Store
 .idea
 composer.lock
 vendor
-coverage
+coverage

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Parable Console
 
+## 0.6.1
+
+_Changes_
+- Small bugfix that crept up after splitting named commands and instantiated ones.
+
 ## 0.6.0
 
 _Changes_

src/Application.php

@@ -102,6 +102,9 @@ public function getCommand(string $commandName): ?Command
             /** @var Command $command */
             $command = $this->container->get($this->commandNames[$commandName]);
             $this->addCommand($command);
+
+            // Since we've instantiated now, we can lose the reference to the name alone
+            unset($this->commandNames[$commandName]);
         }
 
         return $this->commands[$commandName];
@@ -114,17 +117,20 @@ public function getCommands(): array
     {
         $commands = [];
 
-        foreach ($this->commands as $commandName => $command) {
+        foreach ($this->commandNames as $commandName => $className) {
             $commands[$commandName] = $this->getCommand($commandName);
         }
 
-        return array_filter($commands);
+        return array_filter(array_merge($this->commands, $commands));
     }
 
     public function removeCommandByName(string $commandName): void
     {
         if ($this->hasCommand($commandName)) {
-            unset($this->commands[$commandName]);
+            unset(
+                $this->commands[$commandName],
+                $this->commandNames[$commandName]
+            );
         }
     }
 

tests/ApplicationTest.php

@@ -98,6 +98,20 @@ public function testGetCommand(): void
         self::assertSame('OK2', ValueClass::get());
     }
 
+    public function testGetCommandsGetsBothInstantiatedAndCommandNames(): void
+    {
+        $application = $this->container->buildAll(Application::class);
+
+        $application->addCommand($this->command1);
+        $application->addCommandByNameAndClass('test-command', TestCommand::class);
+
+        self::assertCount(2, $application->getCommands());
+
+        foreach ($application->getCommands() as $commandName => $command) {
+            self::assertInstanceOf(Command::class, $command);
+        }
+    }
+
     public function testAddCommand(): void
     {
         self::assertFalse($this->container->has(TestCommand::class));