diff options
author | Fabien Potencier <fabien.potencier@gmail.com> | 2014-07-28 15:13:16 +0200 |
---|---|---|
committer | Fabien Potencier <fabien.potencier@gmail.com> | 2014-07-28 15:13:16 +0200 |
commit | 5040c1c6890674d5298f76236942533744b1ef49 (patch) | |
tree | 78d818c7b585e2e93396418e880cc26ddbc71e73 /Http | |
parent | b2b3e0be1652603249f8781612f150c152537e3b (diff) | |
parent | 6c176dccbc44f5bd11ffc5613e6c4d023c3971b1 (diff) | |
download | symfony-security-5040c1c6890674d5298f76236942533744b1ef49.zip symfony-security-5040c1c6890674d5298f76236942533744b1ef49.tar.gz symfony-security-5040c1c6890674d5298f76236942533744b1ef49.tar.bz2 |
Merge branch '2.3' into 2.4
* 2.3:
Update validators.eu.xlf
fixed CS
remove unused imports
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
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/Component/EventDispatcher/Tests/EventDispatcherTest.php
Diffstat (limited to 'Http')
-rw-r--r-- | Http/RememberMe/AbstractRememberMeServices.php | 2 |
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'])); } |