Skip to content
This repository was archived by the owner on May 31, 2024. It is now read-only.

Commit 9e447f3

Browse files
committed
Merge branch '2.7' into 2.8
* 2.7: [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 [DependencyInjection] Suggest ExpressionLanguage in composer.json
2 parents 069e08a + 083c455 commit 9e447f3

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Core/Authentication/Token/AnonymousToken.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class AnonymousToken extends AbstractToken
2626
* Constructor.
2727
*
2828
* @param string $secret A secret used to make sure the token is created by the app and not by a malicious client
29-
* @param string $user The user
29+
* @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.
3030
* @param RoleInterface[] $roles An array of roles
3131
*/
3232
public function __construct($secret, $user, array $roles = array())

Core/Authentication/Token/PreAuthenticatedToken.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class PreAuthenticatedToken extends AbstractToken
2626
/**
2727
* Constructor.
2828
*
29-
* @param string|object $user The user
29+
* @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.
3030
* @param mixed $credentials The user credentials
3131
* @param string $providerKey The provider key
3232
* @param RoleInterface[]|string[] $roles An array of roles

0 commit comments

Comments
 (0)