Skip to content

Commit 7924871

Browse files
Merge branch '4.2'
* 4.2: (26 commits) Apply php-cs-fixer rule for array_key_exists() [Cache] fix warming up cache.system and apcu [Security] Change FormAuthenticator if condition handles multi-byte characters in autocomplete speed up tests running them without debug flag [Translations] added missing Croatian validators Fix getItems() performance issue with RedisCluster (php-redis) [VarDumper] Keep a ref to objects to ensure their handle cannot be reused while cloning IntegerType: reject submitted non-integer numbers be keen to newcomers [HttpKernel] Fix possible infinite loop of exceptions fixed CS [Validator] Added missing translations for Afrikaans do not validate non-submitted form fields in PATCH requests Update usage example in ArrayInput doc block. [Console] Prevent ArgvInput::getFirstArgument() from returning an option value [Validator] Fixed duplicate UUID fixed CS [EventDispatcher] Fix unknown priority Avoid mutating the Finder when building the iterator ...
2 parents 00b4f06 + d958818 commit 7924871

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

DependencyInjection/SecurityExtension.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public function prepend(ContainerBuilder $container)
6767
foreach ($container->getExtensionConfig('framework') as $config) {
6868
if (isset($config['session']) && \is_array($config['session'])) {
6969
$rememberMeSecureDefault = $config['session']['cookie_secure'] ?? $rememberMeSecureDefault;
70-
$rememberMeSameSiteDefault = array_key_exists('cookie_samesite', $config['session']) ? $config['session']['cookie_samesite'] : $rememberMeSameSiteDefault;
70+
$rememberMeSameSiteDefault = \array_key_exists('cookie_samesite', $config['session']) ? $config['session']['cookie_samesite'] : $rememberMeSameSiteDefault;
7171
}
7272
}
7373
foreach ($this->listenerPositions as $position) {
@@ -412,7 +412,7 @@ private function createFirewall(ContainerBuilder $container, $id, $firewall, &$a
412412
foreach ($this->factories as $position) {
413413
foreach ($position as $factory) {
414414
$key = str_replace('-', '_', $factory->getKey());
415-
if (array_key_exists($key, $firewall)) {
415+
if (\array_key_exists($key, $firewall)) {
416416
$listenerKeys[] = $key;
417417
}
418418
}

Tests/Functional/WebTestCase.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ protected static function createKernel(array $options = [])
6262
$options['test_case'],
6363
isset($options['root_config']) ? $options['root_config'] : 'config.yml',
6464
isset($options['environment']) ? $options['environment'] : strtolower(static::getVarDir().$options['test_case']),
65-
isset($options['debug']) ? $options['debug'] : true
65+
isset($options['debug']) ? $options['debug'] : false
6666
);
6767
}
6868

0 commit comments

Comments
 (0)