From 7a8ada2932c92fe5bcf652237305279399fbacbc Mon Sep 17 00:00:00 2001 From: Javier Spagnoletti Date: Thu, 7 Dec 2023 09:33:26 -0300 Subject: [PATCH] Allow packages from "symfony/*" ^7 (#595) --- .github/workflows/test.yaml | 5 +++++ composer.json | 16 ++++++++-------- src/DependencyInjection/Configuration.php | 4 +--- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 9825f9fe..1d5bc329 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -57,6 +57,11 @@ jobs: allowed-to-fail: false symfony-require: 6.3.* variant: symfony/symfony:"6.3.*" + - php-version: '8.2' + dependencies: highest + allowed-to-fail: false + symfony-require: 7.0.* + variant: symfony/symfony:"7.0.*" steps: - name: Checkout diff --git a/composer.json b/composer.json index 72d1e0f8..c1ef847a 100644 --- a/composer.json +++ b/composer.json @@ -23,18 +23,18 @@ "homepage": "https://docs.sonata-project.org/projects/SonataIntlBundle", "require": { "php": "^8.0", - "symfony/config": "^5.4 || ^6.2", - "symfony/dependency-injection": "^5.4 || ^6.2", - "symfony/http-foundation": "^5.4 || ^6.2", - "symfony/http-kernel": "^5.4 || ^6.2", - "symfony/intl": "^5.4 || ^6.2", + "symfony/config": "^5.4 || ^6.2 || ^7.0", + "symfony/dependency-injection": "^5.4 || ^6.2 || ^7.0", + "symfony/http-foundation": "^5.4 || ^6.2 || ^7.0", + "symfony/http-kernel": "^5.4 || ^6.2 || ^7.0", + "symfony/intl": "^5.4 || ^6.2 || ^7.0", "symfony/translation-contracts": "^2.5 || ^3.0", "twig/twig": "^3.0" }, "require-dev": { "friendsofphp/php-cs-fixer": "^3.4", - "matthiasnoback/symfony-config-test": "^4.2", - "matthiasnoback/symfony-dependency-injection-test": "^4.0", + "matthiasnoback/symfony-config-test": "^4.2 || ^5.1", + "matthiasnoback/symfony-dependency-injection-test": "^4.0 || ^5.0", "phpstan/extension-installer": "^1.0", "phpstan/phpstan": "^1.0", "phpstan/phpstan-phpunit": "^1.0", @@ -45,7 +45,7 @@ "psalm/plugin-symfony": "^5.0", "rector/rector": "^0.18", "symfony/phpunit-bridge": "^6.2", - "symfony/security-core": "^5.4 || ^6.2", + "symfony/security-core": "^5.4 || ^6.2 || ^7.0", "vimeo/psalm": "^5.0" }, "conflict": { diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php index 083ddb18..d19f871c 100644 --- a/src/DependencyInjection/Configuration.php +++ b/src/DependencyInjection/Configuration.php @@ -27,9 +27,7 @@ final class Configuration implements ConfigurationInterface { /** - * @psalm-suppress PossiblyNullReference, UndefinedInterfaceMethod - * - * @see https://github.com/psalm/psalm-plugin-symfony/issues/174 + * @psalm-suppress UndefinedInterfaceMethod */ public function getConfigTreeBuilder(): TreeBuilder {