diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2016-05-09 12:47:57 -0500 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2016-05-09 12:47:57 -0500 |
| commit | a2aa4cdad5949c3bebea89e8aece52a74de4798c (patch) | |
| tree | 64c9b541635b5eff66594f3a1ef677d8b284f08b | |
| parent | 5f0f6f3d66a5e6d1a3f73094335f6acdc23372c1 (diff) | |
| parent | b30108120781893f72f15af4b8ab297aee05432c (diff) | |
| download | symfony-security-a2aa4cdad5949c3bebea89e8aece52a74de4798c.zip symfony-security-a2aa4cdad5949c3bebea89e8aece52a74de4798c.tar.gz symfony-security-a2aa4cdad5949c3bebea89e8aece52a74de4798c.tar.bz2 | |
minor #18727 [2.3][Component/Security] Fixed phpdoc in AnonymousToken constructor for user param (eriwin)
This PR was squashed before being merged into the 2.3 branch (closes #18727).
Discussion
----------
[2.3][Component/Security] Fixed phpdoc in AnonymousToken constructor for user param
| Q | A
| ------------- | ---
| Branch? | 2.3
| Bug fix? | yes, phpdoc one
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | -
| License | MIT
| Doc PR | -
Updated phpdoc of AnonymousToken $user param from string to string|object since an object is allowed to in the parent AbstractToken: https://github.com/symfony/symfony/blob/2.3/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php#L91
Commits
-------
b1c60b4 [2.3][Component/Security] Fixed phpdoc in AnonymousToken constructor for user param
| -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 |