summaryrefslogtreecommitdiffstats
path: root/Http
diff options
context:
space:
mode:
authorFabien Potencier <fabien.potencier@gmail.com>2014-07-28 15:20:46 +0200
committerFabien Potencier <fabien.potencier@gmail.com>2014-07-28 15:20:46 +0200
commit2b0ef47facebdfd2e8f227c16247ecad946ec204 (patch)
tree14007184c4f721276bcacbd6ef6d2902978796d8 /Http
parent531c4a7fda814e9f918673173a9aa0b2666f21ed (diff)
parent5040c1c6890674d5298f76236942533744b1ef49 (diff)
downloadsymfony-security-2b0ef47facebdfd2e8f227c16247ecad946ec204.zip
symfony-security-2b0ef47facebdfd2e8f227c16247ecad946ec204.tar.gz
symfony-security-2b0ef47facebdfd2e8f227c16247ecad946ec204.tar.bz2
Merge branch '2.4' into 2.5
* 2.4: Update validators.eu.xlf fixed CS remove unused imports [Routing] simplify the XML schema file Unify null comparisons [EventDispatcher] don't count empty listeners [Process] Fix unit tests in sigchild environment [Process] fix signal handling in wait() [BrowserKit] refactor code and fix unquoted regex Fixed server HTTP_HOST port uri conversion [MonologBridge] fixed Console handler priorities Bring code into standard [Process] Add test to verify fix for issue #11421 [Process] Fixes issue #11421 [DependencyInjection] Pass a Scope instance instead of a scope name. Conflicts: src/Symfony/Bundle/FrameworkBundle/Test/WebTestCase.php src/Symfony/Component/DependencyInjection/Tests/Dumper/GraphvizDumperTest.php src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorCollectionTest.php
Diffstat (limited to 'Http')
-rw-r--r--Http/RememberMe/AbstractRememberMeServices.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/Http/RememberMe/AbstractRememberMeServices.php b/Http/RememberMe/AbstractRememberMeServices.php
index be84208..b868dae 100644
--- a/Http/RememberMe/AbstractRememberMeServices.php
+++ b/Http/RememberMe/AbstractRememberMeServices.php
@@ -303,7 +303,7 @@ abstract class AbstractRememberMeServices implements RememberMeServicesInterface
$parameter = $request->get($this->options['remember_me_parameter'], null, true);
- if ($parameter === null && null !== $this->logger) {
+ if (null === $parameter && null !== $this->logger) {
$this->logger->debug(sprintf('Did not send remember-me cookie (remember-me parameter "%s" was not sent).', $this->options['remember_me_parameter']));
}