diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2014-12-30 10:03:46 +0100 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2014-12-30 10:03:46 +0100 |
| commit | cd277e8552ccb2c0242b244473c708b5c6600b74 (patch) | |
| tree | a4ceeb5ecd6dccdfa895052f0326e12ae98141e2 /Core | |
| parent | 91e9fcb3bf19727509df4b6a89568db78e953c7d (diff) | |
| parent | f751ab52989df43f6bebbec3a7ba5dd5ecccaa62 (diff) | |
| download | symfony-security-cd277e8552ccb2c0242b244473c708b5c6600b74.zip symfony-security-cd277e8552ccb2c0242b244473c708b5c6600b74.tar.gz symfony-security-cd277e8552ccb2c0242b244473c708b5c6600b74.tar.bz2 | |
Merge branch '2.3' into 2.5
* 2.3:
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
Make fabbot happy
Clean up testing
[DomCrawler] fixed bug #12143
Conflicts:
src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php
src/Symfony/Bundle/FrameworkBundle/Tests/Templating/TimedPhpEngineTest.php
src/Symfony/Bundle/TwigBundle/Tests/Loader/FilesystemLoaderTest.php
src/Symfony/Component/Console/Application.php
src/Symfony/Component/DomCrawler/Crawler.php
src/Symfony/Component/Form/Tests/Extension/Core/Type/CollectionTypeTest.php
src/Symfony/Component/Form/Tests/Extension/Csrf/Type/FormTypeCsrfExtensionTest.php
src/Symfony/Component/HttpKernel/Tests/Bundle/BundleTest.php
src/Symfony/Component/Serializer/Encoder/EncoderInterface.php
src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
src/Symfony/Component/Validator/Tests/Mapping/ClassMetadataFactoryTest.php
Diffstat (limited to 'Core')
| -rw-r--r-- | Core/Authentication/Provider/UserAuthenticationProvider.php | 2 | ||||
| -rw-r--r-- | Core/Tests/Authentication/AuthenticationTrustResolverTest.php | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/Core/Authentication/Provider/UserAuthenticationProvider.php b/Core/Authentication/Provider/UserAuthenticationProvider.php index 3728c01..b948135 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) { diff --git a/Core/Tests/Authentication/AuthenticationTrustResolverTest.php b/Core/Tests/Authentication/AuthenticationTrustResolverTest.php index 07ce08b..3640981 100644 --- a/Core/Tests/Authentication/AuthenticationTrustResolverTest.php +++ b/Core/Tests/Authentication/AuthenticationTrustResolverTest.php @@ -11,8 +11,6 @@ namespace Symfony\Component\Security\Core\Tests\Authentication; -use Symfony\Component\Security\Core\Authentication\Token\AnonymousToken; -use Symfony\Component\Security\Core\Authentication\Token\RememberMeToken; use Symfony\Component\Security\Core\Authentication\AuthenticationTrustResolver; class AuthenticationTrustResolverTest extends \PHPUnit_Framework_TestCase |