diff options
| author | Nicolas Grekas <nicolas.grekas@gmail.com> | 2016-12-08 15:47:39 +0100 |
|---|---|---|
| committer | Nicolas Grekas <nicolas.grekas@gmail.com> | 2016-12-08 15:58:14 +0100 |
| commit | 05b01b879902a75c64b610a28d1f0dc0bee58c91 (patch) | |
| tree | 5556cca36160884e33f79030d0cfd6a7a04b1dbf /Core/Authentication | |
| parent | 7b23d09f4e4dd37ae3bf8877413a081fc83e0793 (diff) | |
| parent | c5b0c58603619794b2d2d5461ec03b5360118264 (diff) | |
| download | symfony-security-05b01b879902a75c64b610a28d1f0dc0bee58c91.zip symfony-security-05b01b879902a75c64b610a28d1f0dc0bee58c91.tar.gz symfony-security-05b01b879902a75c64b610a28d1f0dc0bee58c91.tar.bz2 | |
Merge branch '2.8' into 3.1v3.1.8
* 2.8:
[Twig] Fix deprecations with Twig 1.29
Fixed typo
Fix email address
fix the docblock in regard to the role argument
[VarDumper] fix tests when xdebug is enabled
Fix merge
[Cache] Fix dumping SplDoublyLinkedList iter mode
[Console] fixed PHP7 Errors when not using Dispatcher
Regression test for missing controller arguments
fix a test checking for a value
[Form][DX] FileType "multiple" fixes
fixed CS
[TwigBundle] Fix twig loader registered twice
[WebProfilerBundle] Fix dump block is unfairly restrained
[Console] Fix wrong handling of multiline arg/opt descriptions
[DependencyInjection] PhpDumper.php: hasReference() should not search references in lazy service arguments.
[Form] fixed "empty_value" option deprecation
Cast result to int before adding to it
Diffstat (limited to 'Core/Authentication')
| -rw-r--r-- | Core/Authentication/Token/AbstractToken.php | 2 | ||||
| -rw-r--r-- | Core/Authentication/Token/PreAuthenticatedToken.php | 2 | ||||
| -rw-r--r-- | Core/Authentication/Token/UsernamePasswordToken.php | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Core/Authentication/Token/AbstractToken.php b/Core/Authentication/Token/AbstractToken.php index 7538648..2e9c0f3 100644 --- a/Core/Authentication/Token/AbstractToken.php +++ b/Core/Authentication/Token/AbstractToken.php @@ -33,7 +33,7 @@ abstract class AbstractToken implements TokenInterface /** * Constructor. * - * @param RoleInterface[]|string[] $roles An array of roles + * @param (RoleInterface|string)[] $roles An array of roles * * @throws \InvalidArgumentException */ diff --git a/Core/Authentication/Token/PreAuthenticatedToken.php b/Core/Authentication/Token/PreAuthenticatedToken.php index b4b5e70..a5460f5 100644 --- a/Core/Authentication/Token/PreAuthenticatedToken.php +++ b/Core/Authentication/Token/PreAuthenticatedToken.php @@ -29,7 +29,7 @@ class PreAuthenticatedToken extends AbstractToken * @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 + * @param (RoleInterface|string)[] $roles An array of roles */ public function __construct($user, $credentials, $providerKey, array $roles = array()) { diff --git a/Core/Authentication/Token/UsernamePasswordToken.php b/Core/Authentication/Token/UsernamePasswordToken.php index 33b00f0..71d19ad 100644 --- a/Core/Authentication/Token/UsernamePasswordToken.php +++ b/Core/Authentication/Token/UsernamePasswordToken.php @@ -29,7 +29,7 @@ class UsernamePasswordToken extends AbstractToken * @param string|object $user The username (like a nickname, email address, etc.), or a UserInterface instance or an object implementing a __toString method * @param string $credentials This usually is the password of the user * @param string $providerKey The provider key - * @param RoleInterface[]|string[] $roles An array of roles + * @param (RoleInterface|string)[] $roles An array of roles * * @throws \InvalidArgumentException */ |