summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Schmitt <schmittjoh@gmail.com>2011-03-11 01:53:47 +0100
committerJohannes M. Schmitt <schmittjoh@gmail.com>2011-03-11 12:50:52 +0100
commit1c411b73070b304a888b3893f21abe8cdb1716b8 (patch)
treee833780cb7c591c904bc9933ecfbba437bc1d68b
parentac98593293a4d75b74ce66c27472cfd070ef7f24 (diff)
downloadsymfony-security-1c411b73070b304a888b3893f21abe8cdb1716b8.zip
symfony-security-1c411b73070b304a888b3893f21abe8cdb1716b8.tar.gz
symfony-security-1c411b73070b304a888b3893f21abe8cdb1716b8.tar.bz2
[Security] fixed some tests
-rw-r--r--Http/Firewall.php2
-rw-r--r--Http/Firewall/ContextListener.php4
-rw-r--r--Http/Firewall/ExceptionListener.php2
-rw-r--r--Http/RememberMe/AbstractRememberMeServices.php1
4 files changed, 5 insertions, 4 deletions
diff --git a/Http/Firewall.php b/Http/Firewall.php
index 4935985..bd77f6d 100644
--- a/Http/Firewall.php
+++ b/Http/Firewall.php
@@ -38,7 +38,7 @@ class Firewall
*
* @param FirewallMap $map A FirewallMap instance
*/
- public function __construct(FirewallMapInterface $map)
+ public function __construct(FirewallMapInterface $map, EventDispatcherInterface $dispatcher)
{
$this->map = $map;
$this->dispatcher = $dispatcher;
diff --git a/Http/Firewall/ContextListener.php b/Http/Firewall/ContextListener.php
index 4779b70..548876a 100644
--- a/Http/Firewall/ContextListener.php
+++ b/Http/Firewall/ContextListener.php
@@ -46,8 +46,8 @@ class ContextListener implements ListenerInterface
$this->userProviders = $userProviders;
$this->contextKey = $contextKey;
- if (null !== $this->eventDispatcher) {
- $this->eventDispatcher->connect('core.response', array($this, 'write'), 0);
+ if (null !== $eventDispatcher) {
+ $eventDispatcher->connect('core.response', array($this, 'write'), 0);
}
}
diff --git a/Http/Firewall/ExceptionListener.php b/Http/Firewall/ExceptionListener.php
index 110290c..7d1b892 100644
--- a/Http/Firewall/ExceptionListener.php
+++ b/Http/Firewall/ExceptionListener.php
@@ -32,7 +32,7 @@ use Symfony\Component\HttpKernel\HttpKernelInterface;
*
* @author Fabien Potencier <fabien@symfony.com>
*/
-class ExceptionListener implements ListenerInterface
+class ExceptionListener
{
private $context;
private $accessDeniedHandler;
diff --git a/Http/RememberMe/AbstractRememberMeServices.php b/Http/RememberMe/AbstractRememberMeServices.php
index daf68f5..b090e24 100644
--- a/Http/RememberMe/AbstractRememberMeServices.php
+++ b/Http/RememberMe/AbstractRememberMeServices.php
@@ -160,6 +160,7 @@ abstract class AbstractRememberMeServices implements RememberMeServicesInterface
public final function loginFail(Request $request)
{
$this->cancelCookie($request);
+ $this->onLoginFail($request);
}
/**