TASK: Make surf psr-3 compatible (#770)

* TASK: Make surf psr-3 compatible * Apply php-cs-fixer changes --------- Co-authored-by: sabbelasichon <[email protected]>
TYPO3 · May 24, 2023 · 0d1e33f · 0d1e33f
1 parent 5daa5b6
commit 0d1e33f
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 46 deletions.
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -26,10 +26,9 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php: ['7.4', '8.0', '8.1']
-        dependencies: ['locked', 'latest']
+        php: ['7.4', '8.0', '8.1', '8.2']
 
-    name: PHP ${{ matrix.php }} unittests with ${{ matrix.dependencies }} deps
+    name: PHP ${{ matrix.php }} unittests
     steps:
       - uses: actions/checkout@v3
 
@@ -50,7 +49,4 @@ jobs:
 
       - run: composer install --no-interaction --no-suggest --no-progress
 
-      - run: composer update --no-interaction --no-suggest --no-progress
-        if: matrix.dependencies == 'latest'
-
       - run: vendor/bin/phpunit
diff --git a/composer.json b/composer.json
@@ -38,9 +38,6 @@
     },
     "config": {
         "optimize-autoloader": true,
-        "platform": {
-            "php": "7.4"
-        },
         "sort-packages": true,
         "allow-plugins": {
             "phpstan/extension-installer": true,

diff --git a/composer.lock b/composer.lock
diff --git a/src/Domain/Model/Deployment.php b/src/Domain/Model/Deployment.php
@@ -18,6 +18,7 @@
 use Symfony\Component\DependencyInjection\ContainerAwareTrait;
 use TYPO3\Surf\Domain\Enum\DeploymentStatus;
 use TYPO3\Surf\Exception as SurfException;
+use TYPO3\Surf\Integration\LoggerAwareTrait;
 use UnexpectedValueException;
 
 /**
@@ -26,6 +27,7 @@
  */
 class Deployment implements LoggerAwareInterface, ContainerAwareInterface
 {
+    use LoggerAwareTrait;
     use ContainerAwareTrait;
 
     /**
@@ -285,13 +287,6 @@ public function setWorkflow(Workflow $workflow): self
         return $this;
     }
 
-    public function setLogger(LoggerInterface $logger): self
-    {
-        $this->logger = $logger;
-
-        return $this;
-    }
-
     /**
      * Get the deployment release identifier
      *

diff --git a/src/Integration/LoggerAwareTrait.php b/src/Integration/LoggerAwareTrait.php
@@ -17,7 +17,7 @@ trait LoggerAwareTrait
 {
     protected LoggerInterface $logger;
 
-    public function setLogger(LoggerInterface $logger)
+    public function setLogger(LoggerInterface $logger): void
     {
         $this->logger = $logger;
     }