Merge 5.x into 6.x

sonata-project · Jan 23, 2024 · e3a7efc · e3a7efc
2 parents 0dda2b7 + b96695d
commit e3a7efc
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/composer.json b/composer.json
@@ -64,7 +64,7 @@
         "phpunit/phpunit": "^9.5",
         "psalm/plugin-phpunit": "^0.18",
         "psalm/plugin-symfony": "^5.0",
-        "rector/rector": "^0.18",
+        "rector/rector": "^0.19",
         "sonata-project/admin-bundle": "^4.20",
         "sonata-project/block-bundle": "^4.11 || ^5.0",
         "sonata-project/doctrine-orm-admin-bundle": "^4.0",

diff --git a/src/Action/LoginAction.php b/src/Action/LoginAction.php
@@ -46,8 +46,8 @@ public function __invoke(Request $request): Response
             /**
              * TODO: Use instanceof FlashBagAwareSessionInterface when dropping Symfony 5 support.
              *
-             * @phpstan-ignore-next-line
              * @psalm-suppress UndefinedInterfaceMethod
+             * @phpstan-ignore-next-line
              */
             $request->getSession()->getFlashBag()->add(
                 'sonata_user_error',

diff --git a/src/Action/ResetAction.php b/src/Action/ResetAction.php
@@ -70,8 +70,8 @@ public function __invoke(Request $request, string $token): Response
             /**
              * TODO: Use instanceof FlashBagAwareSessionInterface when dropping Symfony 5 support.
              *
-             * @phpstan-ignore-next-line
              * @psalm-suppress UndefinedInterfaceMethod
+             * @phpstan-ignore-next-line
              */
             $request->getSession()->getFlashBag()->add(
                 'success',