summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Schultze <webmaster@tubo-world.de>2015-12-15 03:03:07 +0100
committerTobias Schultze <webmaster@tubo-world.de>2015-12-15 03:03:07 +0100
commitb3b647719aca1f081db95bbbed9cf492b8a4d849 (patch)
tree80c0c6022a41642cdc0ecf1fe154f3708fb49d6d
parent57ca1c2265f570cd2220052ee85ef45faeb6780a (diff)
parentcb6ed1127a7d17612e1deb4996f3115a94012fe5 (diff)
downloadsymfony-security-b3b647719aca1f081db95bbbed9cf492b8a4d849.zip
symfony-security-b3b647719aca1f081db95bbbed9cf492b8a4d849.tar.gz
symfony-security-b3b647719aca1f081db95bbbed9cf492b8a4d849.tar.bz2
Merge branch '2.8' into 3.0
-rw-r--r--Guard/GuardAuthenticatorInterface.php2
-rw-r--r--Http/EntryPoint/AuthenticationEntryPointInterface.php2
2 files changed, 3 insertions, 1 deletions
diff --git a/Guard/GuardAuthenticatorInterface.php b/Guard/GuardAuthenticatorInterface.php
index 6e62ae6..947594c 100644
--- a/Guard/GuardAuthenticatorInterface.php
+++ b/Guard/GuardAuthenticatorInterface.php
@@ -83,6 +83,8 @@ interface GuardAuthenticatorInterface extends AuthenticationEntryPointInterface
*
* @param mixed $credentials
* @param UserInterface $user
+ *
+ * @return bool
*
* @throws AuthenticationException
*/
diff --git a/Http/EntryPoint/AuthenticationEntryPointInterface.php b/Http/EntryPoint/AuthenticationEntryPointInterface.php
index df777f6..9bade0c 100644
--- a/Http/EntryPoint/AuthenticationEntryPointInterface.php
+++ b/Http/EntryPoint/AuthenticationEntryPointInterface.php
@@ -32,7 +32,7 @@ interface AuthenticationEntryPointInterface
*
* Examples:
* A) For a form login, you might redirect to the login page
- * return new Response('/login');
+ * return new RedirectResponse('/login');
* B) For an API token authentication system, you return a 401 response
* return new Response('Auth header required', 401);
*