Skip to content

Commit

Permalink
Add symfony 6 support
Browse files Browse the repository at this point in the history
  • Loading branch information
core23 committed Dec 7, 2021
1 parent 7c62a26 commit 9e2a459
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 18 deletions.
4 changes: 4 additions & 0 deletions .github/settings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,12 @@ branches:
- "Static Code Analysis (8.1)"
- "Test (PHP 8, symfony 5.4, lowest)"
- "Test (PHP 8, symfony 5.4, highest)"
- "Test (PHP 8, symfony 6, lowest)"
- "Test (PHP 8, symfony 6, highest)"
- "Test (PHP 8.1, symfony 5.4, lowest)"
- "Test (PHP 8.1, symfony 5.4, highest)"
- "Test (PHP 8.1, symfony 6, lowest)"
- "Test (PHP 8.1, symfony 6, highest)"
- "Code Coverage (8.1)"
- "Mutation Tests (8.1)"
strict: true
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ jobs:

symfony:
- 5.4
- 6.0

steps:
- name: "Checkout"
Expand Down
30 changes: 15 additions & 15 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,30 +41,30 @@
"ext-json": "*",
"ext-soap": "*",
"nucleos/twig-extensions": "^2.0",
"psr/log": "^1.0 || ^2.0",
"psr/log": "^1.0 || ^2.0 || ^3.0",
"sonata-project/block-bundle": "^3.23.0 || ^4.5.1",
"sonata-project/doctrine-extensions": "^1.1",
"sonata-project/form-extensions": "^0.1.1 || ^1.4",
"symfony/config": "^5.4",
"symfony/console": "^5.4",
"symfony/dependency-injection": "^5.4",
"symfony/expression-language": "^5.4",
"symfony/form": "^5.4",
"symfony/framework-bundle": "^5.4",
"symfony/http-foundation": "^5.4",
"symfony/http-kernel": "^5.4",
"symfony/mailer": "^5.4",
"symfony/mime": "^5.4",
"symfony/options-resolver": "^5.4",
"symfony/translation-contracts": "^1.1 || ^2.0",
"symfony/twig-bridge": "^5.4",
"symfony/config": "^5.4 || ^6.0",
"symfony/console": "^5.4 || ^6.0",
"symfony/dependency-injection": "^5.4 || ^6.0",
"symfony/expression-language": "^5.4 || ^6.0",
"symfony/form": "^5.4 || ^6.0",
"symfony/framework-bundle": "^5.4 || ^6.0",
"symfony/http-foundation": "^5.4 || ^6.0",
"symfony/http-kernel": "^5.4 || ^6.0",
"symfony/mailer": "^5.4 || ^6.0",
"symfony/mime": "^5.4 || ^6.0",
"symfony/options-resolver": "^5.4 || ^6.0",
"symfony/translation-contracts": "^1.1 || ^2.0 || ^3.0",
"symfony/twig-bridge": "^5.4 || ^6.0",
"twig/intl-extra": "^2.4 || ^3.0",
"twig/twig": "^2.4 || ^3.0"
},
"require-dev": {
"bamarni/composer-bin-plugin": "^1.2",
"ergebnis/composer-normalize": "^2.0.1",
"symfony/browser-kit": "^5.4"
"symfony/browser-kit": "^5.4 || ^6.0"
},
"autoload": {
"psr-4": {
Expand Down
4 changes: 2 additions & 2 deletions src/Mailer/SymfonyMailer.php
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ public function sendSpaceWarning(AccountWarning $warning): bool
}

$mail = (new SpaceWarningMail())
->from(Address::fromString($this->emails['warning']['from']))
->to(Address::fromString($this->emails['warning']['to']))
->from(Address::create($this->emails['warning']['from']))
->to(Address::create($this->emails['warning']['to']))
->subject($this->translator->trans('space_warning.subject', [
'%account%' => $warning->getAccount(),
], 'NucleosAllInklBundle'))
Expand Down
2 changes: 1 addition & 1 deletion tests/App/config/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ framework:
translator: null

session:
storage_id: session.storage.mock_file
storage_factory_id: session.storage.factory.mock_file
handler_id: session.handler.native_file

mailer:
Expand Down

0 comments on commit 9e2a459

Please sign in to comment.