Merge branch '5.4' into 6.0

derrabus · derrabus · commit 753235ac447b · 2022-07-14T18:52:47.000+02:00
* 5.4:
  [Messenger] Fix calls to deprecated DBAL methods
  Check for null instead of type
diff --git a/Firewall/LogoutListener.php b/Firewall/LogoutListener.php
@@ -86,8 +86,7 @@ public function authenticate(RequestEvent $event)
         $logoutEvent = new LogoutEvent($request, $this->tokenStorage->getToken());
         $this->eventDispatcher->dispatch($logoutEvent);
 
-        $response = $logoutEvent->getResponse();
-        if (!$response instanceof Response) {
+        if (!$response = $logoutEvent->getResponse()) {
             throw new \RuntimeException('No logout listener set the Response, make sure at least the DefaultLogoutListener is registered.');
         }
 

Original file line number	Diff line number	Diff line change
`@@ -86,8 +86,7 @@ public function authenticate(RequestEvent $event)`
`86`	`86`	`$logoutEvent = new LogoutEvent($request, $this->tokenStorage->getToken());`
`87`	`87`	`$this->eventDispatcher->dispatch($logoutEvent);`
`88`	`88`
`89`		`- $response = $logoutEvent->getResponse();`
`90`		`- if (!$response instanceof Response) {`
	`89`	`+ if (!$response = $logoutEvent->getResponse()) {`
`91`	`90`	`throw new \RuntimeException('No logout listener set the Response, make sure at least the DefaultLogoutListener is registered.');`
`92`	`91`	`}`
`93`	`92`