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/Authentication/Token/PreAuthenticatedToken.php | |
| 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/Authentication/Token/PreAuthenticatedToken.php')
| -rw-r--r-- | Core/Authentication/Token/PreAuthenticatedToken.php | 2 |
1 files changed, 1 insertions, 1 deletions
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 |