diff --git a/src/Symfony/Bundle/SecurityBundle/Debug/TraceableFirewallListener.php b/src/Symfony/Bundle/SecurityBundle/Debug/TraceableFirewallListener.php index 168050095456b..45f4f498344b1 100644 --- a/src/Symfony/Bundle/SecurityBundle/Debug/TraceableFirewallListener.php +++ b/src/Symfony/Bundle/SecurityBundle/Debug/TraceableFirewallListener.php @@ -27,78 +27,72 @@ final class TraceableFirewallListener extends FirewallListener implements ResetInterface { private array $wrappedListeners = []; - private array $authenticatorsInfo = []; + private ?TraceableAuthenticatorManagerListener $authenticatorManagerListener = null; public function getWrappedListeners(): array { - return $this->wrappedListeners; + return array_map( + static fn (WrappedListener|WrappedLazyListener $listener) => $listener->getInfo(), + $this->wrappedListeners + ); } public function getAuthenticatorsInfo(): array { - return $this->authenticatorsInfo; + return $this->authenticatorManagerListener?->getAuthenticatorsInfo() ?? []; } public function reset(): void { $this->wrappedListeners = []; - $this->authenticatorsInfo = []; + $this->authenticatorManagerListener = null; } protected function callListeners(RequestEvent $event, iterable $listeners): void { - $wrappedListeners = []; - $wrappedLazyListeners = []; - $authenticatorManagerListener = null; - + $requestListeners = []; foreach ($listeners as $listener) { if ($listener instanceof LazyFirewallContext) { - \Closure::bind(function () use (&$wrappedLazyListeners, &$wrappedListeners, &$authenticatorManagerListener) { - $listeners = []; + $contextWrappedListeners = []; + $contextAuthenticatorManagerListener = null; + + \Closure::bind(function () use (&$contextWrappedListeners, &$contextAuthenticatorManagerListener) { foreach ($this->listeners as $listener) { - if (!$authenticatorManagerListener && $listener instanceof TraceableAuthenticatorManagerListener) { - $authenticatorManagerListener = $listener; - } - if ($listener instanceof FirewallListenerInterface) { - $listener = new WrappedLazyListener($listener); - $listeners[] = $listener; - $wrappedLazyListeners[] = $listener; - } else { - $listeners[] = function (RequestEvent $event) use ($listener, &$wrappedListeners) { - $wrappedListener = new WrappedListener($listener); - $wrappedListener($event); - $wrappedListeners[] = $wrappedListener->getInfo(); - }; + if ($listener instanceof TraceableAuthenticatorManagerListener) { + $contextAuthenticatorManagerListener ??= $listener; } + $contextWrappedListeners[] = $listener instanceof FirewallListenerInterface + ? new WrappedLazyListener($listener) + : new WrappedListener($listener) + ; } - $this->listeners = $listeners; + $this->listeners = $contextWrappedListeners; }, $listener, FirewallContext::class)(); - $listener($event); + $this->authenticatorManagerListener ??= $contextAuthenticatorManagerListener; + $this->wrappedListeners = array_merge($this->wrappedListeners, $contextWrappedListeners); + + $requestListeners[] = $listener; } else { - $wrappedListener = $listener instanceof FirewallListenerInterface ? new WrappedLazyListener($listener) : new WrappedListener($listener); - $wrappedListener($event); - $wrappedListeners[] = $wrappedListener->getInfo(); - if (!$authenticatorManagerListener && $listener instanceof TraceableAuthenticatorManagerListener) { - $authenticatorManagerListener = $listener; + if ($listener instanceof TraceableAuthenticatorManagerListener) { + $this->authenticatorManagerListener ??= $listener; } - } + $wrappedListener = $listener instanceof FirewallListenerInterface + ? new WrappedLazyListener($listener) + : new WrappedListener($listener) + ; + $this->wrappedListeners[] = $wrappedListener; - if ($event->hasResponse()) { - break; + $requestListeners[] = $wrappedListener; } } - if ($wrappedLazyListeners) { - foreach ($wrappedLazyListeners as $lazyListener) { - $this->wrappedListeners[] = $lazyListener->getInfo(); - } - } - - $this->wrappedListeners = array_merge($this->wrappedListeners, $wrappedListeners); + foreach ($requestListeners as $listener) { + $listener($event); - if ($authenticatorManagerListener) { - $this->authenticatorsInfo = $authenticatorManagerListener->getAuthenticatorsInfo(); + if ($event->hasResponse()) { + break; + } } } } diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/views/Collector/security.html.twig b/src/Symfony/Bundle/SecurityBundle/Resources/views/Collector/security.html.twig index 4dd0b021fe9d2..4fe1140eadfda 100644 --- a/src/Symfony/Bundle/SecurityBundle/Resources/views/Collector/security.html.twig +++ b/src/Symfony/Bundle/SecurityBundle/Resources/views/Collector/security.html.twig @@ -318,7 +318,7 @@