[Security] Call AccessListener after LogoutListener

Robin Chalas · Robin Chalas · commit 0c1b0b30ad28 · 2018-08-01T19:41:51.000+02:00
diff --git a/src/Symfony/Component/Security/Http/Firewall.php b/src/Symfony/Component/Security/Http/Firewall.php
@@ -16,6 +16,7 @@
 use Symfony\Component\HttpKernel\Event\FinishRequestEvent;
 use Symfony\Component\HttpKernel\Event\GetResponseEvent;
 use Symfony\Component\HttpKernel\KernelEvents;
+use Symfony\Component\Security\Http\Firewall\AccessListener;
 
 /**
  * Firewall uses a FirewallMap to register security listeners for the given
@@ -58,8 +59,16 @@ public function onKernelRequest(GetResponseEvent $event)
             $exceptionListener->register($this->dispatcher);
         }
 
+        $accessListener = null;
+
         // initiate the listener chain
         foreach ($authenticationListeners as $listener) {
+            if ($listener instanceof AccessListener) {
+                $accessListener = $listener;
+
+                continue;
+            }
+
             $listener->handle($event);
 
             if ($event->hasResponse()) {
@@ -70,6 +79,10 @@ public function onKernelRequest(GetResponseEvent $event)
         if (null !== $logoutListener) {
             $logoutListener->handle($event);
         }
+
+        if (!$event->hasResponse() && null !== $accessListener) {
+            $accessListener->handle($event);
+        }
     }
 
     public function onKernelFinishRequest(FinishRequestEvent $event)
