merged branch KaipiYann/Fix-DocBlock-attemptAuthentication (PR symfony#4996)

fabpot · fabpot · commit 6c256b01b087 · 2012-07-21T13:16:18.000+02:00
Commits ------- 134cc84 [Security] Fix DocBlock of attemptAuthentication Discussion ---------- [Security] Fix DocBlock of attemptAuthentication Bug fix: no Feature addition: no Backwards compatibility break: no Symfony2 tests pass: yes Fixes the following tickets: Todo: - License of the code: MIT Documentation PR: -
diff --git a/src/Symfony/Component/Security/Http/Firewall/AbstractAuthenticationListener.php b/src/Symfony/Component/Security/Http/Firewall/AbstractAuthenticationListener.php
@@ -170,7 +170,7 @@ protected function requiresAuthentication(Request $request)
      *
      * @param Request $request A Request instance
      *
-     * @return TokenInterface The authenticated token, or null if full authentication is not possible
+     * @return TokenInterface|Response|null The authenticated token, null if full authentication is not possible, or a Response
      *
      * @throws AuthenticationException if the authentication fails
      */

Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,7 @@ protected function requiresAuthentication(Request $request)`
`170`	`170`	`*`
`171`	`171`	`* @param Request $request A Request instance`
`172`	`172`	`*`
`173`		`- * @return TokenInterface The authenticated token, or null if full authentication is not possible`
	`173`	`+ * @return TokenInterface\|Response\|null The authenticated token, null if full authentication is not possible, or a Response`
`174`	`174`	`*`
`175`	`175`	`* @throws AuthenticationException if the authentication fails`
`176`	`176`	`*/`