Skip to content

Commit 83e1caf

Browse files
committed
Merge branch '2.x' into 'master'
* Add PHP 8.4 tests * Remove Symfony 7.0 support * Remove Symfony 7.0 support (update composer.json) * Add Symfony 7.2 tests
2 parents 97124aa + 0801a0a commit 83e1caf

File tree

2 files changed

+24
-26
lines changed

2 files changed

+24
-26
lines changed

.github/workflows/tests.yml

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,42 +18,40 @@ jobs:
1818
symfony-version: '6.4.*'
1919
composer-flags: '--prefer-stable --prefer-lowest'
2020
description: 'with SF 6.4.* lowest'
21-
- php-version: '8.2'
22-
symfony-version: '7.0.*'
23-
composer-flags: '--prefer-stable --prefer-lowest'
24-
description: 'with SF 7.0.* lowest'
2521
- php-version: '8.2'
2622
symfony-version: '7.1.*'
2723
composer-flags: '--prefer-stable --prefer-lowest'
2824
description: 'with SF 7.1.* lowest'
25+
- php-version: '8.2'
26+
symfony-version: '7.2.*'
27+
composer-flags: '--prefer-stable --prefer-lowest'
28+
description: 'with SF 7.2.* lowest'
2929

3030
#Symfony versions
31-
- php-version: '8.3'
31+
- php-version: '8.4'
3232
symfony-version: '6.4.*'
3333
description: 'with SF 6.4.*'
34-
- php-version: '8.3'
34+
- php-version: '8.4'
3535
symfony-version: '6.4.*@dev'
3636
description: 'with SF 6.4.* dev'
37-
- php-version: '8.3'
38-
symfony-version: '7.0.*'
39-
description: 'with SF 7.0.*'
40-
- php-version: '8.3'
41-
symfony-version: '7.0.*@dev'
42-
description: 'with SF 7.0.* dev'
43-
- php-version: '8.3'
37+
- php-version: '8.4'
4438
symfony-version: '7.1.*'
4539
description: 'with SF 7.1.*'
46-
- php-version: '8.3'
40+
- php-version: '8.4'
4741
symfony-version: '7.1.*@dev'
4842
description: 'with SF 7.1.* dev'
49-
- php-version: '8.3'
43+
- php-version: '8.4'
44+
symfony-version: '7.2.*'
45+
description: 'with SF 7.2.*'
46+
- php-version: '8.4'
5047
symfony-version: '7.2.*@dev'
5148
description: 'with SF 7.2.* dev'
5249

5350
#PHP versions
5451
- php-version: '8.1'
5552
- php-version: '8.2'
5653
- php-version: '8.3'
54+
- php-version: '8.4'
5755

5856
#CS
5957
- php-version: '8.2'

composer.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@
3030
"doctrine/orm": "^3.2",
3131
"doctrine/persistence": "^3.1",
3232
"nikic/php-parser": "^4.10|^5.0",
33-
"symfony/config": "^6.4|^7.0",
34-
"symfony/console": "^6.4|^7.0",
35-
"symfony/dependency-injection": "^6.4|^7.0",
36-
"symfony/doctrine-bridge": "^6.4|^7.0",
37-
"symfony/framework-bundle": "^6.4|^7.0",
38-
"symfony/http-kernel": "^6.4|^7.0",
39-
"symfony/property-info": "^6.4|^7.0",
40-
"symfony/twig-bundle": "^6.4|^7.0",
33+
"symfony/config": "^6.4|^7.1",
34+
"symfony/console": "^6.4|^7.1",
35+
"symfony/dependency-injection": "^6.4|^7.1",
36+
"symfony/doctrine-bridge": "^6.4|^7.1",
37+
"symfony/framework-bundle": "^6.4|^7.1",
38+
"symfony/http-kernel": "^6.4|^7.1",
39+
"symfony/property-info": "^6.4|^7.1",
40+
"symfony/twig-bundle": "^6.4|^7.1",
4141
"twig/twig": "^2.12.0|^3.0"
4242
},
4343
"require-dev": {
@@ -47,9 +47,9 @@
4747
"phpstan/phpstan": "^1.9",
4848
"phpstan/phpstan-symfony": "^1.2",
4949
"phpunit/phpunit": "^9.5",
50-
"symfony/filesystem": "^6.4|^7.0",
51-
"symfony/finder": "^6.4|^7.0",
52-
"symfony/yaml": "^6.4|^7.0"
50+
"symfony/filesystem": "^6.4|^7.1",
51+
"symfony/finder": "^6.4|^7.1",
52+
"symfony/yaml": "^6.4|^7.1"
5353
},
5454
"config": {
5555
"sort-packages": true,

0 commit comments

Comments
 (0)