Skip to content

Commit 86b7058

Browse files
authored
Allow Symfony 7.x and bump dependencies (#59)
* Bump composer dependencies * Fixed Kernel::build method compatibility with Symfony 7 * Rewrite GitHub testing matrix for PHP>=8.2 & Symfony>=7.0 * Fixed wrong symfony/framework-bundle dependency range declaration
1 parent 323c155 commit 86b7058

File tree

3 files changed

+20
-39
lines changed

3 files changed

+20
-39
lines changed

.github/workflows/tests.yml

+6-26
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
pull_request: null
55
push:
66
branches:
7-
- "4.x"
7+
- "5.x"
88

99
jobs:
1010
phpunit:
@@ -14,30 +14,10 @@ jobs:
1414
strategy:
1515
matrix:
1616
include:
17-
- php-version: '7.1'
18-
symfony-version: '4.4.*'
19-
20-
- php-version: '7.4'
21-
symfony-version: '4.4.*'
22-
- php-version: '7.4'
23-
symfony-version: '5.4.*'
24-
25-
- php-version: '8.0'
26-
symfony-version: '4.4.*'
27-
- php-version: '8.0'
28-
symfony-version: '5.4.*'
29-
- php-version: '8.0'
30-
symfony-version: '6.0.*'
31-
32-
- php-version: '8.1'
33-
symfony-version: '5.4.*'
34-
- php-version: '8.1'
35-
symfony-version: '6.3.*'
36-
37-
- php-version: '8.2'
38-
symfony-version: '5.4.*'
3917
- php-version: '8.2'
40-
symfony-version: '6.3.*'
18+
symfony-version: '7.0.*'
19+
- php-version: '8.3'
20+
symfony-version: '7.1.*'
4121

4222
steps:
4323
- name: "Checkout"
@@ -75,7 +55,7 @@ jobs:
7555
uses: shivammathur/setup-php@v2
7656
with:
7757
coverage: xdebug
78-
php-version: '8.2'
58+
php-version: '8.3'
7959

8060
- name: "Install dependencies with composer"
8161
run: composer update --no-interaction --no-progress
@@ -101,7 +81,7 @@ jobs:
10181
uses: shivammathur/setup-php@v2
10282
with:
10383
coverage: xdebug
104-
php-version: '8.2'
84+
php-version: '8.3'
10585

10686
- name: "Install dependencies with composer"
10787
run: composer update --no-interaction --no-progress

composer.json

+13-12
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,20 @@
1010
}
1111
],
1212
"require": {
13-
"php": "^7.1.3|^8.0",
14-
"symfony/framework-bundle": "^4.4|^5.0|^6.0"
13+
"php": "^8.2",
14+
"symfony/framework-bundle": "^7.0"
1515
},
1616
"require-dev": {
17-
"doctrine/annotations": "^1.3",
18-
"myclabs/php-enum": "^1.7",
19-
"phpunit/phpunit": "^7.5|^8.5|^9.5",
20-
"sensio/framework-extra-bundle": "^5.5|^6.1",
21-
"squizlabs/php_codesniffer": "^3.5",
22-
"symfony/form": "^4.4|^5.0|^6.0",
23-
"symfony/translation": "^4.4|^5.0|^6.0",
24-
"symfony/twig-bundle": "^4.4|^5.0|^6.0",
25-
"symfony/validator": "^4.4|^5.0|^6.0",
26-
"symfony/yaml": "^4.4|^5.0|^6.0",
17+
"doctrine/annotations": "^1.14",
18+
"myclabs/php-enum": "^1.8",
19+
"phpunit/phpunit": "^9.6",
20+
"squizlabs/php_codesniffer": "^3.10",
21+
"symfony/form": "^7.0",
22+
"symfony/http-kernel": "^7.0",
23+
"symfony/translation": "^7.0",
24+
"symfony/twig-bundle": "^7.0",
25+
"symfony/validator": "^7.0",
26+
"symfony/yaml": "^7.0",
2727
"twig/twig": "^2.0|^3.0"
2828
},
2929
"suggest": {
@@ -46,6 +46,7 @@
4646
"minimum-stability": "stable",
4747
"extra": {
4848
"branch-alias": {
49+
"dev-5.x": "5.x-dev",
4950
"dev-4.x": "4.x-dev",
5051
"dev-3.x": "3.x-dev",
5152
"dev-2.x": "2.x-dev"

tests/Integration/src/Kernel.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public function registerContainerConfiguration(LoaderInterface $loader): void
4646
/**
4747
* @inheritDoc
4848
*/
49-
protected function build(ContainerBuilder $container)
49+
protected function build(ContainerBuilder $container): void
5050
{
5151
$container->addCompilerPass(
5252
new class implements CompilerPassInterface {

0 commit comments

Comments
 (0)