Skip to content

Commit 70b54ff

Browse files
Merge branch '2.3' into 2.7
* 2.3: Windows and Intl fixes Add appveyor.yml for C.I. on Windows [travis] merge php: nightly and deps=high test-matrix lines [Security] Add missing docblock in PreAuthenticatedToken Conflicts: .travis.yml src/Symfony/Component/Filesystem/Tests/FilesystemTest.php src/Symfony/Component/HttpFoundation/JsonResponse.php src/Symfony/Component/Intl/DateFormatter/IntlDateFormatter.php
2 parents ce2efd5 + 7e4882a commit 70b54ff

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

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[] $roles An array of roles
36+
* @param RoleInterface[]|string[] $roles An array of roles
3737
*
3838
* @throws \InvalidArgumentException
3939
*/

Authentication/Token/PreAuthenticatedToken.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111

1212
namespace Symfony\Component\Security\Core\Authentication\Token;
1313

14+
use Symfony\Component\Security\Core\Role\RoleInterface;
15+
1416
/**
1517
* PreAuthenticatedToken implements a pre-authenticated token.
1618
*
@@ -23,6 +25,11 @@ class PreAuthenticatedToken extends AbstractToken
2325

2426
/**
2527
* Constructor.
28+
*
29+
* @param string|object $user The user
30+
* @param mixed $credentials The user credentials
31+
* @param string $providerKey The provider key
32+
* @param RoleInterface[]|string[] $roles An array of roles
2633
*/
2734
public function __construct($user, $credentials, $providerKey, array $roles = array())
2835
{

0 commit comments

Comments
 (0)