diogo
/
symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor #28224 [Security\Http] Restore laziness of listener iterator (nicolas-grekas) 

This PR was merged into the 3.4 branch.

Discussion
----------

[Security\Http] Restore laziness of listener iterator

| Q             | A
| ------------- | ---
| Branch?       | 3.4
| Bug fix?      | no (never released)
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

Alternative to #28223

Restores laziness that I broke in merge commit 2dedacbc04 (diff-31ca8a8ce837591218082b00363149fc)

Commits
-------

2ebc75b [Security\Http] Restore laziness of listener iterator
This commit is contained in:
Robin Chalas 2018-08-18 23:44:23 +02:00
parent d351daab04 2ebc75b9a1
commit 2c863c6545
1 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/Symfony/Component/Security/Http/Firewall.php
View File

@ -50,31 +50,38 @@ class Firewall implements EventSubscriberInterface
// register listeners for this firewall
$listeners = $this->map->getListeners($event->getRequest());
$accessListener = null;
$authenticationListeners = array();
$authenticationListeners = $listeners[0];
$exceptionListener = $listeners[1];
$logoutListener = isset($listeners[2]) ? $listeners[2] : null;
foreach ($listeners[0] as $listener) {
if ($listener instanceof AccessListener) {
$accessListener = $listener;
} else {
$authenticationListeners[] = $listener;
}
}
if (null !== $exceptionListener = $listeners[1]) {
if (null !== $exceptionListener) {
$this->exceptionListeners[$event->getRequest()] = $exceptionListener;
$exceptionListener->register($this->dispatcher);
}
if (null !== $logoutListener = isset($listeners[2]) ? $listeners[2] : null) {
$authenticationListeners[] = $logoutListener;
}
$authenticationListeners = function () use ($authenticationListeners, $logoutListener) {
$accessListener = null;
if (null !== $accessListener) {
$authenticationListeners[] = $accessListener;
}
foreach ($authenticationListeners as $listener) {
if ($listener instanceof AccessListener) {
$accessListener = $listener;
$this->handleRequest($event, $authenticationListeners);
continue;
}
yield $listener;
}
if (null !== $logoutListener) {
yield $logoutListener;
}
if (null !== $accessListener) {
yield $accessListener;
}
};
$this->handleRequest($event, $authenticationListeners());
}
public function onKernelFinishRequest(FinishRequestEvent $event)