[dependencies] Inline Jack upgrade workflow (#34)

Author: coisa

README.md

@@ -55,7 +55,7 @@ composer dependencies
 vendor/bin/dev-tools dependencies
 composer dev-tools dependencies -- --max-outdated=8
 composer dev-tools dependencies -- --dev
-composer dev-tools dependencies -- --fix --dev
+composer dev-tools dependencies -- --upgrade --dev
 
 # Analyze code metrics with PhpMetrics
 composer metrics

docs/commands/dependencies.rst

@@ -38,14 +38,14 @@ Options
 
    Default: ``5``.
 
-``--fix`` (optional)
+``--upgrade`` (optional)
    Applies the Jack upgrade workflow before the analyzers:
 
    - ``vendor/bin/jack open-versions``
    - ``vendor/bin/jack raise-to-installed``
    - ``composer update -W``
 
-   Without ``--fix``, the command runs the Jack workflow in preview mode
+   Without ``--upgrade``, the command runs the Jack workflow in preview mode
    before the analyzers.
 
 ``--dev`` (optional)
@@ -76,7 +76,7 @@ Apply the upgrade workflow and then analyze dependencies:
 
 .. code-block:: bash
 
-   composer dev-tools dependencies -- --fix --dev
+   composer dev-tools dependencies -- --upgrade --dev
 
 Using the alias:
 
@@ -108,7 +108,7 @@ Behavior
 - ``jack breakpoint`` maps ``--max-outdated`` to Jack's ``--limit`` option.
 - It always previews Jack's ``open-versions`` and ``raise-to-installed``
   commands before the analyzers.
-- ``--fix`` applies Jack's ``open-versions`` and ``raise-to-installed``
+- ``--upgrade`` applies Jack's ``open-versions`` and ``raise-to-installed``
   commands before ``composer update -W``.
 - Returns a non-zero exit code when missing, unused, or too many outdated
   dependencies are found.

docs/running/specialized-commands.rst

@@ -33,7 +33,7 @@ Analyzes missing and unused Composer dependencies.
    composer dependencies
    composer dev-tools dependencies -- --max-outdated=10
    composer dev-tools dependencies -- --dev
-   composer dev-tools dependencies -- --fix --dev
+   composer dev-tools dependencies -- --upgrade --dev
 
 Important details:
 
@@ -46,7 +46,7 @@ Important details:
   outdated dependencies accumulate;
 - it previews ``jack open-versions`` and ``jack raise-to-installed`` before
   the analyzers;
-- ``--fix`` runs ``jack open-versions``, ``jack raise-to-installed``, and
+- ``--upgrade`` runs ``jack open-versions``, ``jack raise-to-installed``, and
   ``composer update -W`` before the analyzers;
 - it returns a non-zero exit code when missing, unused, or too many outdated
   dependencies are found.

src/Console/Command/DependenciesCommand.php

@@ -20,7 +20,6 @@
 namespace FastForward\DevTools\Console\Command;
 
 use Composer\Command\BaseCommand;
-use FastForward\DevTools\Dependency\DependencyUpgradeProcessFactoryInterface;
 use FastForward\DevTools\Process\ProcessBuilderInterface;
 use FastForward\DevTools\Process\ProcessQueueInterface;
 use InvalidArgumentException;
@@ -46,13 +45,11 @@
 final class DependenciesCommand extends BaseCommand
 {
     /**
-     * @param DependencyUpgradeProcessFactoryInterface $upgradeProcessFactory creates Jack and Composer upgrade processes
-     * @param ProcessBuilderInterface $processBuilder creates analyzer processes
+     * @param ProcessBuilderInterface $processBuilder creates analyzer and upgrade processes
      * @param ProcessQueueInterface $processQueue executes queued processes
      * @param FileLocatorInterface $fileLocator resolves local composer.json
      */
     public function __construct(
-        private readonly DependencyUpgradeProcessFactoryInterface $upgradeProcessFactory,
         private readonly ProcessBuilderInterface $processBuilder,
         private readonly ProcessQueueInterface $processQueue,
         private readonly FileLocatorInterface $fileLocator,
@@ -73,7 +70,7 @@ protected function configure(): void
                 default: '5',
             )
             ->addOption(
-                name: 'fix',
+                name: 'upgrade',
                 mode: InputOption::VALUE_NONE,
                 description: 'Apply Jack dependency upgrades before executing the dependency analyzers.',
             )
@@ -104,17 +101,39 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
         $this->fileLocator->locate('composer.json');
 
-        $fix = (bool) $input->getOption('fix');
+        $upgrade = (bool) $input->getOption('upgrade');
         $dev = (bool) $input->getOption('dev');
 
         $output->writeln(
-            $fix
+            $upgrade
                 ? '<info>Running dependency upgrade and analysis...</info>'
                 : '<info>Running dependency dry-run upgrade preview and analysis...</info>'
         );
 
-        foreach ($this->upgradeProcessFactory->create($fix, $dev) as $process) {
-            $this->processQueue->add($process);
+        $openVersionsBuilder = $this->processBuilder;
+
+        if ($dev) {
+            $openVersionsBuilder = $openVersionsBuilder->withArgument('--dev');
+        }
+
+        $this->processQueue->add(
+            $upgrade
+                ? $openVersionsBuilder->build('vendor/bin/jack open-versions')
+                : $openVersionsBuilder->withArgument('--dry-run')->build('vendor/bin/jack open-versions')
+        );
+        $this->processQueue->add(
+            $upgrade
+                ? $this->processBuilder->build('vendor/bin/jack raise-to-installed')
+                : $this->processBuilder->withArgument('--dry-run')->build('vendor/bin/jack raise-to-installed')
+        );
+
+        if ($upgrade) {
+            $this->processQueue->add(
+                $this->processBuilder
+                    ->withArgument('-W')
+                    ->withArgument('--no-progress')
+                    ->build('composer update')
+            );
         }
 
         $this->processQueue->add(

src/Dependency/DependencyUpgradeProcessFactory.php

@@ -24,8 +24,6 @@
 use FastForward\DevTools\Composer\Json\ComposerJson;
 use FastForward\DevTools\Composer\Json\ComposerJsonInterface;
 use FastForward\DevTools\Console\CommandLoader\DevToolsCommandLoader;
-use FastForward\DevTools\Dependency\DependencyUpgradeProcessFactory;
-use FastForward\DevTools\Dependency\DependencyUpgradeProcessFactoryInterface;
 use FastForward\DevTools\Filesystem\FinderFactory;
 use FastForward\DevTools\Filesystem\FinderFactoryInterface;
 use FastForward\DevTools\Filesystem\Filesystem;
@@ -97,10 +95,6 @@ public function getFactories(): array
 
             // Composer
             ComposerJsonInterface::class => get(ComposerJson::class),
-
-            // Dependency workflows
-            DependencyUpgradeProcessFactoryInterface::class => get(DependencyUpgradeProcessFactory::class),
-
             // Symfony Components
             FileLocatorInterface::class => create(FileLocator::class)->constructor([getcwd(), \dirname(__DIR__, 2)]),