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

Add Symfony 7 support #92

Merged
merged 8 commits into from
Apr 9, 2024
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: 7 additions & 1 deletion .github/workflows/continuous-integration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
strategy:
matrix:
php-version: ['7.4', '8.0', '8.1', '8.2', '8.3']
symfony-version: ['5.4', '6.0', '6.1', '6.2', '6.3', '6.4']
symfony-version: ['5.4', '6.0', '6.1', '6.2', '6.3', '6.4', '7.0']
test-options: ['']
coverage: [false]
include:
Expand All @@ -31,6 +31,8 @@ jobs:
symfony-version: '6.3'
- php-version: '7.4'
symfony-version: '6.4'
- php-version: '7.4'
symfony-version: '7.0'
- php-version: '8.0'
symfony-version: '6.1'
- php-version: '8.0'
Expand All @@ -39,6 +41,10 @@ jobs:
symfony-version: '6.3'
- php-version: '8.0'
symfony-version: '6.4'
- php-version: '8.0'
symfony-version: '7.0'
- php-version: '8.1'
symfony-version: '7.0'

steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ ifeq ($(filter $(version),6.2 6.3 6.4),)
sed -i -e "s/\(\s\+\)\(handle_all_throwables:\)/\1# \2/" tests/Functional/App/config.yaml
endif

ifeq ($(filter $(version),5.3 5.4 6.0 6.1 6.2 6.3 6.4),)
ifeq ($(filter $(version),5.3 5.4 6.0 6.1 6.2 6.3 6.4 7.0),)
sed -i -e "s/\(\s\+\)# \(storage_id:\)/\1\2/" tests/Functional/App/config.yaml
sed -i -e "s/\(\s\+\)\(storage_factory_id:\)/\1# \2/" tests/Functional/App/config.yaml
sed -i -e "s/\(\s\+\)\(lazy:\)/\1# \2/" tests/Functional/App/config.yaml
Expand Down
28 changes: 14 additions & 14 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,27 +15,27 @@
"justinrainbow/json-schema": "^5.2",
"league/uri": "^6.3",
"seld/jsonlint": "^1.7",
"symfony/config": "^5.4 || ^6.0",
"symfony/dependency-injection": "^5.4 || ^6.0",
"symfony/config": "^5.4 || ^6.0 || ^7.0",
"symfony/dependency-injection": "^5.4 || ^6.0 || ^7.0",
"symfony/deprecation-contracts": "^2.5 || ^3.0",
"symfony/event-dispatcher": "^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/property-access": "^5.4 || ^6.0",
"symfony/routing": "^5.4 || ^6.0",
"symfony/serializer": "^5.4 || ^6.0",
"symfony/yaml": "^5.4 || ^6.0"
"symfony/event-dispatcher": "^5.4 || ^6.0 || ^7.0",
"symfony/framework-bundle": "^5.4 || ^6.0 || ^7.0",
"symfony/http-foundation": "^5.4 || ^6.0 || ^7.0",
"symfony/http-kernel": "^5.4 || ^6.0 || ^7.0",
"symfony/property-access": "^5.4 || ^6.0 || ^7.0",
"symfony/routing": "^5.4 || ^6.0 || ^7.0",
"symfony/serializer": "^5.4 || ^6.0 || ^7.0",
"symfony/yaml": "^5.4 || ^6.0 || ^7.0"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^3.0",
"masterminds/html5": "^2.7",
"monolog/monolog": "^1.27 || ^2.6 || ^3.0",
"phpunit/phpunit": "^9.6",
"symfony/browser-kit": "^5.4 || ^6.0",
"symfony/phpunit-bridge": "^5.4 || ^6.0",
"symfony/process": "^5.4 || ^6.0",
"symfony/security-bundle": "^5.4 || ^6.0"
"symfony/browser-kit": "^5.4 || ^6.0 || ^7.0",
"symfony/phpunit-bridge": "^5.4 || ^6.0 || ^7.0",
"symfony/process": "^5.4 || ^6.0 || ^7.0",
"symfony/security-bundle": "^5.4 || ^6.0 || ^7.0"
},
"autoload": {
"psr-4": {
Expand Down
Loading
Loading