refactor: reorganize commands into Console namespace with dependency injection

Author: coisa

bin/dev-tools.php

@@ -18,12 +18,13 @@
 
 namespace FastForward\DevTools;
 
+use FastForward\DevTools\Psr\Container\Container;
 use Symfony\Component\Console\Input\ArgvInput;
 
 $projectVendorAutoload = \dirname(__DIR__, 4) . '/vendor/autoload.php';
 $pluginVendorAutoload = \dirname(__DIR__) . '/vendor/autoload.php';
 
 require_once file_exists($projectVendorAutoload) ? $projectVendorAutoload : $pluginVendorAutoload;
 
-$application = new DevTools();
+$application = Container::get(Console\DevTools::class);
 $application->run(new ArgvInput([...$argv, '--no-plugins']));

composer.json

@@ -36,11 +36,13 @@
         "icanhazstring/composer-unused": "^0.9.6",
         "jolicode/jolinotif": "^3.3",
         "nikic/php-parser": "^5.7",
+        "php-di/php-di": "^7.1",
         "phpdocumentor/shim": "^3.9",
         "phpro/grumphp": "^2.19",
         "phpspec/prophecy": "^1.26",
         "phpspec/prophecy-phpunit": "^2.5",
         "phpunit/phpunit": "^12.5",
+        "psr/clock": "^1.0",
         "psr/log": "^3.0",
         "pyrech/composer-changelogs": "^2.2",
         "rector/rector": "^2.3",

config/container.php

@@ -0,0 +1,51 @@
+<?php
+
+namespace FastForward\DevTools;
+
+use Composer\Plugin\Capability\CommandProvider;
+use FastForward\DevTools\Console\CommandLoader\DevToolsCommandLoader;
+use Psr\Clock\ClockInterface;
+use Psr\Log\LoggerInterface;
+use Psr\Log\NullLogger;
+use Symfony\Component\Console\CommandLoader\CommandLoaderInterface;
+use Symfony\Component\Console\CommandLoader\ContainerCommandLoader;
+use Symfony\Component\Finder\Finder;
+
+use function DI\create;
+use function DI\get;
+
+return [
+    // Symfony Components
+    Finder::class => create(Finder::class),
+
+    // PSR
+    LoggerInterface::class => get(NullLogger::class),
+    ClockInterface::class => get(Psr\Clock\SystemClock::class),
+
+    // Console
+    CommandLoaderInterface::class => get(DevToolsCommandLoader::class),
+    CommandProvider::class => get(Composer\Capability\DevToolsCommandProvider::class),
+
+    // Coverage
+    PhpUnit\Coverage\CoverageSummaryLoaderInterface::class => get(PhpUnit\Coverage\CoverageSummaryLoader::class),
+
+    // GitIgnore
+    GitIgnore\MergerInterface::class => get(GitIgnore\Merger::class),
+    GitIgnore\ReaderInterface::class => get(GitIgnore\Reader::class),
+    GitIgnore\WriterInterface::class => get(GitIgnore\Writer::class),
+
+    // GitAttributes
+    GitAttributes\CandidateProviderInterface::class => get(GitAttributes\CandidateProvider::class),
+    GitAttributes\ExistenceCheckerInterface::class => get(GitAttributes\ExistenceChecker::class),
+    GitAttributes\ExportIgnoreFilterInterface::class => get(GitAttributes\ExportIgnoreFilter::class),
+    GitAttributes\MergerInterface::class => get(GitAttributes\Merger::class),
+    GitAttributes\ReaderInterface::class => get(GitAttributes\Reader::class),
+    GitAttributes\WriterInterface::class => get(GitAttributes\Writer::class),
+
+    // License
+    License\GeneratorInterface::class => get(License\Generator::class),
+    License\PlaceholderResolverInterface::class => get(License\PlaceholderResolver::class),
+    License\ReaderInterface::class => get(License\Reader::class),
+    License\ResolverInterface::class => get(License\Resolver::class),
+    License\TemplateLoaderInterface::class => get(License\TemplateLoader::class),
+];

docs/advanced/consumer-automation.rst

@@ -52,5 +52,5 @@ Producer Impact
 
 Any change to ``resources/github-actions``, ``resources/dependabot.yml``,
 ``.agents/skills``, ``.github/workflows``, or
-``FastForward\DevTools\Command\SyncCommand`` changes the default onboarding
+``FastForward\DevTools\Console\Command\SyncCommand`` changes the default onboarding
 story for every consumer library.

docs/api/commands.rst

@@ -2,7 +2,7 @@ Command Classes
 ===============
 
 All public CLI commands extend
-``FastForward\DevTools\Command\AbstractCommand``, which provides path
+``FastForward\DevTools\Console\Command\AbstractCommand``, which provides path
 resolution, configuration fallback, PSR-4 lookup, and child-command dispatch.
 
 .. list-table::
@@ -11,47 +11,47 @@ resolution, configuration fallback, PSR-4 lookup, and child-command dispatch.
    * - Class
      - CLI command
      - Responsibility
-   * - ``FastForward\DevTools\Command\AbstractCommand``
+   * - ``FastForward\DevTools\Console\Command\AbstractCommand``
      - n/a
      - Shared helpers for path resolution, packaged fallback files, PSR-4
        discovery, and subcommand execution.
-   * - ``FastForward\DevTools\Command\StandardsCommand``
+   * - ``FastForward\DevTools\Console\Command\StandardsCommand``
      - ``standards``
      - Runs the full quality pipeline.
-   * - ``FastForward\DevTools\Command\RefactorCommand``
+   * - ``FastForward\DevTools\Console\Command\RefactorCommand``
      - ``refactor``
      - Runs Rector with local or packaged configuration.
-   * - ``FastForward\DevTools\Command\PhpDocCommand``
+   * - ``FastForward\DevTools\Console\Command\PhpDocCommand``
      - ``phpdoc``
      - Runs PHP-CS-Fixer and a focused Rector PHPDoc pass.
-   * - ``FastForward\DevTools\Command\CodeStyleCommand``
+   * - ``FastForward\DevTools\Console\Command\CodeStyleCommand``
      - ``code-style``
      - Runs Composer Normalize and ECS.
-   * - ``FastForward\DevTools\Command\TestsCommand``
+   * - ``FastForward\DevTools\Console\Command\TestsCommand``
      - ``tests``
      - Runs PHPUnit with optional coverage output.
-   * - ``FastForward\DevTools\Command\DependenciesCommand``
+   * - ``FastForward\DevTools\Console\Command\DependenciesCommand``
      - ``dependencies``
      - Reports missing and unused Composer dependencies.
-   * - ``FastForward\DevTools\Command\DocsCommand``
+   * - ``FastForward\DevTools\Console\Command\DocsCommand``
      - ``docs``
      - Builds the HTML documentation site.
-   * - ``FastForward\DevTools\Command\WikiCommand``
+   * - ``FastForward\DevTools\Console\Command\WikiCommand``
      - ``wiki``
      - Builds Markdown API documentation.
-   * - ``FastForward\DevTools\Command\ReportsCommand``
+   * - ``FastForward\DevTools\Console\Command\ReportsCommand``
      - ``reports``
      - Combines the documentation build with coverage generation.
-   * - ``FastForward\DevTools\Command\SkillsCommand``
+   * - ``FastForward\DevTools\Console\Command\SkillsCommand``
      - ``skills``
      - Synchronizes packaged agent skills into ``.agents/skills``.
-   * - ``FastForward\DevTools\Command\SyncCommand``
+   * - ``FastForward\DevTools\Console\Command\SyncCommand``
      - ``dev-tools:sync``
      - Synchronizes consumer-facing scripts, automation assets, and packaged
        skills.
-    * - ``FastForward\DevTools\Command\GitIgnoreCommand``
+    * - ``FastForward\DevTools\Console\Command\GitIgnoreCommand``
       - ``gitignore``
       - Merges and synchronizes .gitignore files.
-    * - ``FastForward\DevTools\Command\CopyLicenseCommand``
+    * - ``FastForward\DevTools\Console\Command\CopyLicenseCommand``
       - ``license``
       - Generates a LICENSE file from composer.json license information.

docs/configuration/overriding-defaults.rst

@@ -7,7 +7,7 @@ without forking the whole package.
 Resolution Order
 ----------------
 
-``FastForward\DevTools\Command\AbstractCommand::getConfigFile()`` resolves
+``FastForward\DevTools\Console\Command\AbstractCommand::getConfigFile()`` resolves
 configuration in this order:
 
 1. Check whether the file exists in the current working directory.

docs/faq.rst

@@ -33,13 +33,13 @@ after deleting a packaged skill link locally.
 Why does ``code-style`` touch ``composer.lock``?
 ------------------------------------------------
 
-Because ``FastForward\DevTools\Command\CodeStyleCommand`` always runs
+Because ``FastForward\DevTools\Console\Command\CodeStyleCommand`` always runs
 ``composer update --lock --quiet`` before Composer Normalize and ECS.
 
 Where did ``.docheader`` come from?
 -----------------------------------
 
-``FastForward\DevTools\Command\PhpDocCommand`` creates it automatically when it
+``FastForward\DevTools\Console\Command\PhpDocCommand`` creates it automatically when it
 is missing. The template comes from the packaged file and is rewritten with the
 current package name when possible.
 

docs/internals/architecture.rst

@@ -16,7 +16,7 @@ Local Command Lifecycle
    is given.
 5. Individual commands resolve local configuration first and packaged
    fallbacks second through
-   ``FastForward\DevTools\Command\AbstractCommand::getConfigFile()``.
+   ``FastForward\DevTools\Console\Command\AbstractCommand::getConfigFile()``.
 
 Consumer Synchronization Lifecycle
 ----------------------------------
@@ -27,31 +27,31 @@ Consumer Synchronization Lifecycle
    ``FastForward\DevTools\Composer\Capability\DevToolsCommandProvider``.
 4. After ``composer install`` or ``composer update``, the plugin runs
    ``vendor/bin/dev-tools dev-tools:sync``.
-5. ``FastForward\DevTools\Command\SyncCommand`` updates scripts, GitHub
+5. ``FastForward\DevTools\Console\Command\SyncCommand`` updates scripts, GitHub
    workflow stubs, ``.editorconfig``, ``dependabot.yml``, ``.gitignore``, and
    the wiki submodule in the consumer repository.
-6. ``FastForward\DevTools\Command\SkillsCommand`` synchronizes packaged skill
+6. ``FastForward\DevTools\Console\Command\SkillsCommand`` synchronizes packaged skill
    links into the consumer ``.agents/skills`` directory.
 7. ``FastForward\DevTools\Agent\Skills\SkillsSynchronizer`` creates missing
    links, repairs broken ones, and preserves consumer-owned directories.
 
 Documentation Pipeline
 ----------------------
 
-1. ``FastForward\DevTools\Command\DocsCommand`` reads PSR-4 paths from
+1. ``FastForward\DevTools\Console\Command\DocsCommand`` reads PSR-4 paths from
    ``composer.json``.
 2. It generates a temporary ``phpdocumentor.xml`` file in
    ``tmp/cache/phpdoc``.
 3. phpDocumentor builds API pages from those PSR-4 paths.
 4. phpDocumentor also builds the guide from the selected ``docs/`` source
    directory.
-5. ``FastForward\DevTools\Command\ReportsCommand`` combines that
+5. ``FastForward\DevTools\Console\Command\ReportsCommand`` combines that
    documentation build with PHPUnit coverage generation.
 
 Key Abstraction
 ---------------
 
-``FastForward\DevTools\Command\AbstractCommand`` is the main shared layer. It
+``FastForward\DevTools\Console\Command\AbstractCommand`` is the main shared layer. It
 centralizes:
 
 - current working directory detection;

src/Agent/Skills/SkillsSynchronizer.php

@@ -20,6 +20,7 @@
 
 use Psr\Log\LoggerAwareInterface;
 use Psr\Log\LoggerAwareTrait;
+use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\Finder\Finder;
@@ -34,21 +35,24 @@
  */
 final class SkillsSynchronizer implements LoggerAwareInterface
 {
-    use LoggerAwareTrait;
-
     /**
-     * Initializes the synchronizer with an optional filesystem instance.
-     *
-     * If no filesystem is provided, a default {@see Filesystem} instance is created.
+     * Initializes the synchronizer with a filesystem and finder instance.
      *
-     * @param Filesystem|null $filesystem Filesystem instance for file operations
+     * @param Filesystem $filesystem Filesystem instance for file operations
      * @param Finder $finder Finder instance for locating skill directories in the package
      */
     public function __construct(
-        private readonly Filesystem $filesystem = new Filesystem(),
-        private readonly Finder $finder = new Finder(),
-    ) {
-        $this->logger = new NullLogger();
+        private readonly Filesystem $filesystem,
+        private readonly Finder $finder,
+        private LoggerInterface $logger,
+    ) {}
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setLogger(LoggerInterface $logger): void
+    {
+        $this->logger = $logger;
     }
 
     /**

src/Composer/Capability/DevToolsCommandProvider.php

@@ -18,54 +18,21 @@
 
 namespace FastForward\DevTools\Composer\Capability;
 
-use FastForward\DevTools\Command\AbstractCommand;
-use Composer\Plugin\Capability\CommandProvider as CommandProviderCapability;
-use FastForward\DevTools\Command\CodeStyleCommand;
-use FastForward\DevTools\Command\CopyLicenseCommand;
-use FastForward\DevTools\Command\DependenciesCommand;
-use FastForward\DevTools\Command\DocsCommand;
-use FastForward\DevTools\Command\GitAttributesCommand;
-use FastForward\DevTools\Command\GitIgnoreCommand;
-use FastForward\DevTools\Command\PhpDocCommand;
-use FastForward\DevTools\Command\RefactorCommand;
-use FastForward\DevTools\Command\ReportsCommand;
-use FastForward\DevTools\Command\StandardsCommand;
-use FastForward\DevTools\Command\TestsCommand;
-use FastForward\DevTools\Command\WikiCommand;
-use FastForward\DevTools\Command\SyncCommand;
-use FastForward\DevTools\Command\SkillsCommand;
+use Composer\Plugin\Capability\CommandProvider;
+use FastForward\DevTools\Console\DevTools;
+use FastForward\DevTools\Psr\Container\Container;
 
 /**
  * Provides a registry of custom dev-tools commands mapped for Composer integration.
- * This capability struct MUST implement the defined `CommandProviderCapability`.
+ * This capability struct MUST implement the defined `CommandProvider`.
  */
-final class DevToolsCommandProvider implements CommandProviderCapability
+final class DevToolsCommandProvider implements CommandProvider
 {
     /**
-     * Dispatches the comprehensive collection of CLI commands.
-     *
-     * The method MUST yield an array of instantiated command classes representing the tools.
-     * It SHALL be queried by the Composer plugin dynamically during runtime execution.
-     *
-     * @return array<int, AbstractCommand> the commands defined within the toolset
+     * {@inheritDoc}
      */
     public function getCommands()
     {
-        return [
-            new CodeStyleCommand(),
-            new RefactorCommand(),
-            new TestsCommand(),
-            new DependenciesCommand(),
-            new PhpDocCommand(),
-            new DocsCommand(),
-            new StandardsCommand(),
-            new ReportsCommand(),
-            new WikiCommand(),
-            new SyncCommand(),
-            new GitIgnoreCommand(),
-            new GitAttributesCommand(),
-            new SkillsCommand(),
-            new CopyLicenseCommand(),
-        ];
+        return Container::get(DevTools::class)->getCommands();
     }
 }