Skip to content

Commit 9846889

Browse files
authored
Merge pull request #496 from KnpLabs/chore/support-symfony-7
Add support symfony 7
2 parents 3db13fe + 1fdc936 commit 9846889

File tree

2 files changed

+33
-40
lines changed

2 files changed

+33
-40
lines changed

.github/workflows/build.yaml

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- name: Setup PHP
2424
uses: shivammathur/setup-php@v2
2525
with:
26-
php-version: '7.3'
26+
php-version: '8.1'
2727
- run: composer install --prefer-dist --no-interaction --no-progress --ansi
2828
- run: vendor/bin/php-cs-fixer fix --diff --dry-run --verbose
2929
tests:
@@ -32,29 +32,26 @@ jobs:
3232
fail-fast: false
3333
matrix:
3434
include:
35-
- description: 'Symfony 6.4 DEV'
35+
- description: 'Symfony 7.1 DEV'
3636
php: '8.2'
37-
symfony: '6.4.*@dev'
38-
- description: 'Symfony 6.3'
37+
symfony: '7.1.*@dev'
38+
- description: 'Symfony 7.0'
3939
php: '8.3'
40-
symfony: '6.3.*'
41-
- description: 'Symfony 6.3'
42-
php: '8.2'
43-
symfony: '6.3.*'
44-
- description: 'Symfony 6.0'
40+
symfony: '7.0.*'
41+
- description: 'Symfony 6.4'
4542
php: '8.1'
43+
symfony: '6.4.*'
44+
- description: 'Symfony 6.0'
45+
php: '8.3'
4646
symfony: '6.0.*'
47+
- description: 'Symfony 5.4'
48+
php: '8.1'
49+
symfony: '5.4.*'
4750
- description: 'Symfony 5.0'
48-
php: '7.3'
51+
php: '8.3'
4952
symfony: '5.0.*'
50-
- description: 'Symfony 4.4'
51-
php: '7.1'
52-
symfony: '4.3.*@dev'
53-
- description: 'Symfony 3.4'
54-
php: '7.3'
55-
symfony: '3.4.*'
5653
- description: 'Beta deps'
57-
php: '7.2'
54+
php: '8.1'
5855
beta: true
5956
name: PHP ${{ matrix.php }} tests (${{ matrix.description }})
6057
steps:
@@ -76,8 +73,8 @@ jobs:
7673
composer config minimum-stability dev
7774
composer config prefer-stable true
7875
if: matrix.beta
79-
- name: remove cs-fixer for Symfony 6
80-
if: contains(matrix.symfony, '6.4.*@dev')
76+
- name: remove cs-fixer for Symfony 7 (temporary as not-supported yet)
77+
if: contains(matrix.symfony, '7.1.*@dev') || contains(matrix.symfony, '7.0.*')
8178
run: |
8279
composer remove --dev friendsofphp/php-cs-fixer pedrotroller/php-cs-custom-fixer --no-update
8380
- run: composer update --prefer-dist --no-interaction --no-progress --ansi ${{ matrix.composer_option }}
@@ -89,15 +86,18 @@ jobs:
8986
fail-fast: false
9087
matrix:
9188
include:
92-
- description: 'Symfony 6.4 DEV'
89+
- description: 'Symfony 7.1 DEV'
9390
php: '8.2'
94-
symfony: '6.4.*@dev'
95-
- description: 'Symfony 6.3'
91+
symfony: '7.1.*@dev'
92+
- description: 'Symfony 7.0'
9693
php: '8.3'
97-
symfony: '6.3.*'
98-
- description: 'Symfony 6.3'
99-
php: '8.2'
100-
symfony: '6.3.*'
94+
symfony: '7.0.*'
95+
- description: 'Symfony 6.4'
96+
php: '8.1'
97+
symfony: '6.4.*'
98+
- description: 'Symfony 5.4'
99+
php: '8.1'
100+
symfony: '5.4.*'
101101
name: "[WINDOWS] PHP ${{ matrix.php }} tests (${{ matrix.description }})"
102102
steps:
103103
- name: Checkout
@@ -118,8 +118,8 @@ jobs:
118118
composer config minimum-stability dev
119119
composer config prefer-stable true
120120
if: matrix.beta
121-
- name: remove cs-fixer for Symfony 6
122-
if: contains(matrix.symfony, '6.4.*@dev')
121+
- name: remove cs-fixer for Symfony 7 (temporary as not-supported yet)
122+
if: contains(matrix.symfony, '7.1.*@dev') || contains(matrix.symfony, '7.0.*')
123123
run: |
124124
composer remove --dev friendsofphp/php-cs-fixer pedrotroller/php-cs-custom-fixer --no-update
125125
- run: composer update --prefer-dist --no-interaction --no-progress --ansi ${{ matrix.composer_option }}

composer.json

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,24 +16,17 @@
1616
}
1717
],
1818
"require": {
19-
"php": ">=7.1",
20-
"symfony/process": "~3.4||~4.3||~5.0||~6.0",
21-
"psr/log": "^1.0||^2.0||^3.0"
19+
"php": ">=8.1",
20+
"symfony/process": "^5.0||^6.0||^7.0",
21+
"psr/log": "^2.0||^3.0"
2222
},
2323
"require-dev": {
24-
"phpunit/phpunit": "~7.4||~8.5",
24+
"phpunit/phpunit": "^8.5",
2525
"phpstan/phpstan": "^1.0.0",
2626
"phpstan/phpstan-phpunit": "^1.0.0",
27-
"friendsofphp/php-cs-fixer": "^2.16||^3.0",
27+
"friendsofphp/php-cs-fixer": "^3.0",
2828
"pedrotroller/php-cs-custom-fixer": "^2.19"
2929
},
30-
"suggest": {
31-
"h4cc/wkhtmltopdf-amd64": "Provides wkhtmltopdf-amd64 binary for Linux-compatible machines, use version `~0.12` as dependency",
32-
"h4cc/wkhtmltopdf-i386": "Provides wkhtmltopdf-i386 binary for Linux-compatible machines, use version `~0.12` as dependency",
33-
"h4cc/wkhtmltoimage-amd64": "Provides wkhtmltoimage-amd64 binary for Linux-compatible machines, use version `~0.12` as dependency",
34-
"h4cc/wkhtmltoimage-i386": "Provides wkhtmltoimage-i386 binary for Linux-compatible machines, use version `~0.12` as dependency",
35-
"wemersonjanuario/wkhtmltopdf-windows": "Provides wkhtmltopdf executable for Windows, use version `~0.12` as dependency"
36-
},
3730
"autoload": {
3831
"psr-4": {
3932
"Knp\\Snappy\\": "src/Knp/Snappy"

0 commit comments

Comments
 (0)