Refactor ProcessRunner

src/Deployer.php

@@ -22,8 +22,8 @@
 use Deployer\Component\PharUpdate\Console\Command as PharUpdateCommand;
 use Deployer\Component\PharUpdate\Console\Helper as PharUpdateHelper;
 use Deployer\Component\Pimple\Container;
-use Deployer\Component\ProcessRunner\Printer;
-use Deployer\Component\ProcessRunner\ProcessRunner;
+use Deployer\ProcessRunner\Printer;
+use Deployer\ProcessRunner\ProcessRunner;
 use Deployer\Ssh\SshClient;
 use Deployer\Configuration\Configuration;
 use Deployer\Executor\Master;

src/Logger/Logger.php

@@ -10,7 +10,7 @@
 
 namespace Deployer\Logger;
 
-use Deployer\Component\ProcessRunner\Printer;
+use Deployer\ProcessRunner\Printer;
 use Deployer\Host\Host;
 use Deployer\Logger\Handler\HandlerInterface;
 

src/Component/ProcessRunner/Printer.php → src/ProcessRunner/Printer.php

@@ -8,17 +8,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Deployer\Component\ProcessRunner;
+namespace Deployer\ProcessRunner;
 
 use Deployer\Host\Host;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Printer
 {
-    /**
-     * @var OutputInterface
-     */
-    private $output;
+    private OutputInterface $output;
 
     public function __construct(OutputInterface $output)
     {

src/Component/ProcessRunner/ProcessRunner.php → src/ProcessRunner/ProcessRunner.php

@@ -8,38 +8,28 @@
  * file that was distributed with this source code.
  */
 
-namespace Deployer\Component\ProcessRunner;
+namespace Deployer\ProcessRunner;
 
 use Deployer\Exception\RunException;
 use Deployer\Exception\TimeoutException;
 use Deployer\Host\Host;
 use Deployer\Logger\Logger;
+use Deployer\ProcessRunner\Printer;
 use Symfony\Component\Process\Exception\ProcessFailedException;
 use Symfony\Component\Process\Exception\ProcessTimedOutException;
 use Symfony\Component\Process\Process;
 
 class ProcessRunner
 {
-    /**
-     * @var Printer
-     */
-    private $pop;
-    /**
-     * @var Logger
-     */
-    private $logger;
+    private Printer $pop;
+    private Logger $logger;
 
     public function __construct(Printer $pop, Logger $logger)
     {
         $this->pop = $pop;
         $this->logger = $logger;
     }
 
-    /**
-     * Runs a command, consider deployer global configs (timeout,...)
-     *
-     * @throws RunException
-     */
     public function run(Host $host, string $command, array $config = []): string
     {
         $defaults = [
@@ -82,7 +72,7 @@ public function run(Host $host, string $command, array $config = []): string
                 $process->getOutput(),
                 $process->getErrorOutput(),
             );
-        } catch (ProcessTimedOutException $exception) { // @phpstan-ignore-line can be thrown but is absent from the phpdoc
+        } catch (ProcessTimedOutException $exception) {
             throw new TimeoutException(
                 $command,
                 $exception->getExceededTimeout(),

src/Ssh/SshClient.php

@@ -10,7 +10,7 @@
 
 namespace Deployer\Ssh;
 
-use Deployer\Component\ProcessRunner\Printer;
+use Deployer\ProcessRunner\Printer;
 use Deployer\Exception\RunException;
 use Deployer\Exception\TimeoutException;
 use Deployer\Host\Host;

src/Utility/Rsync.php

@@ -10,7 +10,7 @@
 
 namespace Deployer\Utility;
 
-use Deployer\Component\ProcessRunner\Printer;
+use Deployer\ProcessRunner\Printer;
 use Deployer\Exception\RunException;
 use Deployer\Host\Host;
 use Symfony\Component\Console\Helper\ProgressBar;