Allows to use a Traversable object as map

GromNaN · GromNaN · commit e4e745403edc · 2017-06-05T22:27:01.000+02:00
diff --git a/src/Symfony/Bundle/SecurityBundle/Security/FirewallMap.php b/src/Symfony/Bundle/SecurityBundle/Security/FirewallMap.php
@@ -147,12 +147,14 @@ public function getFirewallConfig(Request $request)
     private function getFirewallContext(Request $request)
     {
         if ($request->attributes->has('_firewall_context')) {
-            $contextId = $request->attributes->get('_firewall_context');
-            if (array_key_exists($contextId, $this->map)) {
-                return $this->container->get($contextId);
-            } else {
-                $request->attributes->remove('_firewall_context');
+            $storedContextId = $request->attributes->get('_firewall_context');
+            foreach ($this->map as $contextId => $requestMatcher) {
+                if ($contextId === $storedContextId) {
+                    return $this->container->get($contextId);
+                }
             }
+
+            $request->attributes->remove('_firewall_context');
         }
 
         foreach ($this->map as $contextId => $requestMatcher) {

Original file line number	Diff line number	Diff line change
`@@ -147,12 +147,14 @@ public function getFirewallConfig(Request $request)`
`147`	`147`	`private function getFirewallContext(Request $request)`
`148`	`148`	`{`
`149`	`149`	`if ($request->attributes->has('_firewall_context')) {`
`150`		`- $contextId = $request->attributes->get('_firewall_context');`
`151`		`- if (array_key_exists($contextId, $this->map)) {`
`152`		`- return $this->container->get($contextId);`
`153`		`- } else {`
`154`		`- $request->attributes->remove('_firewall_context');`
	`150`	`+ $storedContextId = $request->attributes->get('_firewall_context');`
	`151`	`+ foreach ($this->map as $contextId => $requestMatcher) {`
	`152`	`+ if ($contextId === $storedContextId) {`
	`153`	`+ return $this->container->get($contextId);`
	`154`	`+ }`
`155`	`155`	`}`
	`156`	`+`
	`157`	`+ $request->attributes->remove('_firewall_context');`
`156`	`158`	`}`
`157`	`159`
`158`	`160`	`foreach ($this->map as $contextId => $requestMatcher) {`