Lazy load security listeners

chalasr · chalasr · commit 1ec82edd76c0 · 2017-06-09T17:50:35.000+02:00
diff --git a/UPGRADE-3.4.md b/UPGRADE-3.4.md
@@ -4,7 +4,7 @@ UPGRADE FROM 3.3 to 3.4
 DependencyInjection
 -------------------
 
-  * Top-level anonymous services in XML are deprecated and will throw an exception in Symfony 4.0.
+ * Top-level anonymous services in XML are deprecated and will throw an exception in Symfony 4.0.
 
 Finder
 ------
@@ -32,6 +32,11 @@ Process
  * The `Symfony\Component\Process\ProcessBuilder` class has been deprecated,
    use the `Symfony\Component\Process\Process` class directly instead.
 
+SecurityBundle
+--------------
+
+ * `FirewallContext::getListeners()` now returns `\Traversable|array`
+
 Validator
 ---------
 
diff --git a/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md b/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+3.4.0
+-----
+
+ * [BC BREAK] `FirewallContext::getListeners()` now returns `\Traversable|array`
+
 3.3.0
 -----
 
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,10 @@ class FirewallContext
     private $exceptionListener;
     private $config;
 
-    public function __construct(array $listeners, ExceptionListener $exceptionListener = null, FirewallConfig $config = null)
+    /**
+     * @param \Traversable|array $listeners
+     */
+    public function __construct($listeners, ExceptionListener $exceptionListener = null, FirewallConfig $config = null)
     {
         $this->listeners = $listeners;
         $this->exceptionListener = $exceptionListener;
@@ -47,6 +50,9 @@ public function getContext()
         return array($this->getListeners(), $this->getExceptionListener());
     }
 
+    /**
+     * @return \Traversable|array
+     */
     public function getListeners()
     {
         return $this->listeners;
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,10 @@ 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`	`+ /**`
	`29`	`+ * @param \Traversable\|array $listeners`
	`30`	`+ */`
	`31`	`+ public function __construct($listeners, ExceptionListener $exceptionListener = null, FirewallConfig $config = null)`
`29`	`32`	`{`
`30`	`33`	`$this->listeners = $listeners;`
`31`	`34`	`$this->exceptionListener = $exceptionListener;`
`@@ -47,6 +50,9 @@ public function getContext()`
`47`	`50`	`return array($this->getListeners(), $this->getExceptionListener());`
`48`	`51`	`}`
`49`	`52`
	`53`	`+ /**`
	`54`	`+ * @return \Traversable\|array`
	`55`	`+ */`
`50`	`56`	`public function getListeners()`
`51`	`57`	`{`
`52`	`58`	`return $this->listeners;`