bug #21798 Revert "bug #21791 [SecurityBundle] only pass relevant user provider (xabbuh)" (xabbuh)

nicolas-grekas · nicolas-grekas · commit 9aebfad5012f · 2017-02-28T13:27:45.000+01:00
This PR was merged into the 2.7 branch. Discussion ---------- Revert "bug #21791 [SecurityBundle] only pass relevant user provider (xabbuh)" | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #21791 | License | MIT | Doc PR | #21791 was a mistake as pointed out by @slaci (see #21791 (comment)) and @stof (see #21792 (comment)). Commits ------- f6637dd Revert "bug #21791 [SecurityBundle] only pass relevant user provider (xabbuh)"
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
@@ -214,6 +214,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();
@@ -278,7 +288,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));
         }
 
         // Logout listener
@@ -361,15 +371,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;
