symfony
diff --git a/‎src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
Lines changed: 12 additions & 3 deletions b/‎src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
Lines changed: 12 additions & 3 deletions
diff --git a/‎src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
Lines changed: 8 additions & 12 deletions b/‎src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
Lines changed: 8 additions & 12 deletions
@@ -223,6 +223,16 @@ private function createFirewalls($config, ContainerBuilder $container)
         $firewalls = $config['firewalls'];
         $providerIds = $this->createUserProviders($config, $container);
 
+        // make the ContextListener aware of the configured user providers
+        $definition = $container->getDefinition('security.context_listener');
+        $arguments = $definition->getArguments();
+        $userProviders = array();
+        foreach ($providerIds as $userProviderId) {
+            $userProviders[] = new Reference($userProviderId);
+        }
+        $arguments[1] = $userProviders;
+        $definition->setArguments($arguments);
+
         // load firewall map
         $mapDef = $container->getDefinition('security.firewall.map');
         $map = $authenticationProviders = array();
@@ -304,7 +314,7 @@ private function createFirewall(ContainerBuilder $container, $id, $firewall, &$a
                 $contextKey = $firewall['context'];
             }
 
-            $listeners[] = new Reference($this->createContextListener($container, $contextKey, $defaultProvider));
+            $listeners[] = new Reference($this->createContextListener($container, $contextKey));
         }
 
         $config->replaceArgument(6, $contextKey);
@@ -413,15 +423,14 @@ private function createFirewall(ContainerBuilder $container, $id, $firewall, &$a
         return array($matcher, $listeners, $exceptionListener);
     }
 
-    private function createContextListener($container, $contextKey, $providerId)
+    private function createContextListener($container, $contextKey)
     {
         if (isset($this->contextListeners[$contextKey])) {
             return $this->contextListeners[$contextKey];
         }
 
         $listenerId = 'security.context_listener.'.count($this->contextListeners);
         $listener = $container->setDefinition($listenerId, new DefinitionDecorator('security.context_listener'));
-        $listener->replaceArgument(1, array(new Reference($providerId)));
         $listener->replaceArgument(2, $contextKey);
 
         return $this->contextListeners[$contextKey] = $listenerId;
 
@@ -963,11 +963,7 @@ private function addPrivateServices()
     private function addAliases()
     {
         if (!$aliases = $this->container->getAliases()) {
-            if ($this->container->isFrozen()) {
-                return "\n        \$this->aliases = array();\n";
-            } else {
-                return '';
-            }
+            return $this->container->isFrozen() ? "\n        \$this->aliases = array();\n" : '';
         }
 
         $code = "        \$this->aliases = array(\n";
@@ -1426,9 +1422,9 @@ private function dumpValue($value, $interpolate = true)
             }
         } elseif (is_object($value) || is_resource($value)) {
             throw new RuntimeException('Unable to dump a service container if a parameter is an object or a resource.');
-        } else {
-            return $this->export($value);
         }
+
+        return $this->export($value);
     }
 
     /**
@@ -1489,13 +1485,13 @@ private function getServiceCall($id, Reference $reference = null)
         }
         if (null !== $reference && ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE !== $reference->getInvalidBehavior()) {
             return sprintf('$this->get(\'%s\', ContainerInterface::NULL_ON_INVALID_REFERENCE)', $id);
-        } else {
-            if ($this->container->hasAlias($id)) {
-                $id = (string) $this->container->getAlias($id);
-            }
+        }
 
-            return sprintf('$this->get(\'%s\')', $id);
+        if ($this->container->hasAlias($id)) {
+            $id = (string) $this->container->getAlias($id);
         }
+
+        return sprintf('$this->get(\'%s\')', $id);
     }
 
     /**
Original file line number	Diff line number	Diff line change
`@@ -963,11 +963,7 @@ private function addPrivateServices()`
`963`	`963`	`private function addAliases()`
`964`	`964`	`{`
`965`	`965`	`if (!$aliases = $this->container->getAliases()) {`
`966`		`- if ($this->container->isFrozen()) {`
`967`		`- return "\n \$this->aliases = array();\n";`
`968`		`- } else {`
`969`		`- return '';`
`970`		`- }`
	`966`	`+ return $this->container->isFrozen() ? "\n \$this->aliases = array();\n" : '';`
`971`	`967`	`}`
`972`	`968`
`973`	`969`	`$code = " \$this->aliases = array(\n";`
`@@ -1426,9 +1422,9 @@ private function dumpValue($value, $interpolate = true)`
`1426`	`1422`	`}`
`1427`	`1423`	`} elseif (is_object($value) \|\| is_resource($value)) {`
`1428`	`1424`	`throw new RuntimeException('Unable to dump a service container if a parameter is an object or a resource.');`
`1429`		`- } else {`
`1430`		`- return $this->export($value);`
`1431`	`1425`	`}`
	`1426`	`+`
	`1427`	`+ return $this->export($value);`
`1432`	`1428`	`}`
`1433`	`1429`
`1434`	`1430`	`/**`
`@@ -1489,13 +1485,13 @@ private function getServiceCall($id, Reference $reference = null)`
`1489`	`1485`	`}`
`1490`	`1486`	`if (null !== $reference && ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE !== $reference->getInvalidBehavior()) {`
`1491`	`1487`	`return sprintf('$this->get(\'%s\', ContainerInterface::NULL_ON_INVALID_REFERENCE)', $id);`
`1492`		`- } else {`
`1493`		`- if ($this->container->hasAlias($id)) {`
`1494`		`- $id = (string) $this->container->getAlias($id);`
`1495`		`- }`
	`1488`	`+ }`
`1496`	`1489`
`1497`		`- return sprintf('$this->get(\'%s\')', $id);`
	`1490`	`+ if ($this->container->hasAlias($id)) {`
	`1491`	`+ $id = (string) $this->container->getAlias($id);`
`1498`	`1492`	`}`
	`1493`	`+`
	`1494`	`+ return sprintf('$this->get(\'%s\')', $id);`
`1499`	`1495`	`}`
`1500`	`1496`
`1501`	`1497`	`/**`