diff options
| author | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-05-12 17:48:43 +0200 |
|---|---|---|
| committer | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-05-12 17:48:43 +0200 |
| commit | 3574d2f3848feb286a6f9b43dedce2d4f2634440 (patch) | |
| tree | 9f7e9807c3775ef2694140d33da23ac67ddb7301 /Http | |
| parent | d1087257354aca87ceeea2116cb20326354baa88 (diff) | |
| parent | 165c5e5d50896e657ff2b0d1663b4b224ef8294c (diff) | |
| download | symfony-security-3574d2f3848feb286a6f9b43dedce2d4f2634440.zip symfony-security-3574d2f3848feb286a6f9b43dedce2d4f2634440.tar.gz symfony-security-3574d2f3848feb286a6f9b43dedce2d4f2634440.tar.bz2 | |
Merge branch '2.8'
* 2.8: (77 commits)
[travis] Use container-based infrastructure
[HttpKernel] use ConfigCache::getPath() method when it exists
[PropertyAccess] Fix setting public property on a class having a magic getter
[Routing] Display file which contain deprecated option
ContainerInterface: unused exception dropped
bumped Symfony version to 2.6.8
updated VERSION for 2.6.7
updated CHANGELOG for 2.6.7
bumped Symfony version to 2.3.29
updated VERSION for 2.3.28
update CONTRIBUTORS for 2.3.28
updated CHANGELOG for 2.3.28
[Debug] Fixed ClassNotFoundFatalErrorHandlerTest
[SecurityBundle] use access decision constants in config
[SecurityBundle] use session auth constants in config
PhpDoc fix in AbstractRememberMeServices
[FrameworkBundle][DX] Add option to specify additional translation loading paths
[Filesystem] Simplified an if statement
fixed CS
[SecurityBundle] Use Enum Nodes Instead Of Scalar
...
Conflicts:
CHANGELOG-2.3.md
CHANGELOG-2.6.md
src/Symfony/Bridge/Swiftmailer/composer.json
src/Symfony/Bundle/DebugBundle/composer.json
src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php
src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/full.xml
src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/event_dispatcher_1_event1.txt
src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/event_dispatcher_1_events.txt
src/Symfony/Component/Debug/DebugClassLoader.php
src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php
src/Symfony/Component/Form/README.md
src/Symfony/Component/Intl/README.md
src/Symfony/Component/Locale/composer.json
src/Symfony/Component/Routing/Loader/XmlFileLoader.php
src/Symfony/Component/Routing/Loader/YamlFileLoader.php
src/Symfony/Component/Security/README.md
src/Symfony/Component/Serializer/Tests/Normalizer/GetSetMethodNormalizerTest.php
src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php
src/Symfony/Component/Serializer/Tests/Normalizer/PropertyNormalizerTest.php
src/Symfony/Component/Translation/README.md
src/Symfony/Component/Validator/README.md
src/Symfony/Component/Yaml/Yaml.php
Diffstat (limited to 'Http')
| -rw-r--r-- | Http/RememberMe/AbstractRememberMeServices.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Http/RememberMe/AbstractRememberMeServices.php b/Http/RememberMe/AbstractRememberMeServices.php index 047d624..3ac584a 100644 --- a/Http/RememberMe/AbstractRememberMeServices.php +++ b/Http/RememberMe/AbstractRememberMeServices.php @@ -217,7 +217,7 @@ abstract class AbstractRememberMeServices implements RememberMeServicesInterface * @param array $cookieParts * @param Request $request * - * @return TokenInterface + * @return UserInterface */ abstract protected function processAutoLoginCookie(array $cookieParts, Request $request); |