Skip to content
This repository was archived by the owner on May 31, 2024. It is now read-only.

Commit 69aa826

Browse files
committed
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
2 parents bc667cc + 8a7c037 commit 69aa826

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Http/RememberMe/AbstractRememberMeServices.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ final public function loginSuccess(Request $request, Response $response, TokenIn
217217
* @param array $cookieParts
218218
* @param Request $request
219219
*
220-
* @return TokenInterface
220+
* @return UserInterface
221221
*/
222222
abstract protected function processAutoLoginCookie(array $cookieParts, Request $request);
223223

0 commit comments

Comments
 (0)