Lazy load security listeners

chalasr · chalasr · commit abcbb4b56bb2 · 2017-06-09T10:00:19.000+02:00
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
@@ -265,7 +265,7 @@ private function createFirewalls($config, ContainerBuilder $container)
             $contextId = 'security.firewall.map.context.'.$name;
             $context = $container->setDefinition($contextId, new ChildDefinition('security.firewall.context'));
             $context
-                ->replaceArgument(0, $listeners)
+                ->replaceArgument(0, new IteratorArgument($listeners))
                 ->replaceArgument(1, $exceptionListener)
                 ->replaceArgument(2, new Reference($configId))
             ;
diff --git a/src/Symfony/Bundle/SecurityBundle/Security/FirewallContext.php b/src/Symfony/Bundle/SecurityBundle/Security/FirewallContext.php
@@ -25,7 +25,7 @@ class FirewallContext
     private $exceptionListener;
     private $config;
 
-    public function __construct(array $listeners, ExceptionListener $exceptionListener = null, FirewallConfig $config = null)
+    public function __construct(/** iterable */ $listeners, ExceptionListener $exceptionListener = null, FirewallConfig $config = null)
     {
         $this->listeners = $listeners;
         $this->exceptionListener = $exceptionListener;
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php
@@ -72,7 +72,7 @@ public function testFirewalls()
         foreach (array_keys($arguments[1]->getValues()) as $contextId) {
             $contextDef = $container->getDefinition($contextId);
             $arguments = $contextDef->getArguments();
-            $listeners[] = array_map('strval', $arguments['index_0']);
+            $listeners[] = array_map('strval', $arguments['index_0']->getValues());
 
             $configDef = $container->getDefinition((string) $arguments['index_2']);
             $configs[] = array_values($configDef->getArguments());

Original file line number	Diff line number	Diff line change
`@@ -265,7 +265,7 @@ private function createFirewalls($config, ContainerBuilder $container)`
`265`	`265`	`$contextId = 'security.firewall.map.context.'.$name;`
`266`	`266`	`$context = $container->setDefinition($contextId, new ChildDefinition('security.firewall.context'));`
`267`	`267`	`$context`
`268`		`- ->replaceArgument(0, $listeners)`
	`268`	`+ ->replaceArgument(0, new IteratorArgument($listeners))`
`269`	`269`	`->replaceArgument(1, $exceptionListener)`
`270`	`270`	`->replaceArgument(2, new Reference($configId))`
`271`	`271`	`;`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ class FirewallContext`
`25`	`25`	`private $exceptionListener;`
`26`	`26`	`private $config;`
`27`	`27`
`28`		`- public function __construct(array $listeners, ExceptionListener $exceptionListener = null, FirewallConfig $config = null)`
	`28`	`+ public function __construct(/** iterable */ $listeners, ExceptionListener $exceptionListener = null, FirewallConfig $config = null)`
`29`	`29`	`{`
`30`	`30`	`$this->listeners = $listeners;`
`31`	`31`	`$this->exceptionListener = $exceptionListener;`