Moved to traits for runners and commands.

Author: AlexSkrypnyk

.vortex/installer/phpunit.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/11.4/phpunit.xsd"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/12.4/phpunit.xsd"
          bootstrap="vendor/autoload.php"
          cacheDirectory=".phpunit.cache"
          executionOrder="depends,defects"

.vortex/installer/src/Command/BuildCommand.php

@@ -4,8 +4,10 @@
 
 namespace DrevOps\VortexInstaller\Command;
 
-use DrevOps\VortexInstaller\Runner\CommandRunner;
-use DrevOps\VortexInstaller\Runner\ProcessRunner;
+use DrevOps\VortexInstaller\Runner\CommandRunnerAwareInterface;
+use DrevOps\VortexInstaller\Runner\CommandRunnerAwareTrait;
+use DrevOps\VortexInstaller\Runner\ProcessRunnerAwareInterface;
+use DrevOps\VortexInstaller\Runner\ProcessRunnerAwareTrait;
 use DrevOps\VortexInstaller\Runner\RunnerInterface;
 use DrevOps\VortexInstaller\Task\Task;
 use DrevOps\VortexInstaller\Utils\Tui;
@@ -17,7 +19,10 @@
 /**
  * Build command.
  */
-class BuildCommand extends Command {
+class BuildCommand extends Command implements ProcessRunnerAwareInterface, CommandRunnerAwareInterface {
+
+  use ProcessRunnerAwareTrait;
+  use CommandRunnerAwareTrait;
 
   const string OPTION_PROFILE = 'profile';
 
@@ -32,11 +37,6 @@ class BuildCommand extends Command {
    */
   public static $defaultName = 'build';
 
-  /**
-   * The process runner.
-   */
-  protected ?ProcessRunner $runner = NULL;
-
   /**
    * Whether to build from profile.
    */
@@ -66,10 +66,10 @@ protected function execute(InputInterface $input, OutputInterface $output): int
       $requirements_ok = Task::action(
         label: 'Checking requirements',
         action: function (): bool {
-          $runner = (new CommandRunner($this->getApplication()))->disableLog();
-          $runner->run('check-requirements', [], ['--no-summary' => '1']);
+          $command_runner = $this->getCommandRunner()->disableLog();
+          $command_runner->run('check-requirements', [], ['--no-summary' => '1']);
 
-          return $runner->getExitCode() === RunnerInterface::EXIT_SUCCESS;
+          return $command_runner->getExitCode() === RunnerInterface::EXIT_SUCCESS;
         },
         failure: 'Missing requirements. Run: ./installer.php check-requirements',
         streaming: TRUE,
@@ -92,10 +92,10 @@ protected function execute(InputInterface $input, OutputInterface $output): int
           $env['VORTEX_PROVISION_TYPE'] = 'profile';
         }
 
-        $this->runner = $this->getRunner()->setCwd($cwd);
-        $this->runner->run('ahoy build', env: $env);
+        $this->processRunner = $this->getProcessRunner()->setCwd($cwd);
+        $this->processRunner->run('ahoy build', env: $env);
 
-        return $this->runner->getExitCode() === RunnerInterface::EXIT_SUCCESS;
+        return $this->processRunner->getExitCode() === RunnerInterface::EXIT_SUCCESS;
       },
       success: fn(bool $result): string => $result ? 'Build completed' : 'Build failed',
       failure: 'Build failed',
@@ -139,7 +139,7 @@ protected function showSuccessSummary(): void {
     $output .= 'Login:    ahoy login' . PHP_EOL;
     $output .= PHP_EOL;
 
-    $log_path = $this->runner->getLogger()->getPath();
+    $log_path = $this->processRunner->getLogger()->getPath();
     if ($log_path) {
       $output .= 'Log file: ' . $log_path . PHP_EOL;
       $output .= PHP_EOL;
@@ -160,23 +160,23 @@ protected function showSuccessSummary(): void {
   protected function showFailureSummary(): void {
     Tui::line('');
 
-    $command = $this->runner->getCommand();
+    $command = $this->processRunner->getCommand();
     if ($command) {
       Tui::line('Failed at:  ' . $command);
     }
 
-    $exit_code = $this->runner->getExitCode();
+    $exit_code = $this->processRunner->getExitCode();
     Tui::line('Exit code:  ' . $exit_code);
 
-    $log_path = $this->runner->getLogger()->getPath();
+    $log_path = $this->processRunner->getLogger()->getPath();
     if ($log_path) {
       Tui::line('Log file:   ' . $log_path);
     }
 
     Tui::line('');
 
     // Show last 10 lines of output for context.
-    $runner_output = $this->runner->getOutput(as_array: TRUE);
+    $runner_output = $this->processRunner->getOutput(as_array: TRUE);
 
     if (!is_array($runner_output)) {
       throw new \RuntimeException('Runner output is not an array.');
@@ -191,23 +191,4 @@ protected function showFailureSummary(): void {
     }
   }
 
-  /**
-   * Get the process runner.
-   *
-   * Factory method that returns existing runner or creates new one.
-   */
-  protected function getRunner(): ProcessRunner {
-    // Return already-set runner if available (for testing).
-    return $this->runner ?? (new ProcessRunner());
-  }
-
-  /**
-   * Set the process runner.
-   *
-   * Allows dependency injection for testing.
-   */
-  public function setRunner(ProcessRunner $runner): void {
-    $this->runner = $runner;
-  }
-
 }

.vortex/installer/src/Command/CheckRequirementsCommand.php

@@ -4,7 +4,11 @@
 
 namespace DrevOps\VortexInstaller\Command;
 
+use DrevOps\VortexInstaller\Runner\ExecutableFinderAwareInterface;
+use DrevOps\VortexInstaller\Runner\ExecutableFinderAwareTrait;
 use DrevOps\VortexInstaller\Runner\ProcessRunner;
+use DrevOps\VortexInstaller\Runner\ProcessRunnerAwareInterface;
+use DrevOps\VortexInstaller\Runner\ProcessRunnerAwareTrait;
 use DrevOps\VortexInstaller\Runner\RunnerInterface;
 use DrevOps\VortexInstaller\Task\Task;
 use DrevOps\VortexInstaller\Utils\Tui;
@@ -16,7 +20,10 @@
 /**
  * Check requirements command.
  */
-class CheckRequirementsCommand extends Command {
+class CheckRequirementsCommand extends Command implements ProcessRunnerAwareInterface, ExecutableFinderAwareInterface {
+
+  use ProcessRunnerAwareTrait;
+  use ExecutableFinderAwareTrait;
 
   const string OPTION_ONLY = 'only';
 
@@ -44,11 +51,6 @@ class CheckRequirementsCommand extends Command {
    */
   public static $defaultName = 'check-requirements';
 
-  /**
-   * The process runner.
-   */
-  protected ProcessRunner $runner;
-
   /**
    * Present tools.
    *
@@ -83,7 +85,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
     $only = $input->getOption(static::OPTION_ONLY);
     $requirements = $this->validateRequirements($only ? array_map(trim(...), explode(',', (string) $only)) : NULL);
 
-    $this->runner = $this->getRunner();
+    $this->processRunner ??= $this->getProcessRunner();
     $this->present = [];
     $this->missing = [];
 
@@ -146,7 +148,7 @@ protected function validateRequirements(?array $only): array {
     if ($only !== NULL) {
       $unknown = array_diff($only, static::REQUIREMENTS);
       if (!empty($unknown)) {
-        throw new \InvalidArgumentException(sprintf('Unknown requirements: %s. Available: %s.', implode(', ', $unknown), implode(', ', static::REQUIREMENTS)));
+        throw new \InvalidArgumentException(sprintf("Unknown requirements: %s.\nAvailable: %s.", implode(', ', $unknown), implode(', ', static::REQUIREMENTS)));
       }
     }
 
@@ -274,37 +276,37 @@ protected function checkPygmy(): bool {
 
     $version = $this->getCommandVersion('pygmy version');
 
-    $this->runner->run('pygmy status');
-    if ($this->runner->getExitCode() === RunnerInterface::EXIT_SUCCESS) {
+    $this->processRunner->run('pygmy status');
+    if ($this->processRunner->getExitCode() === RunnerInterface::EXIT_SUCCESS) {
       $this->present['Pygmy'] = $version;
       return TRUE;
     }
 
-    $this->runner->run('docker ps --format "{{.Names}}" | grep -q amazeeio');
+    $this->processRunner->run('docker ps --format "{{.Names}}" | grep -q amazeeio');
     // @phpstan-ignore-next-line notIdentical.alwaysFalse
-    if ($this->runner->getExitCode() === RunnerInterface::EXIT_SUCCESS) {
+    if ($this->processRunner->getExitCode() === RunnerInterface::EXIT_SUCCESS) {
       $this->present['Pygmy'] = $version;
       return TRUE;
     }
 
     $this->missing['Pygmy'] = 'Run: pygmy up';
+
     return FALSE;
   }
 
   /**
    * Check if a command exists.
    */
   protected function commandExists(string $command): bool {
-    $this->runner->run(sprintf('command -v %s', escapeshellarg($command)));
-    return $this->runner->getExitCode() === RunnerInterface::EXIT_SUCCESS;
+    return $this->getExecutableFinder()->find($command) !== NULL;
   }
 
   /**
    * Check if Docker Compose exists.
    */
   protected function dockerComposeExists(): bool {
-    $this->runner->run('docker compose version');
-    if ($this->runner->getExitCode() === RunnerInterface::EXIT_SUCCESS) {
+    $this->processRunner->run('docker compose version');
+    if ($this->processRunner->getExitCode() === RunnerInterface::EXIT_SUCCESS) {
       return TRUE;
     }
 
@@ -320,36 +322,17 @@ protected function dockerComposeExists(): bool {
    *   Number of lines to retrieve from the output. Defaults to 1.
    */
   protected function getCommandVersion(string $command, int $lines = 1): string {
-    $this->runner->run($command);
-    $raw_output = $this->runner->getOutput(FALSE, $lines);
+    $this->processRunner->run($command);
+    $raw_output = $this->processRunner->getOutput(FALSE, $lines);
     $output = trim(is_string($raw_output) ? $raw_output : implode(PHP_EOL, $raw_output));
     return empty($output) ? 'Available' : $output;
   }
 
   /**
-   * Get the process runner instance.
-   *
-   * Factory method to create the runner, allowing tests to override this
-   * to inject mocks via setRunner().
-   *
-   * @return \DrevOps\VortexInstaller\Runner\ProcessRunner
-   *   The process runner instance.
-   */
-  protected function getRunner(): ProcessRunner {
-    // Return already-set runner if available (for testing).
-    return $this->runner ?? (new ProcessRunner())->disableLog()->disableStreaming();
-  }
-
-  /**
-   * Set the process runner instance.
-   *
-   * Allows dependency injection for testing.
-   *
-   * @param \DrevOps\VortexInstaller\Runner\ProcessRunner $runner
-   *   The process runner instance.
+   * {@inheritdoc}
    */
-  public function setRunner(ProcessRunner $runner): void {
-    $this->runner = $runner;
+  public function getProcessRunner(): ProcessRunner {
+    return $this->processRunner ?? (new ProcessRunner())->disableLog()->disableStreaming();
   }
 
 }