Skip to content

Commit 26eed5c

Browse files
authored
Merge pull request #146 from WandiParis/stable
chore: symfony 6 support
2 parents 617e44d + ddb0830 commit 26eed5c

File tree

2 files changed

+21
-13
lines changed

2 files changed

+21
-13
lines changed

.github/workflows/continuous-integration.yml

+9-1
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,16 @@ jobs:
5151
dependency-versions: "${{ matrix.dependencies }}"
5252
composer-options: "${{ inputs.composer-options }}"
5353

54-
- name: "Run PHPUnit"
54+
- name: "Run PHPUnit for PHP 7x"
55+
if: "${{ startsWith(matrix.php-version, '7') }}"
5556
run: >
5657
SYMFONY_DEPRECATIONS_HELPER="max[self]=0"
5758
SYMFONY_PHPUNIT_VERSION=8.5.13
5859
vendor/bin/simple-phpunit
60+
61+
- name: "Run PHPUnit for PHP 8.0"
62+
if: "${{ ! startsWith(matrix.php-version, '7') }}"
63+
run: >
64+
SYMFONY_DEPRECATIONS_HELPER="max[self]=0"
65+
SYMFONY_PHPUNIT_VERSION=9.5.28
66+
vendor/bin/simple-phpunit

composer.json

+12-12
Original file line numberDiff line numberDiff line change
@@ -25,22 +25,22 @@
2525
"doctrine/inflector": "^1.4 || ^2.0"
2626
},
2727
"conflict": {
28-
"symfony/form": "<3.2 || >=6.0 <999",
29-
"symfony/validator": "<3.2 || >=6.0 <999"
28+
"symfony/form": "<3.2 || >=7.0 <999",
29+
"symfony/validator": "<3.2 || >=7.0 <999"
3030
},
3131
"require-dev": {
3232
"matthiasnoback/symfony-dependency-injection-test": "^4.0",
33-
"symfony/config": "^4.2 || ^5.0",
34-
"symfony/dependency-injection": "^4.2 || ^5.0",
35-
"symfony/form": "^4.2.5 || ^5.0",
36-
"symfony/framework-bundle": "^4.2 || ^5.0",
37-
"symfony/http-kernel": "^4.2 || ^5.1.5",
38-
"symfony/options-resolver": "^4.2 || ^5.0",
39-
"symfony/phpunit-bridge": "^5.0",
40-
"symfony/translation": "^4.2 || ^5.0",
33+
"symfony/config": "^4.2 || ^5.0 || ^6.0",
34+
"symfony/dependency-injection": "^4.2 || ^5.0 || ^6.0",
35+
"symfony/form": "^4.2.5 || ^5.0 || ^6.0",
36+
"symfony/framework-bundle": "^4.2 || ^5.0 || ^6.0",
37+
"symfony/http-kernel": "^4.2 || ^5.1.5 || ^6.0",
38+
"symfony/options-resolver": "^4.2 || ^5.0 || ^6.0",
39+
"symfony/phpunit-bridge": "^5.0 || ^6.0",
40+
"symfony/translation": "^4.2 || ^5.0 || ^6.0",
4141
"symfony/translation-contracts": "^2.0",
42-
"symfony/twig-bundle": "^4.2 || ^5.0",
43-
"symfony/validator": "^4.3.6 || ^5.0",
42+
"symfony/twig-bundle": "^4.2 || ^5.0 || ^6.0",
43+
"symfony/validator": "^4.3.6 || ^5.0 || ^6.0",
4444
"twig/twig": "^2.4.2 || ^3.0"
4545
},
4646
"suggest": {

0 commit comments

Comments
 (0)