summaryrefslogtreecommitdiffstats
path: root/Core
diff options
context:
space:
mode:
authorFabien Potencier <fabien.potencier@gmail.com>2012-06-20 21:32:48 +0200
committerFabien Potencier <fabien.potencier@gmail.com>2012-06-20 21:33:33 +0200
commit1ddd70f2c3d9baeb28f1f13024a100fd25e6fdde (patch)
tree88202edf947a8e5d47c79928d3674754bb5305c3 /Core
parent47c17d9466eecf765733bc359250faea94aa4b26 (diff)
parent1d26f9286503935f3d4670d2087c1194063687be (diff)
downloadsymfony-security-1ddd70f2c3d9baeb28f1f13024a100fd25e6fdde.zip
symfony-security-1ddd70f2c3d9baeb28f1f13024a100fd25e6fdde.tar.gz
symfony-security-1ddd70f2c3d9baeb28f1f13024a100fd25e6fdde.tar.bz2
merged 2.0
Diffstat (limited to 'Core')
-rw-r--r--Core/Authentication/Provider/DaoAuthenticationProvider.php2
-rw-r--r--Core/Authentication/Provider/UserAuthenticationProvider.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/Core/Authentication/Provider/DaoAuthenticationProvider.php b/Core/Authentication/Provider/DaoAuthenticationProvider.php
index f17eaa4..f22045f 100644
--- a/Core/Authentication/Provider/DaoAuthenticationProvider.php
+++ b/Core/Authentication/Provider/DaoAuthenticationProvider.php
@@ -59,7 +59,7 @@ class DaoAuthenticationProvider extends UserAuthenticationProvider
throw new BadCredentialsException('The credentials were changed from another session.');
}
} else {
- if (!$presentedPassword = $token->getCredentials()) {
+ if ("" === ($presentedPassword = $token->getCredentials())) {
throw new BadCredentialsException('The presented password cannot be empty.');
}
diff --git a/Core/Authentication/Provider/UserAuthenticationProvider.php b/Core/Authentication/Provider/UserAuthenticationProvider.php
index f0463ea..32d7971 100644
--- a/Core/Authentication/Provider/UserAuthenticationProvider.php
+++ b/Core/Authentication/Provider/UserAuthenticationProvider.php
@@ -109,7 +109,7 @@ abstract class UserAuthenticationProvider implements AuthenticationProviderInter
* @param string $username The username to retrieve
* @param UsernamePasswordToken $token The Token
*
- * @return array The user
+ * @return UserInterface The user
*
* @throws AuthenticationException if the credentials could not be validated
*/