Browse Source

Merge remote branch 'stof/security_events'

* stof/security_events:
  [Security] Removed useless method call
  [Security] Fixed some listeners not updated after the event refactoring
Fabien Potencier 14 years ago
parent
commit
1479c25a8a

+ 1 - 3
src/Symfony/Component/Security/Http/Firewall/BasicAuthenticationListener.php

@@ -85,9 +85,7 @@ class BasicAuthenticationListener implements ListenerInterface
                 return;
             }
 
-            $event->setProcessed();
-
-            return $this->authenticationEntryPoint->start($event, $request, $failed);
+            $event->setResponse($this->authenticationEntryPoint->start($request, $failed));
         }
     }
 }

+ 2 - 2
src/Symfony/Component/Security/Http/Firewall/ChannelListener.php

@@ -52,7 +52,7 @@ class ChannelListener implements ListenerInterface
                 $this->logger->debug('Redirecting to HTTPS');
             }
 
-            $response = $this->authenticationEntryPoint->start($event, $request);
+            $response = $this->authenticationEntryPoint->start($request);
 
             $event->setResponse($response);
 
@@ -64,7 +64,7 @@ class ChannelListener implements ListenerInterface
                 $this->logger->debug('Redirecting to HTTP');
             }
 
-            $response = $this->authenticationEntryPoint->start($event, $request);
+            $response = $this->authenticationEntryPoint->start($request);
 
             $event->setResponse($response);
         }

+ 1 - 1
src/Symfony/Component/Security/Http/Firewall/DigestAuthenticationListener.php

@@ -129,7 +129,7 @@ class DigestAuthenticationListener implements ListenerInterface
             $this->logger->debug($authException);
         }
 
-        $this->authenticationEntryPoint->start($event, $request, $authException);
+        $event->setResponse($this->authenticationEntryPoint->start($request, $authException));
     }
 }