diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2016-05-09 13:11:52 -0500 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2016-05-09 13:11:52 -0500 |
| commit | 083c455db53347f2e8e4894b5f4bf7f06226d086 (patch) | |
| tree | ec214ac5d528119702d45eab75d9d570775f4e8c /Core/Authentication | |
| parent | 0bcb6566657b5044162e1dfa8df30b4d3d8cfd17 (diff) | |
| parent | a2aa4cdad5949c3bebea89e8aece52a74de4798c (diff) | |
| download | symfony-security-083c455db53347f2e8e4894b5f4bf7f06226d086.zip symfony-security-083c455db53347f2e8e4894b5f4bf7f06226d086.tar.gz symfony-security-083c455db53347f2e8e4894b5f4bf7f06226d086.tar.bz2 | |
Merge branch '2.3' into 2.7
* 2.3:
[2.3][Component/Security] Fixed phpdoc in AnonymousToken constructor for user param
call get() after the container was compiled
Fixed readme of OptionsResolver
Diffstat (limited to 'Core/Authentication')
| -rw-r--r-- | Core/Authentication/Token/AnonymousToken.php | 2 | ||||
| -rw-r--r-- | Core/Authentication/Token/PreAuthenticatedToken.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Core/Authentication/Token/AnonymousToken.php b/Core/Authentication/Token/AnonymousToken.php index 571816c..5f3241f 100644 --- a/Core/Authentication/Token/AnonymousToken.php +++ b/Core/Authentication/Token/AnonymousToken.php @@ -26,7 +26,7 @@ class AnonymousToken extends AbstractToken * Constructor. * * @param string $key The key shared with the authentication provider - * @param string $user The user + * @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($key, $user, array $roles = array()) diff --git a/Core/Authentication/Token/PreAuthenticatedToken.php b/Core/Authentication/Token/PreAuthenticatedToken.php index 1798203..5a3fc95 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 + * @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 |