diff options
author | Fabien Potencier <fabien.potencier@gmail.com> | 2016-06-29 07:40:00 +0200 |
---|---|---|
committer | Fabien Potencier <fabien.potencier@gmail.com> | 2016-06-29 07:40:00 +0200 |
commit | a06fcc9cfb7b9d1b51b59952df65ad8fcfdf17ac (patch) | |
tree | 85ca2b17240e7247e687cbd4e1cda1875bbb1278 /Core | |
parent | d1fe507f6dd2dc7c2349ce6b506af21545a7b386 (diff) | |
parent | 523bf2714a038020ed98410525ab71908e250a0d (diff) | |
download | symfony-security-a06fcc9cfb7b9d1b51b59952df65ad8fcfdf17ac.zip symfony-security-a06fcc9cfb7b9d1b51b59952df65ad8fcfdf17ac.tar.gz symfony-security-a06fcc9cfb7b9d1b51b59952df65ad8fcfdf17ac.tar.bz2 |
Merge branch '2.8' into 3.0v3.0.8
* 2.8:
fixed CS
fixed form tests
[Console] Fix formatting of SymfonyStyle::comment()
[Form] fix post max size translation type extension for >= 2.8
removed dots at the end of @param and @return
fixed typo
Diffstat (limited to 'Core')
-rw-r--r-- | Core/Authentication/Token/AnonymousToken.php | 2 | ||||
-rw-r--r-- | Core/Authentication/Token/PreAuthenticatedToken.php | 2 | ||||
-rw-r--r-- | Core/Authentication/Token/TokenInterface.php | 2 | ||||
-rw-r--r-- | Core/Authentication/Token/UsernamePasswordToken.php | 2 | ||||
-rw-r--r-- | Core/User/InMemoryUserProvider.php | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/Core/Authentication/Token/AnonymousToken.php b/Core/Authentication/Token/AnonymousToken.php index 2c73cb4..76c88ba 100644 --- a/Core/Authentication/Token/AnonymousToken.php +++ b/Core/Authentication/Token/AnonymousToken.php @@ -26,7 +26,7 @@ class AnonymousToken extends AbstractToken * Constructor. * * @param string $secret A secret used to make sure the token is created by the app and not by a malicious client - * @param string|object $user The user can be a UserInterface instance, or an object implementing a __toString method or the username as a regular string. + * @param string|object $user The user can be a UserInterface instance, or an object implementing a __toString method or the username as a regular string * @param RoleInterface[] $roles An array of roles */ public function __construct($secret, $user, array $roles = array()) diff --git a/Core/Authentication/Token/PreAuthenticatedToken.php b/Core/Authentication/Token/PreAuthenticatedToken.php index 5a3fc95..b4b5e70 100644 --- a/Core/Authentication/Token/PreAuthenticatedToken.php +++ b/Core/Authentication/Token/PreAuthenticatedToken.php @@ -26,7 +26,7 @@ class PreAuthenticatedToken extends AbstractToken /** * Constructor. * - * @param string|object $user The user can be a UserInterface instance, or an object implementing a __toString method or the username as a regular string. + * @param string|object $user The user can be a UserInterface instance, or an object implementing a __toString method or the username as a regular string * @param mixed $credentials The user credentials * @param string $providerKey The provider key * @param RoleInterface[]|string[] $roles An array of roles diff --git a/Core/Authentication/Token/TokenInterface.php b/Core/Authentication/Token/TokenInterface.php index be90802..4e1dd7b 100644 --- a/Core/Authentication/Token/TokenInterface.php +++ b/Core/Authentication/Token/TokenInterface.php @@ -33,7 +33,7 @@ interface TokenInterface extends \Serializable /** * Returns the user roles. * - * @return RoleInterface[] An array of RoleInterface instances. + * @return RoleInterface[] An array of RoleInterface instances */ public function getRoles(); diff --git a/Core/Authentication/Token/UsernamePasswordToken.php b/Core/Authentication/Token/UsernamePasswordToken.php index 9248136..33b00f0 100644 --- a/Core/Authentication/Token/UsernamePasswordToken.php +++ b/Core/Authentication/Token/UsernamePasswordToken.php @@ -26,7 +26,7 @@ class UsernamePasswordToken extends AbstractToken /** * Constructor. * - * @param string|object $user The username (like a nickname, email address, etc.), or a UserInterface instance or an object implementing a __toString method. + * @param string|object $user The username (like a nickname, email address, etc.), or a UserInterface instance or an object implementing a __toString method * @param string $credentials This usually is the password of the user * @param string $providerKey The provider key * @param RoleInterface[]|string[] $roles An array of roles diff --git a/Core/User/InMemoryUserProvider.php b/Core/User/InMemoryUserProvider.php index c1981de..e09d72e 100644 --- a/Core/User/InMemoryUserProvider.php +++ b/Core/User/InMemoryUserProvider.php @@ -97,7 +97,7 @@ class InMemoryUserProvider implements UserProviderInterface /** * Returns the user by given username. * - * @param string $username The username. + * @param string $username The username * * @return User * |