diff options
author | Fabien Potencier <fabien.potencier@gmail.com> | 2014-04-18 22:37:09 +0200 |
---|---|---|
committer | Fabien Potencier <fabien.potencier@gmail.com> | 2014-04-18 22:37:09 +0200 |
commit | 2a3393fbb9f593f6d0958a3058466593d6f9f69f (patch) | |
tree | 88d1331f726d63a31c8a1bbd34f4df0e86f513ad /Http/Firewall | |
parent | e61596f268884e2584fb667016b4c3ad72270a1d (diff) | |
parent | 28fd9e9e753e8ad7384e0ba7baf0a82ff9c57e42 (diff) | |
download | symfony-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 'Http/Firewall')
-rw-r--r-- | Http/Firewall/ContextListener.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Http/Firewall/ContextListener.php b/Http/Firewall/ContextListener.php index 05e260e..435c440 100644 --- a/Http/Firewall/ContextListener.php +++ b/Http/Firewall/ContextListener.php @@ -170,7 +170,7 @@ class ContextListener implements ListenerInterface $this->logger->warning(sprintf('Username "%s" could not be found.', $notFound->getUsername())); } - return null; + return; } } |