minor #12049 [Security] Fix BC break introduced in #10694 (romainneutron)

fabpot · fabpot · commit d02addba30f1 · 2014-09-27T11:36:45.000+02:00
This PR was merged into the 2.6-dev branch. Discussion ---------- [Security] Fix BC break introduced in #10694 | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #12034 | License | MIT Not sure about this fix, @stof 'ing welcome Commits ------- b2183aa [Security] Fix BC break introduces in #10694
diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/security_listeners.xml b/src/Symfony/Bundle/SecurityBundle/Resources/config/security_listeners.xml
@@ -58,8 +58,8 @@
             <tag name="monolog.logger" channel="security" />
             <argument type="service" id="security.context" />
             <argument /> <!-- Key -->
-            <argument type="service" id="security.authentication.manager" />
             <argument type="service" id="logger" on-invalid="null" />
+            <argument type="service" id="security.authentication.manager" />
         </service>
 
         <service id="security.authentication.provider.anonymous" class="%security.authentication.provider.anonymous.class%" public="false">
diff --git a/src/Symfony/Component/Security/Http/Firewall/AnonymousAuthenticationListener.php b/src/Symfony/Component/Security/Http/Firewall/AnonymousAuthenticationListener.php
@@ -31,7 +31,7 @@ class AnonymousAuthenticationListener implements ListenerInterface
     private $authenticationManager;
     private $logger;
 
-    public function __construct(SecurityContextInterface $context, $key, AuthenticationManagerInterface $authenticationManager, LoggerInterface $logger = null)
+    public function __construct(SecurityContextInterface $context, $key, LoggerInterface $logger = null, AuthenticationManagerInterface $authenticationManager = null)
     {
         $this->context               = $context;
         $this->key                   = $key;
@@ -51,7 +51,10 @@ public function handle(GetResponseEvent $event)
         }
 
         try {
-            $token = $this->authenticationManager->authenticate(new AnonymousToken($this->key, 'anon.', array()));
+            if (null !== $this->authenticationManager) {
+                $token = $this->authenticationManager->authenticate(new AnonymousToken($this->key, 'anon.', array()));
+            }
+
             $this->context->setToken($token);
 
             if (null !== $this->logger) {
