TASK: Fix logger

Resources/services.php

@@ -33,7 +33,7 @@
 
     $parameters->set('name', 'TYPO3 Surf');
 
-    $parameters->set('version', '3.3.6');
+    $parameters->set('version', '3.3.7');
 
     $services = $containerConfigurator->services();
 

src/Domain/Model/Task.php

@@ -12,8 +12,6 @@
 namespace TYPO3\Surf\Domain\Model;
 
 use Psr\Log\LoggerAwareInterface;
-use Psr\Log\LoggerAwareTrait;
-use Psr\Log\LoggerInterface;
 use Symfony\Component\OptionsResolver\Exception\ExceptionInterface;
 use Symfony\Component\OptionsResolver\Exception\InvalidOptionsException;
 use Symfony\Component\OptionsResolver\Exception\MissingOptionsException;
@@ -23,16 +21,12 @@
 use Symfony\Component\OptionsResolver\Exception\UndefinedOptionsException;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use TYPO3\Surf\Exception\InvalidConfigurationException;
+use TYPO3\Surf\Integration\LoggerAwareTrait;
 
 abstract class Task implements LoggerAwareInterface
 {
     use LoggerAwareTrait;
 
-    /**
-     * @var LoggerInterface
-     */
-    protected $logger;
-
     /**
      * @return mixed|void
      */

src/Domain/Model/Workflow.php

@@ -12,11 +12,11 @@
 namespace TYPO3\Surf\Domain\Model;
 
 use Psr\Log\LoggerAwareInterface;
-use Psr\Log\LoggerAwareTrait;
-use Psr\Log\LoggerInterface;
+use Psr\Log\NullLogger;
 use TYPO3\Surf\Domain\Service\TaskManager;
 use TYPO3\Surf\Exception as SurfException;
 use TYPO3\Surf\Exception\TaskExecutionException;
+use TYPO3\Surf\Integration\LoggerAwareTrait;
 
 /**
  * A Workflow
@@ -25,16 +25,13 @@ abstract class Workflow implements LoggerAwareInterface
 {
     use LoggerAwareTrait;
 
-    /**
-     * @var LoggerInterface
-     */
-    protected $logger;
     protected TaskManager $taskManager;
 
     protected array $tasks = [];
 
     public function __construct(TaskManager $taskManager)
     {
+        $this->logger = new NullLogger();
         $this->taskManager = $taskManager;
     }
 

src/Domain/Service/ShellCommandService.php

@@ -15,24 +15,25 @@
 use Neos\Utility\Files;
 use Phar;
 use Psr\Log\LoggerAwareInterface;
-use Psr\Log\LoggerAwareTrait;
+use Psr\Log\NullLogger;
 use Symfony\Component\Process\Process;
 use TYPO3\Surf\Domain\Model\Deployment;
 use TYPO3\Surf\Domain\Model\Node;
 use TYPO3\Surf\Exception\TaskExecutionException;
+use TYPO3\Surf\Integration\LoggerAwareTrait;
 
 /**
  * A shell command service
  */
 class ShellCommandService implements LoggerAwareInterface
 {
-    /**
-     * @var Logger
-     */
-    protected $logger;
-
     use LoggerAwareTrait;
 
+    public function __construct()
+    {
+        $this->logger = new NullLogger();
+    }
+
     /**
      * Execute a shell command (locally or remote depending on the node hostname)
      *

src/Domain/Service/TaskManager.php

@@ -12,12 +12,12 @@
 namespace TYPO3\Surf\Domain\Service;
 
 use Psr\Log\LoggerAwareInterface;
-use Psr\Log\LoggerAwareTrait;
-use Psr\Log\LoggerInterface;
+use Psr\Log\NullLogger;
 use TYPO3\Surf\Domain\Model\Application;
 use TYPO3\Surf\Domain\Model\Deployment;
 use TYPO3\Surf\Domain\Model\Node;
 use TYPO3\Surf\Domain\Model\TaskInHistory;
+use TYPO3\Surf\Integration\LoggerAwareTrait;
 
 /**
  * @final
@@ -26,11 +26,6 @@ class TaskManager implements LoggerAwareInterface
 {
     use LoggerAwareTrait;
 
-    /**
-     * @var LoggerInterface
-     */
-    protected $logger;
-
     /**
      * @var TaskInHistory[]
      */
@@ -40,6 +35,7 @@ class TaskManager implements LoggerAwareInterface
 
     public function __construct(TaskFactory $taskFactory)
     {
+        $this->logger = new NullLogger();
         $this->taskFactory = $taskFactory;
     }
 

src/Integration/LoggerAwareTrait.php

@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace TYPO3\Surf\Integration;
+
+use Psr\Log\LoggerInterface;
+
+trait LoggerAwareTrait
+{
+    protected LoggerInterface $logger;
+
+    public function setLogger(LoggerInterface $logger)
+    {
+        $this->logger = $logger;
+    }
+}