Implemented Logger in HttpAdapter and SshAdapter

Author: zeroSal

src/Adapter/Http/HttpAdapter.php

@@ -4,6 +4,8 @@
 
 use GuzzleHttp\Client;
 use GuzzleHttp\Exception\GuzzleException;
+use Psr\Log\LoggerInterface;
+use Psr\Log\NullLogger;
 use Sal\Seven\Model\Http\Authentication\HttpAuthentication;
 use Sal\Seven\Model\Http\Authentication\HttpAuthenticationType;
 use Sal\Seven\Model\Http\Authentication\HttpBasicAuthentication;
@@ -28,9 +30,17 @@ class HttpAdapter implements HttpAdapterInterface
     /** @var ?string[] */
     private ?array $strictResolveList = null;
 
+    private LoggerInterface $logger;
+
     public function __construct(
         private readonly Client $client,
     ) {
+        $this->logger = new NullLogger();
+    }
+
+    public function setLogger(LoggerInterface $logger): void
+    {
+        $this->logger = $logger;
     }
 
     /**
@@ -100,6 +110,12 @@ public function get(string $uri): HttpResponse
     {
         $options = $this->buildOptions();
         $uri = empty($this->baseUri) ? $uri : "{$this->baseUri}{$uri}";
+
+        $this->logger->debug('GET', [
+            'uri' => $uri,
+            'options' => $options,
+        ]);
+
         $response = $this->client->get($uri, $options);
 
         return new HttpResponse(
@@ -138,6 +154,11 @@ public function post(string $uri, array $parameters = [], ?string $json = null):
             $options
         );
 
+        $this->logger->debug('POST', [
+            'uri' => $uri,
+            'options' => $options,
+        ]);
+
         $response = $this->client->post($uri, $options);
 
         return new HttpResponse(
@@ -153,6 +174,12 @@ public function delete(string $uri): HttpResponse
     {
         $options = $this->buildOptions();
         $uri = empty($this->baseUri) ? $uri : "{$this->baseUri}{$uri}";
+
+        $this->logger->debug('DELETE', [
+            'uri' => $uri,
+            'options' => $options,
+        ]);
+
         $response = $this->client->delete($uri, $options);
 
         return new HttpResponse(
@@ -194,6 +221,11 @@ public function put(string $uri, array $parameters = [], ?string $json = null):
             $options
         );
 
+        $this->logger->debug('PUT', [
+            'uri' => $uri,
+            'options' => $options,
+        ]);
+
         $response = $this->client->put($uri, $options);
 
         return new HttpResponse(

src/Adapter/Http/HttpAdapterInterface.php

@@ -3,6 +3,7 @@
 namespace Sal\Seven\Adapter\Http;
 
 use GuzzleHttp\Exception\GuzzleException;
+use Psr\Log\LoggerAwareInterface;
 use Sal\Seven\Model\Http\Authentication\HttpAuthentication;
 use Sal\Seven\Model\Http\Header\HttpHeader;
 use Sal\Seven\Model\Http\HttpParameter;
@@ -11,7 +12,7 @@
 /**
  * @author Luca Saladino <sal65535@protonmail.com>
  */
-interface HttpAdapterInterface
+interface HttpAdapterInterface extends LoggerAwareInterface
 {
     /**
      * @throws GuzzleException

src/Adapter/Ssh/SshAdapter.php

@@ -2,6 +2,8 @@
 
 namespace Sal\Seven\Adapter\Ssh;
 
+use Psr\Log\LoggerInterface;
+use Psr\Log\NullLogger;
 use Sal\Seven\Model\CommandResult;
 use Sal\Seven\Model\File;
 use Symfony\Component\Process\Exception\ProcessTimedOutException;
@@ -20,8 +22,12 @@ class SshAdapter implements SshAdapterInterface
     private string $user = 'root';
     private ?int $timeout = 60;
 
+    private LoggerInterface $logger;
+
     public function __construct()
     {
+        $this->logger = new NullLogger();
+
         $this->options = [
             '-o', 'ControlMaster=auto',
             '-o', 'ControlPath=/tmp/php-seven-ssh-%C',
@@ -32,6 +38,11 @@ public function __construct()
         ];
     }
 
+    public function setLogger(LoggerInterface $logger): void
+    {
+        $this->logger = $logger;
+    }
+
     public function setHost(string $host): void
     {
         $this->host = $host;
@@ -84,6 +95,8 @@ public function secureCopyFileDownload(
             ["{$this->user}@{$this->host}:$sourceFilePath", $destinationFolder]
         );
 
+        $this->logger->debug(implode(' ', $commandLine));
+
         $proc = new Process($commandLine);
         $proc->setTimeout($timeout);
         $proc->run();
@@ -120,6 +133,8 @@ public function secureCopyFileUpload(
             [$sourceFilePath, "{$this->user}@{$this->host}:$destinationFolder/"]
         );
 
+        $this->logger->debug(implode(' ', $commandLine));
+
         $proc = new Process($commandLine);
         $proc->setTimeout($timeout);
         $proc->run();
@@ -170,6 +185,8 @@ public function runCommand(
             [(new Process($command))->getCommandLine()]
         );
 
+        $this->logger->debug(implode(' ', $commandLine));
+
         $proc = new Process($commandLine);
 
         if (null !== $pipedInput) {
@@ -201,6 +218,8 @@ public function waitForSshLogin(): void
             ["{$this->user}@$this->host"]
         );
 
+        $this->logger->debug(implode(' ', $commandLine));
+
         $process = new Process($commandLine);
         $process->setTimeout(null);
         do {

src/Adapter/Ssh/SshAdapterInterface.php

@@ -2,14 +2,15 @@
 
 namespace Sal\Seven\Adapter\Ssh;
 
+use Psr\Log\LoggerAwareInterface;
 use Sal\Seven\Model\CommandResult;
 use Sal\Seven\Model\File;
 use Symfony\Component\Process\Exception\ProcessTimedOutException;
 
 /**
  * @author Luca Saladino <sal65535@protonmail.com>
  */
-interface SshAdapterInterface
+interface SshAdapterInterface extends LoggerAwareInterface
 {
     public function setHost(string $host): void;