Merge branch '2.3' into 2.6

fabpot · fabpot · commit 8a7c037d1db1 · 2015-05-11T03:52:28.000+02:00
* 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
diff --git a/Http/RememberMe/AbstractRememberMeServices.php b/Http/RememberMe/AbstractRememberMeServices.php
@@ -217,7 +217,7 @@ final public function loginSuccess(Request $request, Response $response, TokenIn
      * @param array   $cookieParts
      * @param Request $request
      *
-     * @return TokenInterface
+     * @return UserInterface
      */
     abstract protected function processAutoLoginCookie(array $cookieParts, Request $request);
 

Original file line number	Diff line number	Diff line change
`@@ -217,7 +217,7 @@ final public function loginSuccess(Request $request, Response $response, TokenIn`
`217`	`217`	`* @param array $cookieParts`
`218`	`218`	`* @param Request $request`
`219`	`219`	`*`
`220`		`- * @return TokenInterface`
	`220`	`+ * @return UserInterface`
`221`	`221`	`*/`
`222`	`222`	`abstract protected function processAutoLoginCookie(array $cookieParts, Request $request);`
`223`	`223`