From ffb25dd2df312c2c8fb287032f008c52b1d59336 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yann=20Eugon=C3=A9?= Date: Mon, 8 Jul 2024 15:52:57 +0200 Subject: [PATCH 1/4] Bump composer dependencies --- composer.json | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/composer.json b/composer.json index 8518b37..a801920 100644 --- a/composer.json +++ b/composer.json @@ -10,20 +10,20 @@ } ], "require": { - "php": "^7.1.3|^8.0", - "symfony/framework-bundle": "^4.4|^5.0|^6.0" + "php": "^8.2", + "symfony/framework-bundle": "7.0.*" }, "require-dev": { - "doctrine/annotations": "^1.3", - "myclabs/php-enum": "^1.7", - "phpunit/phpunit": "^7.5|^8.5|^9.5", - "sensio/framework-extra-bundle": "^5.5|^6.1", - "squizlabs/php_codesniffer": "^3.5", - "symfony/form": "^4.4|^5.0|^6.0", - "symfony/translation": "^4.4|^5.0|^6.0", - "symfony/twig-bundle": "^4.4|^5.0|^6.0", - "symfony/validator": "^4.4|^5.0|^6.0", - "symfony/yaml": "^4.4|^5.0|^6.0", + "doctrine/annotations": "^1.14", + "myclabs/php-enum": "^1.8", + "phpunit/phpunit": "^9.6", + "squizlabs/php_codesniffer": "^3.10", + "symfony/form": "^7.0", + "symfony/http-kernel": "^7.0", + "symfony/translation": "^7.0", + "symfony/twig-bundle": "^7.0", + "symfony/validator": "^7.0", + "symfony/yaml": "^7.0", "twig/twig": "^2.0|^3.0" }, "suggest": { @@ -46,6 +46,7 @@ "minimum-stability": "stable", "extra": { "branch-alias": { + "dev-5.x": "5.x-dev", "dev-4.x": "4.x-dev", "dev-3.x": "3.x-dev", "dev-2.x": "2.x-dev" From 2501c29ad779e6227c51123c55f254d3ba844eca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yann=20Eugon=C3=A9?= Date: Mon, 8 Jul 2024 15:58:02 +0200 Subject: [PATCH 2/4] Fixed Kernel::build method compatibility with Symfony 7 --- tests/Integration/src/Kernel.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Integration/src/Kernel.php b/tests/Integration/src/Kernel.php index c9d3144..1c3ff39 100644 --- a/tests/Integration/src/Kernel.php +++ b/tests/Integration/src/Kernel.php @@ -46,7 +46,7 @@ public function registerContainerConfiguration(LoaderInterface $loader): void /** * @inheritDoc */ - protected function build(ContainerBuilder $container) + protected function build(ContainerBuilder $container): void { $container->addCompilerPass( new class implements CompilerPassInterface { From 1f2981bd6ca059e7695beb1aef0127edac51402b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yann=20Eugon=C3=A9?= Date: Mon, 8 Jul 2024 15:58:47 +0200 Subject: [PATCH 3/4] Rewrite GitHub testing matrix for PHP>=8.2 & Symfony>=7.0 --- .github/workflows/tests.yml | 32 ++++++-------------------------- 1 file changed, 6 insertions(+), 26 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 0182a81..fec36e4 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -4,7 +4,7 @@ on: pull_request: null push: branches: - - "4.x" + - "5.x" jobs: phpunit: @@ -14,30 +14,10 @@ jobs: strategy: matrix: include: - - php-version: '7.1' - symfony-version: '4.4.*' - - - php-version: '7.4' - symfony-version: '4.4.*' - - php-version: '7.4' - symfony-version: '5.4.*' - - - php-version: '8.0' - symfony-version: '4.4.*' - - php-version: '8.0' - symfony-version: '5.4.*' - - php-version: '8.0' - symfony-version: '6.0.*' - - - php-version: '8.1' - symfony-version: '5.4.*' - - php-version: '8.1' - symfony-version: '6.3.*' - - - php-version: '8.2' - symfony-version: '5.4.*' - php-version: '8.2' - symfony-version: '6.3.*' + symfony-version: '7.0.*' + - php-version: '8.3' + symfony-version: '7.1.*' steps: - name: "Checkout" @@ -75,7 +55,7 @@ jobs: uses: shivammathur/setup-php@v2 with: coverage: xdebug - php-version: '8.2' + php-version: '8.3' - name: "Install dependencies with composer" run: composer update --no-interaction --no-progress @@ -101,7 +81,7 @@ jobs: uses: shivammathur/setup-php@v2 with: coverage: xdebug - php-version: '8.2' + php-version: '8.3' - name: "Install dependencies with composer" run: composer update --no-interaction --no-progress From 692fceca72f2815053e7f8447d5082091f94beca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yann=20Eugon=C3=A9?= Date: Mon, 8 Jul 2024 16:04:43 +0200 Subject: [PATCH 4/4] Fixed wrong symfony/framework-bundle dependency range declaration --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index a801920..3ad69b1 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,7 @@ ], "require": { "php": "^8.2", - "symfony/framework-bundle": "7.0.*" + "symfony/framework-bundle": "^7.0" }, "require-dev": { "doctrine/annotations": "^1.14",