diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2015-05-11 04:35:29 +0200 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2015-05-11 04:35:29 +0200 |
| commit | 69aa8266619387ed128df04d9909e8eda7e2e866 (patch) | |
| tree | 5dfa85f2ac0c5a3fc56fdecf7e74caaf49bfecd5 | |
| parent | bc667cc8328a48cf58923a9dd2bfbb83be66c9cd (diff) | |
| parent | 8a7c037d1db1bd2d1eeceb7ae714f89e78ea395b (diff) | |
| download | symfony-security-69aa8266619387ed128df04d9909e8eda7e2e866.zip symfony-security-69aa8266619387ed128df04d9909e8eda7e2e866.tar.gz symfony-security-69aa8266619387ed128df04d9909e8eda7e2e866.tar.bz2 | |
Merge branch '2.6' into 2.7
* 2.6: (21 commits)
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
[Filesystem] Simplified an if statement
[SecurityBundle] Use Enum Nodes Instead Of Scalar
[Debug 2.3] Fix test for PHP7
[HttpKernel] Check if "symfony/proxy-manager-bridge" package is installed
[Translation] simplify getMessages.
[Framework][Translation] added test for debug command.
Run tests on hhvm instead of hhvm-nightly
Use HTTPS in README and some other fixes
add more entropy to generated classnames
...
Conflicts:
.travis.yml
src/Symfony/Component/HttpKernel/Kernel.php
| -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); |