From 28ccd1e631fcefbb112182e3490ae34d1ab4af89 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Tue, 5 Aug 2025 13:30:52 +0200 Subject: [PATCH] Allow Symfony 8 --- .github/workflows/ci.yml | 2 +- composer.json | 20 ++++++++++---------- src/CodeGenerator/composer.json | 8 ++++---- src/Core/CHANGELOG.md | 4 ++++ src/Core/composer.json | 4 ++-- src/Integration/Symfony/Bundle/CHANGELOG.md | 4 ++++ src/Integration/Symfony/Bundle/composer.json | 10 +++++----- 7 files changed, 30 insertions(+), 22 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ba98c74c1..e84b22645 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -138,7 +138,7 @@ jobs: - name: Set up PHP uses: shivammathur/setup-php@v2 with: - php-version: 8.3 + php-version: 8.4 coverage: none - name: Checkout code diff --git a/composer.json b/composer.json index b7e1dfc97..02172b5c5 100644 --- a/composer.json +++ b/composer.json @@ -11,9 +11,9 @@ "ext-json": "*", "ext-simplexml": "*", "psr/log": "^1.0 || ^2.0 || ^3.0", - "symfony/http-client": "^4.4.16 || ^5.1.7 || ^6.0 || ^7.0", + "symfony/http-client": "^4.4.16 || ^5.1.7 || ^6.0 || ^7.0 || ^8.0", "symfony/http-client-contracts": "^1.0 || ^2.0 || ^3.0", - "symfony/process": "^4.4 || ^5.0 || ^6.0 || ^7.0", + "symfony/process": "^4.4 || ^5.0 || ^6.0 || ^7.0 || ^8.0", "symfony/service-contracts": "^1.0 || ^2.0 || ^3.0" }, "require-dev": { @@ -31,15 +31,15 @@ "psalm/phar": "~5.14.1", "psr/cache": "^1.0 || ^2.0 || ^3.0", "swaggest/json-diff": "^3.7", - "symfony/cache": "^4.4 || ^5.0 || ^6.0 || ^7.0", - "symfony/config": "^4.4 || ^5.0 || ^6.0 || ^7.0", - "symfony/console": "^4.4 || ^5.0 || ^6.0 || ^7.0", - "symfony/dependency-injection": "^4.4 || ^5.0 || ^6.0 || ^7.0", + "symfony/cache": "^4.4 || ^5.0 || ^6.0 || ^7.0 || ^8.0", + "symfony/config": "^4.4 || ^5.0 || ^6.0 || ^7.0 || ^8.0", + "symfony/console": "^4.4 || ^5.0 || ^6.0 || ^7.0 || ^8.0", + "symfony/dependency-injection": "^4.4 || ^5.0 || ^6.0 || ^7.0 || ^8.0", "symfony/deprecation-contracts": "^2.1 || ^3.0", - "symfony/filesystem": "^5.0 || ^6.0 || ^7.0", - "symfony/finder": "^4.4 || ^5.0 || ^6.0 || ^7.0", - "symfony/http-kernel": "^4.4 || ^5.0 || ^6.0 || ^7.0", - "symfony/phpunit-bridge": "^5.3 || ^6.0 || ^7.0", + "symfony/filesystem": "^5.0 || ^6.0 || ^7.0 || ^8.0", + "symfony/finder": "^4.4 || ^5.0 || ^6.0 || ^7.0 || ^8.0", + "symfony/http-kernel": "^4.4 || ^5.0 || ^6.0 || ^7.0 || ^8.0", + "symfony/phpunit-bridge": "^5.3 || ^6.0 || ^7.0 || ^8.0", "symfony/polyfill-uuid": "^1.13.1" }, "conflict": { diff --git a/src/CodeGenerator/composer.json b/src/CodeGenerator/composer.json index 8e848e4ca..a698d25e5 100644 --- a/src/CodeGenerator/composer.json +++ b/src/CodeGenerator/composer.json @@ -12,11 +12,11 @@ "nette/php-generator": "^3.6 || ^4.1", "nette/utils": "^3.0 || ^4.0", "nikic/php-parser": "^4.0", - "symfony/console": "^4.4 || ^5.0 || ^6.0 || ^7.0", - "symfony/finder": "^4.4 || ^5.0 || ^6.0 || ^7.0", - "symfony/http-client": "^4.4 || ^5.0 || ^6.0 || ^7.0", + "symfony/console": "^4.4 || ^5.0 || ^6.0 || ^7.0 || ^8.0", + "symfony/finder": "^4.4 || ^5.0 || ^6.0 || ^7.0 || ^8.0", + "symfony/http-client": "^4.4 || ^5.0 || ^6.0 || ^7.0 || ^8.0", "symfony/http-client-contracts": "^1.0 || ^2.0 || ^3.0", - "symfony/process": "^4.4 || ^5.0 || ^6.0 || ^7.0", + "symfony/process": "^4.4 || ^5.0 || ^6.0 || ^7.0 || ^8.0", "symfony/service-contracts": "^2.0 || ^3.0" }, "autoload": { diff --git a/src/Core/CHANGELOG.md b/src/Core/CHANGELOG.md index f1dbc4216..c36f61f21 100644 --- a/src/Core/CHANGELOG.md +++ b/src/Core/CHANGELOG.md @@ -2,6 +2,10 @@ ## NOT RELEASED +### Added + +- Support for Symfony 8 + ## 1.26.0 ### Added diff --git a/src/Core/composer.json b/src/Core/composer.json index 4b9614f85..660acb56c 100644 --- a/src/Core/composer.json +++ b/src/Core/composer.json @@ -18,7 +18,7 @@ "psr/cache": "^1.0 || ^2.0 || ^3.0", "psr/log": "^1.0 || ^2.0 || ^3.0", "symfony/deprecation-contracts": "^2.1 || ^3.0", - "symfony/http-client": "^4.4.16 || ^5.1.7 || ^6.0 || ^7.0", + "symfony/http-client": "^4.4.16 || ^5.1.7 || ^6.0 || ^7.0 || ^8.0", "symfony/http-client-contracts": "^1.1.8 || ^2.0 || ^3.0", "symfony/service-contracts": "^1.0 || ^2.0 || ^3.0" }, @@ -38,7 +38,7 @@ }, "extra": { "branch-alias": { - "dev-master": "1.26-dev" + "dev-master": "1.27-dev" } } } diff --git a/src/Integration/Symfony/Bundle/CHANGELOG.md b/src/Integration/Symfony/Bundle/CHANGELOG.md index cec4ac01e..65d21dec9 100644 --- a/src/Integration/Symfony/Bundle/CHANGELOG.md +++ b/src/Integration/Symfony/Bundle/CHANGELOG.md @@ -2,6 +2,10 @@ ## NOT RELEASED +### Added + +- Support for Symfony 8 + ## 1.14.0 ### Added diff --git a/src/Integration/Symfony/Bundle/composer.json b/src/Integration/Symfony/Bundle/composer.json index 3d82b6f07..f73222ba8 100644 --- a/src/Integration/Symfony/Bundle/composer.json +++ b/src/Integration/Symfony/Bundle/composer.json @@ -14,9 +14,9 @@ "require": { "php": "^7.2.5 || ^8.0", "async-aws/core": "^1.0", - "symfony/config": "^4.4 || ^5.0 || ^6.0 || ^7.0", - "symfony/dependency-injection": "^4.4 || ^5.0 || ^6.0 || ^7.0", - "symfony/http-kernel": "^4.4 || ^5.0 || ^6.0 || ^7.0" + "symfony/config": "^4.4 || ^5.0 || ^6.0 || ^7.0 || ^8.0", + "symfony/dependency-injection": "^4.4 || ^5.0 || ^6.0 || ^7.0 || ^8.0", + "symfony/http-kernel": "^4.4 || ^5.0 || ^6.0 || ^7.0 || ^8.0" }, "require-dev": { "async-aws/s3": "^1.0 || ^2.0", @@ -25,7 +25,7 @@ "async-aws/ssm": "^1.0 || ^2.0", "matthiasnoback/symfony-config-test": "^4.1 || ^5.0", "nyholm/symfony-bundle-test": "^3.0", - "symfony/cache": "^4.4 || ^5.0 || ^6.0 || ^7.0" + "symfony/cache": "^4.4 || ^5.0 || ^6.0 || ^7.0 || ^8.0" }, "autoload": { "psr-4": { @@ -39,7 +39,7 @@ }, "extra": { "branch-alias": { - "dev-master": "1.14-dev" + "dev-master": "1.15-dev" } } }