summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabien Potencier <fabien.potencier@gmail.com>2016-01-21 11:01:50 +0100
committerFabien Potencier <fabien.potencier@gmail.com>2016-01-21 11:01:50 +0100
commitabb8622418022b6877b6399120cbec5d244e6631 (patch)
tree2cb098659877332188d4f7dacb579be3db9888cd
parent08f8eb2f0eb48dee5cb7fbc88824379b4be86769 (diff)
parentc7b41202872f5b17022658c327894a2d30326d5e (diff)
downloadsymfony-security-abb8622418022b6877b6399120cbec5d244e6631.zip
symfony-security-abb8622418022b6877b6399120cbec5d244e6631.tar.gz
symfony-security-abb8622418022b6877b6399120cbec5d244e6631.tar.bz2
Merge branch '3.0'
* 3.0: fixed CS fixed CS fixed CS fixed test fixed CS Remove default match from AbstractConfigCommand::findExtension Remove unused imports [FrameworkBundle][Validator] Fix apc cache service deprecation
-rw-r--r--Core/User/LdapUserProvider.php1
-rw-r--r--Guard/Provider/GuardAuthenticationProvider.php1
-rw-r--r--Http/RememberMe/PersistentTokenBasedRememberMeServices.php1
3 files changed, 0 insertions, 3 deletions
diff --git a/Core/User/LdapUserProvider.php b/Core/User/LdapUserProvider.php
index 988a595..1593564 100644
--- a/Core/User/LdapUserProvider.php
+++ b/Core/User/LdapUserProvider.php
@@ -105,5 +105,4 @@ class LdapUserProvider implements UserProviderInterface
{
return $class === 'Symfony\Component\Security\Core\User\User';
}
-
}
diff --git a/Guard/Provider/GuardAuthenticationProvider.php b/Guard/Provider/GuardAuthenticationProvider.php
index 4347e02..2793674 100644
--- a/Guard/Provider/GuardAuthenticationProvider.php
+++ b/Guard/Provider/GuardAuthenticationProvider.php
@@ -12,7 +12,6 @@
namespace Symfony\Component\Security\Guard\Provider;
use Symfony\Component\Security\Core\Authentication\Provider\AuthenticationProviderInterface;
-use Symfony\Component\Security\Core\Authentication\Token\AnonymousToken;
use Symfony\Component\Security\Core\Exception\BadCredentialsException;
use Symfony\Component\Security\Core\Exception\UsernameNotFoundException;
use Symfony\Component\Security\Guard\GuardAuthenticatorInterface;
diff --git a/Http/RememberMe/PersistentTokenBasedRememberMeServices.php b/Http/RememberMe/PersistentTokenBasedRememberMeServices.php
index 0a19d70..edfa208 100644
--- a/Http/RememberMe/PersistentTokenBasedRememberMeServices.php
+++ b/Http/RememberMe/PersistentTokenBasedRememberMeServices.php
@@ -19,7 +19,6 @@ use Symfony\Component\Security\Core\Exception\AuthenticationException;
use Symfony\Component\Security\Core\Exception\CookieTheftException;
use Symfony\Component\Security\Core\Authentication\RememberMe\PersistentToken;
use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
-use Psr\Log\LoggerInterface;
/**
* Concrete implementation of the RememberMeServicesInterface which needs