diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2015-05-11 03:52:28 +0200 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2015-05-11 03:52:28 +0200 |
| commit | 8a7c037d1db1bd2d1eeceb7ae714f89e78ea395b (patch) | |
| tree | 492b81ec71d28c6fc3f555cfff4080805bd7746a /Http/RememberMe | |
| parent | 588fe277b5b8319708a1afddb6e53cfcfdfa2281 (diff) | |
| parent | 4bc570e4ecad43b827f5c8852a4a4616ede89e4e (diff) | |
| download | symfony-security-8a7c037d1db1bd2d1eeceb7ae714f89e78ea395b.zip symfony-security-8a7c037d1db1bd2d1eeceb7ae714f89e78ea395b.tar.gz symfony-security-8a7c037d1db1bd2d1eeceb7ae714f89e78ea395b.tar.bz2 | |
Merge branch '2.3' into 2.6v2.6.7
* 2.3:
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
PhpDoc fix in AbstractRememberMeServices
Conflicts:
src/Symfony/Component/HttpKernel/Kernel.php
Diffstat (limited to 'Http/RememberMe')
| -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 659510a..b14e36d 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); |