diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2016-05-09 13:14:44 -0500 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2016-05-09 13:14:44 -0500 |
| commit | 34e648cf6cc3c9deb2aa0adf57cb17bddf7da57c (patch) | |
| tree | d1a17c2a3bc334fd2c075110d14fa86538b68aa2 | |
| parent | 39af3a2cb7a51a05b83433bb22b06e16ef2d5ef3 (diff) | |
| parent | 9e447f3c6d7cd5ac712a967840edcd504f488ca2 (diff) | |
| download | symfony-security-34e648cf6cc3c9deb2aa0adf57cb17bddf7da57c.zip symfony-security-34e648cf6cc3c9deb2aa0adf57cb17bddf7da57c.tar.gz symfony-security-34e648cf6cc3c9deb2aa0adf57cb17bddf7da57c.tar.bz2 | |
Merge branch '2.8' into 3.0
* 2.8:
[2.3][Component/Security] Fixed phpdoc in AnonymousToken constructor for user param
prevent calling get() for service_container service
call get() after the container was compiled
Fixed readme of OptionsResolver
top-level anonymous services must be public
[DependencyInjection] Suggest ExpressionLanguage in composer.json
added a conflict between Monolog bridge 2.8 and HTTP Kernel 3.0+
| -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 e1dfef4..2c73cb4 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 $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($secret, $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 |