summaryrefslogtreecommitdiffstats
path: root/Core/Authentication
diff options
context:
space:
mode:
authorFabien Potencier <fabien.potencier@gmail.com>2014-04-18 22:37:09 +0200
committerFabien Potencier <fabien.potencier@gmail.com>2014-04-18 22:37:09 +0200
commit2a3393fbb9f593f6d0958a3058466593d6f9f69f (patch)
tree88d1331f726d63a31c8a1bbd34f4df0e86f513ad /Core/Authentication
parente61596f268884e2584fb667016b4c3ad72270a1d (diff)
parent28fd9e9e753e8ad7384e0ba7baf0a82ff9c57e42 (diff)
downloadsymfony-security-2a3393fbb9f593f6d0958a3058466593d6f9f69f.zip
symfony-security-2a3393fbb9f593f6d0958a3058466593d6f9f69f.tar.gz
symfony-security-2a3393fbb9f593f6d0958a3058466593d6f9f69f.tar.bz2
Merge branch '2.3' into 2.4
* 2.3: Textarea value should default to empty string instead of null. Fix doc blocks [Process] Fix #10681, process are failing on Windows Server 2003 [Security] fix DBAL connection typehint [HttpFoundation] status 201 is allowed to have a body unified return null usages Conflicts: src/Symfony/Component/Console/Helper/DescriptorHelper.php src/Symfony/Component/DependencyInjection/ContainerBuilder.php src/Symfony/Component/Finder/Tests/Iterator/RecursiveDirectoryIteratorTest.php src/Symfony/Component/Form/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformer.php src/Symfony/Component/HttpKernel/Fragment/InlineFragmentRenderer.php
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();