summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabien Potencier <fabien.potencier@gmail.com>2011-11-07 20:53:25 +0100
committerFabien Potencier <fabien.potencier@gmail.com>2011-11-07 20:53:25 +0100
commit0e3d865d981156aa97d2f121d22ed7595a9849ed (patch)
tree98ad1dd7a0a138044d2d23470389e22d47bfe005
parent20084d9b89c21dc5522bf5ed71b67c693aee91e3 (diff)
parent77b3459b7fd3d0c52fdcdc2edbb7052840841387 (diff)
downloadsymfony-security-0e3d865d981156aa97d2f121d22ed7595a9849ed.zip
symfony-security-0e3d865d981156aa97d2f121d22ed7595a9849ed.tar.gz
symfony-security-0e3d865d981156aa97d2f121d22ed7595a9849ed.tar.bz2
merged 2.0
-rw-r--r--Acl/Domain/UserSecurityIdentity.php2
-rw-r--r--Core/Authentication/Provider/DaoAuthenticationProvider.php2
-rw-r--r--Core/Authentication/Provider/UserAuthenticationProvider.php2
-rw-r--r--Core/User/UserCheckerInterface.php4
-rw-r--r--Http/RememberMe/AbstractRememberMeServices.php2
5 files changed, 6 insertions, 6 deletions
diff --git a/Acl/Domain/UserSecurityIdentity.php b/Acl/Domain/UserSecurityIdentity.php
index b6cae4a..df2be38 100644
--- a/Acl/Domain/UserSecurityIdentity.php
+++ b/Acl/Domain/UserSecurityIdentity.php
@@ -45,7 +45,7 @@ final class UserSecurityIdentity implements SecurityIdentityInterface
}
/**
- * Creates a user security identity from an UserInterface
+ * Creates a user security identity from a UserInterface
*
* @param UserInterface $user
* @return UserSecurityIdentity
diff --git a/Core/Authentication/Provider/DaoAuthenticationProvider.php b/Core/Authentication/Provider/DaoAuthenticationProvider.php
index 54cfa3d..f17eaa4 100644
--- a/Core/Authentication/Provider/DaoAuthenticationProvider.php
+++ b/Core/Authentication/Provider/DaoAuthenticationProvider.php
@@ -83,7 +83,7 @@ class DaoAuthenticationProvider extends UserAuthenticationProvider
$user = $this->userProvider->loadUserByUsername($username);
if (!$user instanceof UserInterface) {
- throw new AuthenticationServiceException('The user provider must return an UserInterface object.');
+ throw new AuthenticationServiceException('The user provider must return a UserInterface object.');
}
return $user;
diff --git a/Core/Authentication/Provider/UserAuthenticationProvider.php b/Core/Authentication/Provider/UserAuthenticationProvider.php
index 8183c62..ce78df6 100644
--- a/Core/Authentication/Provider/UserAuthenticationProvider.php
+++ b/Core/Authentication/Provider/UserAuthenticationProvider.php
@@ -67,7 +67,7 @@ abstract class UserAuthenticationProvider implements AuthenticationProviderInter
$user = $this->retrieveUser($username, $token);
if (!$user instanceof UserInterface) {
- throw new AuthenticationServiceException('retrieveUser() must return an UserInterface.');
+ throw new AuthenticationServiceException('retrieveUser() must return a UserInterface.');
}
$this->userChecker->checkPreAuth($user);
diff --git a/Core/User/UserCheckerInterface.php b/Core/User/UserCheckerInterface.php
index 25de94a..61f0f6e 100644
--- a/Core/User/UserCheckerInterface.php
+++ b/Core/User/UserCheckerInterface.php
@@ -23,14 +23,14 @@ interface UserCheckerInterface
/**
* Checks the user account before authentication.
*
- * @param UserInterface $user An UserInterface instance
+ * @param UserInterface $user a UserInterface instance
*/
function checkPreAuth(UserInterface $user);
/**
* Checks the user account after authentication.
*
- * @param UserInterface $user An UserInterface instance
+ * @param UserInterface $user a UserInterface instance
*/
function checkPostAuth(UserInterface $user);
}
diff --git a/Http/RememberMe/AbstractRememberMeServices.php b/Http/RememberMe/AbstractRememberMeServices.php
index e75cf63..556fb6a 100644
--- a/Http/RememberMe/AbstractRememberMeServices.php
+++ b/Http/RememberMe/AbstractRememberMeServices.php
@@ -173,7 +173,7 @@ abstract class AbstractRememberMeServices implements RememberMeServicesInterface
{
if (!$token->getUser() instanceof UserInterface) {
if (null !== $this->logger) {
- $this->logger->debug('Remember-me ignores token since it does not contain an UserInterface implementation.');
+ $this->logger->debug('Remember-me ignores token since it does not contain a UserInterface implementation.');
}
return;