Skip to content

Commit 8d211c7

Browse files
committed
feature: fully support symfony 7.x
1 parent f5468bf commit 8d211c7

File tree

2 files changed

+23
-22
lines changed

2 files changed

+23
-22
lines changed

.github/workflows/continuous-integration.yaml

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,32 +6,28 @@ on:
66

77
concurrency:
88
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
9-
cancel-in-progress: true
109

1110
jobs:
1211
build-test:
1312
runs-on: ubuntu-latest
14-
name: 'PHPUnit (PHP ${{ matrix.php }}, Symfony ${{ matrix.symfony }} + ${{ matrix.dependencies }} deps, ES ${{ matrix.elasticsearch }})'
13+
name: 'PHPUnit (PHP ${{ matrix.php }}, Symfony ${{ matrix.symfony-version }} + ${{ matrix.dependencies }} deps)'
1514
env:
16-
SYMFONY_REQUIRE: "${{ matrix.symfony }}"
15+
SYMFONY_REQUIRE: "${{ matrix.symfony-version }}"
1716
strategy:
1817
matrix:
1918
php:
20-
- '7.4'
21-
- '8.0'
2219
- '8.1'
23-
- '8.2'
24-
symfony:
25-
- '5.4.*'
26-
- '6.3.*'
20+
- '8.4'
21+
symfony-version:
22+
- '^5.4'
23+
- '^6.4'
24+
- '^7.2'
2725
dependencies:
2826
- 'highest'
2927
include:
3028
- php: '7.4'
29+
symfony-version: '^5.0'
3130
dependencies: 'lowest'
32-
exclude:
33-
- php: '7.4'
34-
dependencies: 'highest'
3531
steps:
3632
- name: 'Checkout'
3733
uses: actions/checkout@v3
@@ -41,7 +37,7 @@ jobs:
4137
with:
4238
php-version: '${{ matrix.php }}'
4339
coverage: 'none'
44-
extensions: 'curl, json, intl, mbstring, mongodb, openssl'
40+
extensions: 'curl, json, intl, mbstring, mongodb, openssl'
4541

4642
- name: 'Install Composer dependencies'
4743
uses : 'ramsey/composer-install@v2'

composer.json

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
],
2626
"require": {
2727
"php": "^7.4 || ^8.0",
28-
"symfony/form": "^3.0 || ^4.0 || ^5.0 || ^6.0",
29-
"symfony/dependency-injection": "^3.0 || ^4.0 || ^5.0 || ^6.0",
28+
"symfony/form": "^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0",
29+
"symfony/dependency-injection": "^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0",
3030
"symfony/config": "^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0",
3131
"symfony/http-foundation": "^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0",
3232
"symfony/http-kernel": "^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0",
@@ -36,19 +36,19 @@
3636
"twig/twig": "^2.14 || ^3.0"
3737
},
3838
"require-dev": {
39-
"symfony/framework-bundle": "^4.3 || ^5.0 || ^6.0",
40-
"symfony/browser-kit": "^3.0 || ^4.0 || ^5.0 || ^6.0",
41-
"symfony/templating": "^3.0 || ^4.0 || ^5.0 || ^6.0",
42-
"symfony/expression-language": "^3.0 || ^4.0 || ^5.0 || ^6.0",
39+
"symfony/browser-kit": "^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0",
40+
"symfony/expression-language": "^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0",
41+
"symfony/flex": "^1.21 || ^2.4",
42+
"symfony/framework-bundle": "^4.3 || ^5.0 || ^6.0 || ^7.0",
43+
"symfony/security-bundle": "^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0",
44+
"symfony/twig-bundle": "^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0",
4345
"phpunit/phpunit": "^9.5",
44-
"friendsofphp/php-cs-fixer": "^2.0",
46+
"friendsofphp/php-cs-fixer": "^3.68",
4547
"php-coveralls/php-coveralls": "^2.0",
4648
"doctrine/orm": "~2.10,>=2.10.0",
4749
"doctrine/mongodb-odm": "^2.2",
4850
"rector/rector": "^0.12.13",
4951
"dg/bypass-finals": "^1.3",
50-
"symfony/security-bundle": "^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0",
51-
"symfony/twig-bundle": "^3.0 || ^4.0 || ^5.0",
5252
"doctrine/doctrine-bundle": "^2.5"
5353
},
5454
"suggest": {
@@ -59,6 +59,11 @@
5959
"doctrine/mongodb-odm": "If you want to use Document as source, please require doctrine/mongodb-odm",
6060
"jms/translation-bundle": "If you want to use translations"
6161
},
62+
"config": {
63+
"allow-plugins": {
64+
"symfony/flex": true
65+
}
66+
},
6267
"autoload": {
6368
"psr-4": { "APY\\DataGridBundle\\": "" }
6469
},

0 commit comments

Comments
 (0)