fix some more tests

dachcom-digital · Sep 25, 2023 · 0d40ae8 · 0d40ae8
1 parent 4dbf8b3
commit 0d40ae8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 14 deletions.
diff --git a/src/Adapter/User/UserTrait.php b/src/Adapter/User/UserTrait.php
@@ -16,16 +16,6 @@ trait UserTrait
      */
     protected ?string $plainPassword = null;
 
-    /**
-     * This method is deprecated since Symfony 5.3
-     *
-     * @deprecated
-     */
-    public function getSalt(): ?string
-    {
-        return null;
-    }
-
     public function getUserIdentifier(): string
     {
         $authIdentifier = \Pimcore::getContainer()?->getParameter('members.auth.identifier');

diff --git a/src/EventListener/FlashListener.php b/src/EventListener/FlashListener.php
@@ -4,7 +4,8 @@
 
 use MembersBundle\MembersEvents;
 use Symfony\Component\HttpFoundation\RequestStack;
-use Symfony\Component\HttpFoundation\Session\SessionInterface;
+use Symfony\Component\HttpFoundation\Session\Flash\FlashBagInterface;
+use Symfony\Component\HttpFoundation\Session\FlashBagAwareSessionInterface;
 use Symfony\Contracts\EventDispatcher\Event;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Pimcore\Translation\Translator;
@@ -43,22 +44,27 @@ public function addSuccessFlash(Event $event, string $eventName): void
             throw new \InvalidArgumentException('This event does not correspond to a known flash message.');
         }
 
-        $this->getSession()->getFlashBag()->add('success', $this->trans(self::$successMessages[$eventName]));
+        $this->getFlashBag()?->add('success', $this->trans(self::$successMessages[$eventName]));
     }
 
     private function trans(string $message, array $params = []): string
     {
         return $this->translator->trans($message, $params);
     }
 
-    private function getSession(): SessionInterface
+    private function getFlashBag(): ?FlashBagInterface
     {
         $request = $this->requestStack->getCurrentRequest();
 
         if ($request === null) {
             throw new \LogicException('Cannot get the session without an active request.');
         }
 
-        return $request->getSession();
+        $session = $request->getSession();
+        if (!$session instanceof FlashBagAwareSessionInterface) {
+            return null;
+        }
+
+        return $session->getFlashBag();
     }
 }