refactor: centralize command retrieval through DevTools API

Author: coisa

src/Composer/Capability/DevToolsCommandProvider.php

@@ -22,36 +22,22 @@
 use Composer\Plugin\Capability\CommandProvider;
 use FastForward\DevTools\Composer\Command\ProxyCommand;
 use FastForward\DevTools\Console\DevTools;
+use Symfony\Component\Console\Command\Command;
 
 /**
  * Provides a registry of custom dev-tools commands mapped for Composer integration.
  * This capability struct MUST implement the defined `CommandProvider`.
  */
 final class DevToolsCommandProvider implements CommandProvider
 {
-    private const string COMMAND_NAMESPACE = 'FastForward\\DevTools\\Console\\Command\\';
-
     /**
      * {@inheritDoc}
      */
     public function getCommands()
     {
-        $commands = [];
-
-        foreach (DevTools::create()->all() as $command) {
-            if (! str_starts_with($command::class, self::COMMAND_NAMESPACE)) {
-                continue;
-            }
-
-            $id = spl_object_hash($command);
-
-            if (isset($commands[$id])) {
-                continue;
-            }
-
-            $commands[$id] = new ProxyCommand($command);
-        }
-
-        return $commands;
+        return array_map(
+            static fn(Command $command): ProxyCommand => new ProxyCommand($command),
+            iterator_to_array(DevTools::create()->getCommands()),
+        );
     }
 }

src/Console/DevTools.php

@@ -53,12 +53,13 @@ final class DevTools extends Application
      *
      * @param CommandLoaderInterface $commandLoader the command loader responsible for providing command instances
      */
-    public function __construct(CommandLoaderInterface $commandLoader)
-    {
+    public function __construct(
+        private readonly CommandLoaderInterface $commandLoader
+    ) {
         parent::__construct('Fast Forward Dev Tools');
 
         $this->setDefaultCommand('standards');
-        $this->setCommandLoader($commandLoader);
+        $this->setCommandLoader($this->commandLoader);
     }
 
     /**
@@ -72,6 +73,18 @@ public function getHelp(): string
         return self::LOGO . "\n\n" . parent::getHelp();
     }
 
+    /**
+     * Retrieves the shared DevTools service container.
+     *
+     * @return iterable
+     */
+    public function getCommands(): iterable
+    {
+        foreach ($this->commandLoader->getNames() as $name) {
+            yield $name => $this->commandLoader->get($name);
+        }
+    }
+
     /**
      * Create DevTools instance from container.
      *

tests/Composer/Capability/DevToolsCommandProviderTest.php

@@ -57,7 +57,7 @@ protected function setUp(): void
             ->willReturn($this->devTools->reveal())
             ->shouldBeCalledOnce();
 
-        $this->devTools->all()
+        $this->devTools->getCommands()
             ->willReturn([])->shouldBeCalledOnce();
 
         $this->commandProvider = new DevToolsCommandProvider();
@@ -90,7 +90,7 @@ public function getCommandsWillReturnComposerProxyCommandsForRegisteredSymfonyCo
         $symfonyCommand->setHelp('');
         $symfonyCommand->setHidden(false);
 
-        $this->devTools->all()
+        $this->devTools->getCommands()
             ->willReturn([$symfonyCommand])
             ->shouldBeCalledOnce();
 

tests/Console/DevToolsTest.php

@@ -110,6 +110,39 @@ public function __construct()
         self::assertSame($customCommand, $this->devTools->get('custom'));
     }
 
+    /**
+     * @return void
+     */
+    #[Test]
+    public function getCommandsWillYieldLoaderCommandsWithPreservedKeys(): void
+    {
+        $commands = [
+            'agents' => new class extends Command {
+                public function __construct()
+                {
+                    parent::__construct('agents');
+                }
+            },
+            'sync' => new class extends Command {
+                public function __construct()
+                {
+                    parent::__construct('sync');
+                }
+            },
+        ];
+
+        $this->commandLoader->getNames()
+            ->willReturn(array_keys($commands));
+        $this->commandLoader->get('agents')
+            ->willReturn($commands['agents']);
+        $this->commandLoader->get('sync')
+            ->willReturn($commands['sync']);
+
+        $providedCommands = iterator_to_array($this->devTools->getCommands());
+
+        self::assertSame($commands, $providedCommands);
+    }
+
     /**
      * @return void
      */