Skip to content

Commit

Permalink
TASK: Make surf psr-3 compatible (#770)
Browse files Browse the repository at this point in the history
* TASK: Make surf psr-3 compatible

* Apply php-cs-fixer changes

---------

Co-authored-by: sabbelasichon <sabbelasichon@users.noreply.github.com>
  • Loading branch information
sabbelasichon and sabbelasichon authored May 24, 2023
1 parent 5daa5b6 commit 0d1e33f
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 46 deletions.
8 changes: 2 additions & 6 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
3 changes: 0 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,6 @@
},
"config": {
"optimize-autoloader": true,
"platform": {
"php": "7.4"
},
"sort-packages": true,
"allow-plugins": {
"phpstan/extension-installer": true,
Expand Down
51 changes: 22 additions & 29 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 2 additions & 7 deletions src/Domain/Model/Deployment.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand All @@ -26,6 +27,7 @@
*/
class Deployment implements LoggerAwareInterface, ContainerAwareInterface
{
use LoggerAwareTrait;
use ContainerAwareTrait;

/**
Expand Down Expand Up @@ -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
*
Expand Down
2 changes: 1 addition & 1 deletion src/Integration/LoggerAwareTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ trait LoggerAwareTrait
{
protected LoggerInterface $logger;

public function setLogger(LoggerInterface $logger)
public function setLogger(LoggerInterface $logger): void
{
$this->logger = $logger;
}
Expand Down

0 comments on commit 0d1e33f

Please sign in to comment.