[TwigBridge] Remove duck typing from AppVariable::getFlashes()

symfony · Sep 10, 2023 · 3bd4e60 · 3bd4e60
1 parent ba0a723
commit 3bd4e60
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/src/Symfony/Bridge/Twig/AppVariable.php b/src/Symfony/Bridge/Twig/AppVariable.php
@@ -13,6 +13,7 @@
 
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpFoundation\Session\FlashBagAwareSessionInterface;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
@@ -152,16 +153,12 @@ public function getLocale(): string
     public function getFlashes(string|array $types = null): array
     {
         try {
-            if (null === $session = $this->getSession()) {
-                return [];
-            }
+            $session = $this->getSession();
         } catch (\RuntimeException) {
             return [];
         }
 
-        // In 7.0 (when symfony/http-foundation: 6.4 is required) this can be updated to
-        // check if the session is an instance of FlashBagAwareSessionInterface
-        if (!method_exists($session, 'getFlashBag')) {
+        if (!$session instanceof FlashBagAwareSessionInterface) {
             return [];
         }