summaryrefslogtreecommitdiffstats
path: root/Http
diff options
context:
space:
mode:
authorFabien Potencier <fabien.potencier@gmail.com>2013-10-17 13:48:01 +0200
committerFabien Potencier <fabien.potencier@gmail.com>2013-10-17 13:48:01 +0200
commit53d15c7a478930c236ad4129d2e1a9ef2de16660 (patch)
tree363741f1da75afc7ec836b638c2690663830ab38 /Http
parentb6d302f1f0f1235aa376c180dcd289f38b3df70e (diff)
parentcf3838b220fe3fa6265e82b466699ec04a14566b (diff)
downloadsymfony-security-53d15c7a478930c236ad4129d2e1a9ef2de16660.zip
symfony-security-53d15c7a478930c236ad4129d2e1a9ef2de16660.tar.gz
symfony-security-53d15c7a478930c236ad4129d2e1a9ef2de16660.tar.bz2
Merge branch '2.2' into 2.3
* 2.2: [DoctrineBridge] Loosened CollectionToArrayTransformer::transform() to accept arrays Removed unused use statements. Make usleep longer and simplify assertions Added japanese translation resource for security component. [Yaml] Fixed the escaping of strings starting with a dash when dumping Fix in ChainLoader.php fixed wrong started states
Diffstat (limited to 'Http')
-rw-r--r--Http/Firewall/LogoutListener.php1
1 files changed, 0 insertions, 1 deletions
diff --git a/Http/Firewall/LogoutListener.php b/Http/Firewall/LogoutListener.php
index 983eab0..7dc9503 100644
--- a/Http/Firewall/LogoutListener.php
+++ b/Http/Firewall/LogoutListener.php
@@ -20,7 +20,6 @@ use Symfony\Component\Security\Core\Exception\LogoutException;
use Symfony\Component\Security\Http\HttpUtils;
use Symfony\Component\Security\Http\Logout\LogoutHandlerInterface;
use Symfony\Component\Security\Http\Logout\LogoutSuccessHandlerInterface;
-use Symfony\Component\Security\Core\Exception\InvalidCsrfTokenException;
/**
* LogoutListener logout users.