summaryrefslogtreecommitdiffstats
path: root/Core
diff options
context:
space:
mode:
authorNicolas Grekas <nicolas.grekas@gmail.com>2015-08-27 09:55:57 +0200
committerNicolas Grekas <nicolas.grekas@gmail.com>2015-08-27 09:55:57 +0200
commit22646d17807d51c97b732ea8a779bc1bd233ebeb (patch)
tree38df0fdf20e75ec9c6e65598504aa7865a878720 /Core
parent71e7f364d47b122b0b6f2acd66ff9439495aaef6 (diff)
parent2f0fccfadbbdbceb79e792eb47973f85face4338 (diff)
downloadsymfony-security-22646d17807d51c97b732ea8a779bc1bd233ebeb.zip
symfony-security-22646d17807d51c97b732ea8a779bc1bd233ebeb.tar.gz
symfony-security-22646d17807d51c97b732ea8a779bc1bd233ebeb.tar.bz2
Merge branch '2.8'
* 2.8: (21 commits) Fix merge Fix typo Various fixes esp. on Windows Fix the validation of form resources to register the default theme Fix the retrieval of the value with property path when using a loader [appveyor] minor enhancements [Process] Disable failing tests on Windows [Translation] Fix the string casting in the XliffFileLoader Windows and Intl fixes Add appveyor.yml for C.I. on Windows [VarDumper] fixed HtmlDumper to target specific the head tag [travis] merge php: nightly and deps=high test-matrix lines consistently use str_replace to unify directory separators Support omitting the <target> node in an .xlf file. Fix the handling of values for multiple choice types moved PHP nightly to PHP 7.0 fixed tests using deprecation features [Form] made deprecation notice more precise fixed CS Fix BC break after split of ACL from core ... Conflicts: .travis.yml composer.json src/Symfony/Bundle/TwigBundle/DependencyInjection/Configuration.php src/Symfony/Component/Intl/DateFormatter/IntlDateFormatter.php src/Symfony/Component/Intl/Tests/DateFormatter/AbstractIntlDateFormatterTest.php src/Symfony/Component/Locale/Tests/LocaleTest.php
Diffstat (limited to 'Core')
-rw-r--r--Core/Authentication/Token/AbstractToken.php2
-rw-r--r--Core/Authentication/Token/PreAuthenticatedToken.php7
2 files changed, 8 insertions, 1 deletions
diff --git a/Core/Authentication/Token/AbstractToken.php b/Core/Authentication/Token/AbstractToken.php
index 1d12ab0..7538648 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[] $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 abcd2bf..1798203 100644
--- a/Core/Authentication/Token/PreAuthenticatedToken.php
+++ b/Core/Authentication/Token/PreAuthenticatedToken.php
@@ -11,6 +11,8 @@
namespace Symfony\Component\Security\Core\Authentication\Token;
+use Symfony\Component\Security\Core\Role\RoleInterface;
+
/**
* PreAuthenticatedToken implements a pre-authenticated token.
*
@@ -23,6 +25,11 @@ class PreAuthenticatedToken extends AbstractToken
/**
* Constructor.
+ *
+ * @param string|object $user The user
+ * @param mixed $credentials The user credentials
+ * @param string $providerKey The provider key
+ * @param RoleInterface[]|string[] $roles An array of roles
*/
public function __construct($user, $credentials, $providerKey, array $roles = array())
{