Skip to content

Commit 0d1e33f

Browse files
TASK: Make surf psr-3 compatible (#770)
* TASK: Make surf psr-3 compatible * Apply php-cs-fixer changes --------- Co-authored-by: sabbelasichon <sabbelasichon@users.noreply.github.com>
1 parent 5daa5b6 commit 0d1e33f

File tree

5 files changed

+27
-46
lines changed

5 files changed

+27
-46
lines changed

.github/workflows/tests.yaml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,9 @@ jobs:
2626
runs-on: ubuntu-latest
2727
strategy:
2828
matrix:
29-
php: ['7.4', '8.0', '8.1']
30-
dependencies: ['locked', 'latest']
29+
php: ['7.4', '8.0', '8.1', '8.2']
3130

32-
name: PHP ${{ matrix.php }} unittests with ${{ matrix.dependencies }} deps
31+
name: PHP ${{ matrix.php }} unittests
3332
steps:
3433
- uses: actions/checkout@v3
3534

@@ -50,7 +49,4 @@ jobs:
5049

5150
- run: composer install --no-interaction --no-suggest --no-progress
5251

53-
- run: composer update --no-interaction --no-suggest --no-progress
54-
if: matrix.dependencies == 'latest'
55-
5652
- run: vendor/bin/phpunit

composer.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,6 @@
3838
},
3939
"config": {
4040
"optimize-autoloader": true,
41-
"platform": {
42-
"php": "7.4"
43-
},
4441
"sort-packages": true,
4542
"allow-plugins": {
4643
"phpstan/extension-installer": true,

composer.lock

Lines changed: 22 additions & 29 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Domain/Model/Deployment.php

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
use Symfony\Component\DependencyInjection\ContainerAwareTrait;
1919
use TYPO3\Surf\Domain\Enum\DeploymentStatus;
2020
use TYPO3\Surf\Exception as SurfException;
21+
use TYPO3\Surf\Integration\LoggerAwareTrait;
2122
use UnexpectedValueException;
2223

2324
/**
@@ -26,6 +27,7 @@
2627
*/
2728
class Deployment implements LoggerAwareInterface, ContainerAwareInterface
2829
{
30+
use LoggerAwareTrait;
2931
use ContainerAwareTrait;
3032

3133
/**
@@ -285,13 +287,6 @@ public function setWorkflow(Workflow $workflow): self
285287
return $this;
286288
}
287289

288-
public function setLogger(LoggerInterface $logger): self
289-
{
290-
$this->logger = $logger;
291-
292-
return $this;
293-
}
294-
295290
/**
296291
* Get the deployment release identifier
297292
*

src/Integration/LoggerAwareTrait.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ trait LoggerAwareTrait
1717
{
1818
protected LoggerInterface $logger;
1919

20-
public function setLogger(LoggerInterface $logger)
20+
public function setLogger(LoggerInterface $logger): void
2121
{
2222
$this->logger = $logger;
2323
}

0 commit comments

Comments
 (0)