summaryrefslogtreecommitdiffstats
path: root/Core/Authentication
diff options
context:
space:
mode:
authorFabien Potencier <fabien.potencier@gmail.com>2014-04-18 22:35:25 +0200
committerFabien Potencier <fabien.potencier@gmail.com>2014-04-18 22:35:25 +0200
commit28fd9e9e753e8ad7384e0ba7baf0a82ff9c57e42 (patch)
treede3fe561d214b657a5f638a905427de03d1aa6a2 /Core/Authentication
parent67198df5369976c4e615011d443dd2a1836362a6 (diff)
parent092ef5478bef202a86b53f2ca0cbaa2f43d45594 (diff)
downloadsymfony-security-28fd9e9e753e8ad7384e0ba7baf0a82ff9c57e42.zip
symfony-security-28fd9e9e753e8ad7384e0ba7baf0a82ff9c57e42.tar.gz
symfony-security-28fd9e9e753e8ad7384e0ba7baf0a82ff9c57e42.tar.bz2
minor #10717 unified return null usages (fabpot)
This PR was merged into the 2.3 branch. Discussion ---------- unified return null usages | Q | A | ------------- | --- | License | MIT This PR unifies the way we return `null` from a function or method: * always use `return;` instead of `return null;` (the current code base uses both); * never use `return;` at the end of a function/method. Commits ------- d1d569b unified return null usages
Diffstat (limited to 'Core/Authentication')
-rw-r--r--Core/Authentication/Provider/AnonymousAuthenticationProvider.php2
-rw-r--r--Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php2
-rw-r--r--Core/Authentication/Provider/UserAuthenticationProvider.php2
3 files changed, 3 insertions, 3 deletions
diff --git a/Core/Authentication/Provider/AnonymousAuthenticationProvider.php b/Core/Authentication/Provider/AnonymousAuthenticationProvider.php
index ea91075..7fbbf85 100644
--- a/Core/Authentication/Provider/AnonymousAuthenticationProvider.php
+++ b/Core/Authentication/Provider/AnonymousAuthenticationProvider.php
@@ -40,7 +40,7 @@ class AnonymousAuthenticationProvider implements AuthenticationProviderInterface
public function authenticate(TokenInterface $token)
{
if (!$this->supports($token)) {
- return null;
+ return;
}
if ($this->key !== $token->getKey()) {
diff --git a/Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php b/Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php
index 3affd78..21ce8d0 100644
--- a/Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php
+++ b/Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php
@@ -53,7 +53,7 @@ class PreAuthenticatedAuthenticationProvider implements AuthenticationProviderIn
public function authenticate(TokenInterface $token)
{
if (!$this->supports($token)) {
- return null;
+ return;
}
if (!$user = $token->getUser()) {
diff --git a/Core/Authentication/Provider/UserAuthenticationProvider.php b/Core/Authentication/Provider/UserAuthenticationProvider.php
index 14fbdda..3728c01 100644
--- a/Core/Authentication/Provider/UserAuthenticationProvider.php
+++ b/Core/Authentication/Provider/UserAuthenticationProvider.php
@@ -58,7 +58,7 @@ abstract class UserAuthenticationProvider implements AuthenticationProviderInter
public function authenticate(TokenInterface $token)
{
if (!$this->supports($token)) {
- return null;
+ return;
}
$username = $token->getUsername();