diff options
author | Fabien Potencier <fabien.potencier@gmail.com> | 2013-09-19 11:47:34 +0200 |
---|---|---|
committer | Fabien Potencier <fabien.potencier@gmail.com> | 2013-09-19 11:47:34 +0200 |
commit | b8fb7e7a6d3776de46d0a33cba2aa9a353f589e5 (patch) | |
tree | bb9955039c5da8a622ae33a8ccada7761864a679 /Http/Tests/RememberMe | |
parent | f80ff7f53983fcdcc14104abbebedd94adda9b97 (diff) | |
parent | fad88962af2ecb3e54e13c1f9e8045fd589e693f (diff) | |
download | symfony-security-b8fb7e7a6d3776de46d0a33cba2aa9a353f589e5.zip symfony-security-b8fb7e7a6d3776de46d0a33cba2aa9a353f589e5.tar.gz symfony-security-b8fb7e7a6d3776de46d0a33cba2aa9a353f589e5.tar.bz2 |
Merge branch '2.3'
* 2.3:
fixed phpdoc
Fix some annotates
[FrameworkBundle] made sure that the debug event dispatcher is used everywhere
[HttpKernel] remove unneeded strtoupper
updated the composer install command to reflect changes in Composer
Conflicts:
src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
Diffstat (limited to 'Http/Tests/RememberMe')
-rw-r--r-- | Http/Tests/RememberMe/TokenBasedRememberMeServicesTest.php | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Http/Tests/RememberMe/TokenBasedRememberMeServicesTest.php b/Http/Tests/RememberMe/TokenBasedRememberMeServicesTest.php index cdd3031..d6025ca 100644 --- a/Http/Tests/RememberMe/TokenBasedRememberMeServicesTest.php +++ b/Http/Tests/RememberMe/TokenBasedRememberMeServicesTest.php @@ -14,7 +14,6 @@ namespace Symfony\Component\Security\Http\Tests\RememberMe; use Symfony\Component\Security\Http\RememberMe\RememberMeServicesInterface; use Symfony\Component\Security\Core\Authentication\Token\RememberMeToken; -use Symfony\Component\Security\Core\Authentication\Token\Token; use Symfony\Component\Security\Core\Exception\UsernameNotFoundException; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; |