Skip to content

Commit 9e74acf

Browse files
committed
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
2 parents 1611801 + b4c7605 commit 9e74acf

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

RememberMe/AbstractRememberMeServices.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ protected function isRememberMeRequested(Request $request)
303303

304304
$parameter = $request->get($this->options['remember_me_parameter'], null, true);
305305

306-
if ($parameter === null && null !== $this->logger) {
306+
if (null === $parameter && null !== $this->logger) {
307307
$this->logger->debug(sprintf('Did not send remember-me cookie (remember-me parameter "%s" was not sent).', $this->options['remember_me_parameter']));
308308
}
309309

0 commit comments

Comments
 (0)