summaryrefslogtreecommitdiffstats
path: root/Http/Firewall
diff options
context:
space:
mode:
authorFabien Potencier <fabien.potencier@gmail.com>2012-07-21 13:16:18 +0200
committerFabien Potencier <fabien.potencier@gmail.com>2012-07-21 13:16:18 +0200
commit217d89efef99ac33ccbe343ef9ab33749ea36e9d (patch)
tree2a1e8c173bdaaa1d8145b3d1c6cde8aa4e22d178 /Http/Firewall
parenta6f3f99859e3638dd15de4552e204ad288c6c43a (diff)
parentab0b488e0283d1b2809a0cb87b7048fc878f5ef5 (diff)
downloadsymfony-security-217d89efef99ac33ccbe343ef9ab33749ea36e9d.zip
symfony-security-217d89efef99ac33ccbe343ef9ab33749ea36e9d.tar.gz
symfony-security-217d89efef99ac33ccbe343ef9ab33749ea36e9d.tar.bz2
merged branch KaipiYann/Fix-DocBlock-attemptAuthentication (PR #4996)
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: -
Diffstat (limited to 'Http/Firewall')
-rw-r--r--Http/Firewall/AbstractAuthenticationListener.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/Http/Firewall/AbstractAuthenticationListener.php b/Http/Firewall/AbstractAuthenticationListener.php
index f752e84..1af1646 100644
--- a/Http/Firewall/AbstractAuthenticationListener.php
+++ b/Http/Firewall/AbstractAuthenticationListener.php
@@ -170,7 +170,7 @@ abstract class AbstractAuthenticationListener implements ListenerInterface
*
* @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
*/