Rename to logger

Author: antonmedv

src/Deployer.php

@@ -22,10 +22,9 @@
 use Deployer\Component\PharUpdate\Console\Command as PharUpdateCommand;
 use Deployer\Component\PharUpdate\Console\Helper as PharUpdateHelper;
 use Deployer\Component\Pimple\Container;
-use Deployer\ProcessRunner\Printer;
+use Deployer\Logger\Logger;
 use Deployer\ProcessRunner\ProcessRunner;
 use Deployer\Ssh\SshClient;
-use Deployer\Configuration;
 use Deployer\Executor\Master;
 use Deployer\Executor\Messenger;
 use Deployer\Host\Host;
@@ -63,7 +62,7 @@
  * @property Selector $selector
  * @property Master $master
  * @property Messenger $messenger
- * @property Printer $pop
+ * @property Logger $logger
  * @property Collection $fail
  * @property InputDefinition $inputDefinition
  * @property Importer $importer
@@ -127,17 +126,17 @@ public function __construct(Application $console)
                 ? new FileHandler($this['log'])
                 : new NullHandler();
         };
-        $this['pop'] = function ($c) {
-            return new Printer($c['output'], $this['logHandler']);
+        $this['logger'] = function ($c) {
+            return new Logger($c['output'], $this['logHandler']);
         };
         $this['sshClient'] = function ($c) {
-            return new SshClient($c['output'], $c['pop']);
+            return new SshClient($c['output'], $c['logger']);
         };
         $this['rsync'] = function ($c) {
-            return new Rsync($c['pop'], $c['output']);
+            return new Rsync($c['output'], $c['logger']);
         };
         $this['processRunner'] = function ($c) {
-            return new ProcessRunner($c['pop']);
+            return new ProcessRunner($c['logger']);
         };
         $this['tasks'] = function () {
             return new TaskCollection();

src/ProcessRunner/Printer.php src/Logger/Logger.phpsrc/ProcessRunner/Printer.php renamed to src/Logger/Logger.php

@@ -8,13 +8,13 @@
  * file that was distributed with this source code.
  */
 
-namespace Deployer\ProcessRunner;
+namespace Deployer\Logger;
 
 use Deployer\Host\Host;
 use Deployer\Logger\Handler\HandlerInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
-class Printer
+class Logger
 {
     private OutputInterface $output;
     private HandlerInterface $log;

src/ProcessRunner/ProcessRunner.php

@@ -13,29 +13,29 @@
 use Deployer\Exception\RunException;
 use Deployer\Exception\TimeoutException;
 use Deployer\Host\Host;
+use Deployer\Logger\Logger;
 use Deployer\Ssh\RunParams;
 use Symfony\Component\Process\Exception\ProcessFailedException;
 use Symfony\Component\Process\Exception\ProcessTimedOutException;
 use Symfony\Component\Process\Process;
-
 use function Deployer\Support\deployer_root;
 use function Deployer\Support\env_stringify;
 use function Deployer\Support\replace_secrets;
 
 class ProcessRunner
 {
-    private Printer $pop;
+    private Logger $logger;
 
-    public function __construct(Printer $pop)
+    public function __construct(Logger $logger)
     {
-        $this->pop = $pop;
+        $this->logger = $logger;
     }
 
     public function run(Host $host, string $command, RunParams $params): string
     {
-        $this->pop->command($host, 'run', $command);
+        $this->logger->command($host, 'run', $command);
 
-        $terminalOutput = $this->pop->callback($host, $params->forceOutput);
+        $terminalOutput = $this->logger->callback($host, $params->forceOutput);
         $callback = function ($type, $buffer) use ($host, $terminalOutput) {
             $terminalOutput($type, $buffer);
         };

src/Ssh/SshClient.php

@@ -10,26 +10,25 @@
 
 namespace Deployer\Ssh;
 
-use Deployer\ProcessRunner\Printer;
 use Deployer\Exception\RunException;
 use Deployer\Exception\TimeoutException;
 use Deployer\Host\Host;
+use Deployer\Logger\Logger;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Process\Exception\ProcessTimedOutException;
 use Symfony\Component\Process\Process;
-
 use function Deployer\Support\env_stringify;
 use function Deployer\Support\replace_secrets;
 
 class SshClient
 {
     private OutputInterface $output;
-    private Printer $pop;
+    private Logger $logger;
 
-    public function __construct(OutputInterface $output, Printer $pop)
+    public function __construct(OutputInterface $output, Logger $logger)
     {
         $this->output = $output;
-        $this->pop = $pop;
+        $this->logger = $logger;
     }
 
     public function run(Host $host, string $command, RunParams $params): string
@@ -60,7 +59,7 @@ public function run(Host $host, string $command, RunParams $params): string
             $command = "export $env; $command";
         }
 
-        $this->pop->command($host, 'run', $command);
+        $this->logger->command($host, 'run', $command);
 
         $process = new Process($ssh);
         $process
@@ -69,7 +68,7 @@ public function run(Host $host, string $command, RunParams $params): string
             ->setIdleTimeout($params->idleTimeout);
 
         $callback = function ($type, $buffer) use ($params, $host) {
-            $this->pop->callback($host, $params->forceOutput)($type, $buffer);
+            $this->logger->callback($host, $params->forceOutput)($type, $buffer);
         };
 
         try {

src/Utility/Rsync.php

@@ -10,31 +10,24 @@
 
 namespace Deployer\Utility;
 
-use Deployer\ProcessRunner\Printer;
 use Deployer\Exception\RunException;
 use Deployer\Host\Host;
+use Deployer\Logger\Logger;
 use Symfony\Component\Console\Helper\ProgressBar;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Process\Exception\ProcessFailedException;
 use Symfony\Component\Process\Process;
-
 use function Deployer\writeln;
 
 class Rsync
 {
-    /**
-     * @var Printer
-     */
-    private $pop;
-    /**
-     * @var OutputInterface
-     */
-    private $output;
+    private OutputInterface $output;
+    private Logger $logger;
 
-    public function __construct(Printer $pop, OutputInterface $output)
+    public function __construct(OutputInterface $output, Logger $logger)
     {
-        $this->pop = $pop;
         $this->output = $output;
+        $this->logger = $logger;
     }
 
     /**
@@ -113,7 +106,7 @@ function (string $value) {
                 return;
             }
             if ($this->output->isVerbose()) {
-                $this->pop->printBuffer($type, $host, $buffer);
+                $this->logger->printBuffer($type, $host, $buffer);
             }
         };