Skip to content
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
40 changes: 10 additions & 30 deletions .github/workflows/continuous-integration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,42 +9,22 @@ 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', '7.0']
php-version: ['8.2', '8.3', '8.4', '8.5']
symfony-version: ['5.4', '6.4', '7.3', '7.4', '8.0']
test-options: ['']
coverage: [false]
include:
- php-version: '8.1'
- php-version: '8.2'
symfony-version: '5.4'
coverage: true
test-options: '-with-coverage'
- php-version: '8.1'
symfony-version: '5.4'
exclude:
- php-version: '7.4'
symfony-version: '6.0'
- php-version: '7.4'
symfony-version: '6.1'
- php-version: '7.4'
symfony-version: '6.2'
- php-version: '7.4'
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'
symfony-version: '6.2'
- php-version: '8.0'
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'
- php-version: '8.2'
symfony-version: '8.0'
- php-version: '8.3'
symfony-version: '8.0'
- php-version: '8.5'
symfony-version: '5.4'

steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -90,7 +70,7 @@ jobs:
run: |
echo ${{ github.event.number }} > pull-request-number

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
if: ${{ matrix.coverage == true }}
with:
name: coverage
Expand Down
6 changes: 2 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,8 @@ 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 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
ifeq ($(filter $(version),7.0 7.1 7.2 7.3 7.4 8.0),)
sed -i -e "s/\(\s\+\)\(with_constructor_extractor:\)/\1# \2/" tests/Functional/App/config.yaml
endif

composer global config --no-plugins allow-plugins.symfony/flex true
Expand Down
30 changes: 15 additions & 15 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,32 +10,32 @@
}
],
"require": {
"php": "^7.4 || ^8.0",
"php": "^8.2",
"ext-json": "*",
"justinrainbow/json-schema": "^5.2",
"league/uri": "^6.3",
"seld/jsonlint": "^1.7",
"symfony/config": "^5.4 || ^6.0 || ^7.0",
"symfony/dependency-injection": "^5.4 || ^6.0 || ^7.0",
"symfony/config": "^5.4 || ^6.0 || ^7.0 || ^8.0",
"symfony/dependency-injection": "^5.4 || ^6.0 || ^7.0 || ^8.0",
"symfony/deprecation-contracts": "^2.5 || ^3.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"
"symfony/event-dispatcher": "^5.4 || ^6.0 || ^7.0 || ^8.0",
"symfony/framework-bundle": "^5.4 || ^6.0 || ^7.0 || ^8.0",
"symfony/http-foundation": "^5.4 || ^6.0 || ^7.0 || ^8.0",
"symfony/http-kernel": "^5.4 || ^6.0 || ^7.0 || ^8.0",
"symfony/property-access": "^5.4 || ^6.0 || ^7.0 || ^8.0",
"symfony/routing": "^5.4 || ^6.0 || ^7.0 || ^8.0",
"symfony/serializer": "^5.4 || ^6.0 || ^7.0 || ^8.0",
"symfony/yaml": "^5.4 || ^6.0 || ^7.0 || ^8.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 || ^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"
"symfony/browser-kit": "^5.4 || ^6.0 || ^7.0 || ^8.0",
"symfony/phpunit-bridge": "^5.4 || ^6.0 || ^7.0 || ^8.0",
"symfony/process": "^5.4 || ^6.0 || ^7.0 || ^8.0",
"symfony/security-bundle": "^5.4 || ^6.0 || ^7.0 || ^8.0"
},
"autoload": {
"psr-4": {
Expand Down
Loading
Loading