minor #20196 [SecurityBundle] Cache contexts per request in FirewallMap (chalasr)

fabpot · fabpot · commit bf2ff76d86ec · 2016-10-11T19:18:53.000-07:00
This PR was merged into the 3.2-dev branch. Discussion ---------- [SecurityBundle] Cache contexts per request in FirewallMap | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | yes | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #19819 (comment) | License | MIT | Doc PR | n/a From @HeahDude in #19819 (comment), I propose to store and retrieve `Context` objects per `Request` using `SplObjectStorage`. At the moment, contexts are consumed by the `Symfony\Components\Security\Http\Firewall` class only, but they could be indirectly by end users if #19490 and/or #19819 come to be merged. Commits ------- ffacec1 [SecurityBundle] Cache contexts per request in FirewallMap
diff --git a/src/Symfony/Bundle/SecurityBundle/Security/FirewallMap.php b/src/Symfony/Bundle/SecurityBundle/Security/FirewallMap.php
@@ -26,18 +26,24 @@ class FirewallMap implements FirewallMapInterface
 {
     protected $container;
     protected $map;
+    private $contexts;
 
     public function __construct(ContainerInterface $container, array $map)
     {
         $this->container = $container;
         $this->map = $map;
+        $this->contexts = new \SplObjectStorage();
     }
 
     public function getListeners(Request $request)
     {
+        if ($this->contexts->contains($request)) {
+            return $this->contexts[$request];
+        }
+
         foreach ($this->map as $contextId => $requestMatcher) {
             if (null === $requestMatcher || $requestMatcher->matches($request)) {
-                return $this->container->get($contextId)->getContext();
+                return $this->contexts[$request] = $this->container->get($contextId)->getContext();
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -26,18 +26,24 @@ class FirewallMap implements FirewallMapInterface`
`26`	`26`	`{`
`27`	`27`	`protected $container;`
`28`	`28`	`protected $map;`
	`29`	`+ private $contexts;`
`29`	`30`
`30`	`31`	`public function __construct(ContainerInterface $container, array $map)`
`31`	`32`	`{`
`32`	`33`	`$this->container = $container;`
`33`	`34`	`$this->map = $map;`
	`35`	`+ $this->contexts = new \SplObjectStorage();`
`34`	`36`	`}`
`35`	`37`
`36`	`38`	`public function getListeners(Request $request)`
`37`	`39`	`{`
	`40`	`+ if ($this->contexts->contains($request)) {`
	`41`	`+ return $this->contexts[$request];`
	`42`	`+ }`
	`43`	`+`
`38`	`44`	`foreach ($this->map as $contextId => $requestMatcher) {`
`39`	`45`	`if (null === $requestMatcher \|\| $requestMatcher->matches($request)) {`
`40`		`- return $this->container->get($contextId)->getContext();`
	`46`	`+ return $this->contexts[$request] = $this->container->get($contextId)->getContext();`
`41`	`47`	`}`
`42`	`48`	`}`
`43`	`49`