Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

TASK: Make surf psr-3 compatible #770

Merged
merged 3 commits into from
May 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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