diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2014-12-30 10:04:52 +0100 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2014-12-30 10:04:52 +0100 |
| commit | be21bcbd329bb50afa7c91a7d7d4e3c49caaca57 (patch) | |
| tree | 4f2c64e9a7aeb2245fa233a6ffd0f2d5900a1d42 /Core/Authentication | |
| parent | 8d6c4e20afe24a18f6d54bf38f910e27d7abe615 (diff) | |
| parent | cd277e8552ccb2c0242b244473c708b5c6600b74 (diff) | |
| download | symfony-security-be21bcbd329bb50afa7c91a7d7d4e3c49caaca57.zip symfony-security-be21bcbd329bb50afa7c91a7d7d4e3c49caaca57.tar.gz symfony-security-be21bcbd329bb50afa7c91a7d7d4e3c49caaca57.tar.bz2 | |
Merge branch '2.5' into 2.6
* 2.5:
Updated generateSql tool
Fix the implementation of deprecated Locale classes
Fix phpdoc and coding standards
Replace usages of the deprecated TypeTestCase by the new one
Remove usages of deprecated constants
Update functional tests to use the PSR NullLogger
fix regression in form tests after pr #13027 | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | -
Make fabbot happy
Clean up testing
No global state for isolated tests and other fixes
No global state for isolated tests and other fixes
fix #10054 - form data collector with dynamic fields
[TwigBundle] Moved the setting of the default escaping strategy from the Twig engine to the Twig environment
[Debug] fix checkip6
[HttpFoundation] fixed error when an IP in the X-Forwarded-For HTTP header contains a port
Update the note about origins of the CssSelector component.
Use the correct cssselect library name in docblocks.
[DomCrawler] fixed bug #12143
Conflicts:
src/Symfony/Bundle/FrameworkBundle/Templating/GlobalVariables.php
src/Symfony/Component/Serializer/Normalizer/DenormalizableInterface.php
Diffstat (limited to 'Core/Authentication')
| -rw-r--r-- | Core/Authentication/Provider/UserAuthenticationProvider.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Core/Authentication/Provider/UserAuthenticationProvider.php b/Core/Authentication/Provider/UserAuthenticationProvider.php index 4371abf..55ebed4 100644 --- a/Core/Authentication/Provider/UserAuthenticationProvider.php +++ b/Core/Authentication/Provider/UserAuthenticationProvider.php @@ -113,7 +113,7 @@ abstract class UserAuthenticationProvider implements AuthenticationProviderInter * @param UserInterface $user The user * @param TokenInterface $token The token * - * @return Role[] The user roles + * @return array The user roles */ private function getRoles(UserInterface $user, TokenInterface $token) { |