From 3f80b3de6f158a487d86cf8fffe8e6564b95f7b5 Mon Sep 17 00:00:00 2001 From: Fran Moreno Date: Mon, 22 Jan 2024 18:41:18 +0100 Subject: [PATCH] Allow Symfony 7 and MongoDBBundle 5 --- .github/workflows/test.yaml | 5 +++++ composer.json | 22 +++++++++++----------- src/DependencyInjection/Configuration.php | 2 +- 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index fd063a99..96ec318a 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -63,6 +63,11 @@ jobs: allowed-to-fail: false symfony-require: 6.4.* variant: symfony/symfony:"6.4.*" + - 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 58693170..3b778838 100644 --- a/composer.json +++ b/composer.json @@ -29,17 +29,17 @@ "ext-mongodb": "*", "doctrine/collections": "^1.6 || ^2.0", "doctrine/mongodb-odm": "^2.3", - "doctrine/mongodb-odm-bundle": "^4.4", + "doctrine/mongodb-odm-bundle": "^4.4 || ^5.0", "doctrine/persistence": "^3.0", "sonata-project/admin-bundle": "^4.18", "sonata-project/exporter": "^2.0 || ^3.0", "sonata-project/form-extensions": "^1.7.1 || ^2.0", - "symfony/config": "^5.4 || ^6.2", - "symfony/dependency-injection": "^5.4 || ^6.2", - "symfony/doctrine-bridge": "^5.4 || ^6.2", - "symfony/form": "^5.4 || ^6.2", - "symfony/http-kernel": "^5.4 || ^6.2", - "symfony/property-access": "^5.4 || ^6.2", + "symfony/config": "^5.4 || ^6.2 || ^7.0", + "symfony/dependency-injection": "^5.4 || ^6.2 || ^7.0", + "symfony/doctrine-bridge": "^5.4 || ^6.2 || ^7.0", + "symfony/form": "^5.4 || ^6.2 || ^7.0", + "symfony/http-kernel": "^5.4 || ^6.2 || ^7.0", + "symfony/property-access": "^5.4 || ^6.2 || ^7.0", "twig/twig": "^3.0" }, "require-dev": { @@ -57,11 +57,11 @@ "psalm/plugin-symfony": "^5.0", "rector/rector": "^0.18", "sonata-project/block-bundle": "^4.2 || ^5.0", - "symfony/browser-kit": "^5.4 || ^6.2", - "symfony/css-selector": "^5.4 || ^6.2", + "symfony/browser-kit": "^5.4 || ^6.2 || ^7.0", + "symfony/css-selector": "^5.4 || ^6.2 || ^7.0", "symfony/panther": "^2.0.1", - "symfony/phpunit-bridge": "^6.2", - "symfony/twig-bridge": "^5.4 || ^6.2", + "symfony/phpunit-bridge": "^6.2 || ^7.0", + "symfony/twig-bridge": "^5.4 || ^6.2 || ^7.0", "vimeo/psalm": "^5.7" }, "conflict": { diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php index 95edeb49..fc064636 100644 --- a/src/DependencyInjection/Configuration.php +++ b/src/DependencyInjection/Configuration.php @@ -27,7 +27,7 @@ final class Configuration implements ConfigurationInterface { /** - * @psalm-suppress PossiblyNullReference, UndefinedInterfaceMethod + * @psalm-suppress UndefinedInterfaceMethod * * @see https://github.com/psalm/psalm-plugin-symfony/issues/174 */