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

Commit 946bae1

Browse files
Merge branch '3.1' into 3.2
* 3.1: (28 commits) Fix merge [Validator] add class name to the cache key [Serializer] Remove AbstractObjectNormalizer::isAttributeToNormalize Throw less misleading exception when property access not found [Twig] Fix deprecations with Twig 1.29 Fixed typo [FrameworkBundle] Removed the kernel.debug parameter from the cache pool namespace seed Fix email address fix the docblock in regard to the role argument Don't use the "app" global variable in the profiler [VarDumper] fix tests when xdebug is enabled Fix merge FIXED NON EXISTING TYPE DECLARATION [Cache] Fix dumping SplDoublyLinkedList iter mode [Console] fixed PHP7 Errors when not using Dispatcher Regression test for missing controller arguments (3.1) Regression test for missing controller arguments fix a test checking for a value [Form][DX] FileType "multiple" fixes fixed CS ...
2 parents 8a83235 + 05b01b8 commit 946bae1

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

Core/Authentication/Token/AbstractToken.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ abstract class AbstractToken implements TokenInterface
3333
/**
3434
* Constructor.
3535
*
36-
* @param RoleInterface[]|string[] $roles An array of roles
36+
* @param (RoleInterface|string)[] $roles An array of roles
3737
*
3838
* @throws \InvalidArgumentException
3939
*/

Core/Authentication/Token/PreAuthenticatedToken.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class PreAuthenticatedToken extends AbstractToken
2929
* @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
32-
* @param RoleInterface[]|string[] $roles An array of roles
32+
* @param (RoleInterface|string)[] $roles An array of roles
3333
*/
3434
public function __construct($user, $credentials, $providerKey, array $roles = array())
3535
{

Core/Authentication/Token/UsernamePasswordToken.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class UsernamePasswordToken extends AbstractToken
2929
* @param string|object $user The username (like a nickname, email address, etc.), or a UserInterface instance or an object implementing a __toString method
3030
* @param string $credentials This usually is the password of the user
3131
* @param string $providerKey The provider key
32-
* @param RoleInterface[]|string[] $roles An array of roles
32+
* @param (RoleInterface|string)[] $roles An array of roles
3333
*
3434
* @throws \InvalidArgumentException
3535
*/

Guard/Token/PostAuthenticationGuardToken.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
* If you're using Guard authentication, you *must* use a class that implements
2222
* GuardTokenInterface as your authenticated token (like this class).
2323
*
24-
* @author Ryan Weaver <ryan@knpuniversity.com>n@gmail.com>
24+
* @author Ryan Weaver <ryan@knpuniversity.com>
2525
*/
2626
class PostAuthenticationGuardToken extends AbstractToken implements GuardTokenInterface
2727
{

0 commit comments

Comments
 (0)