Skip to content

Commit 836a614

Browse files
committed
Merge branch '6.4' into 7.1
* 6.4: [Form] Remove unnecessary imports minor #58472 CS: clean some whitespaces/indentation (keradus) Fix newline harden test to not depend on the system's configured default timezone [Form] Support intl.use_exceptions/error_level in NumberToLocalizedStringTransformer [Doctrine][Messenger] Use common sequence name to get id from Oracle [ExpressionLanguage] Add missing test case for `Lexer` [FrameworkBundle] Fix passing request_stack to session.listener ensure session storages are opened in tests before destroying them [Serializer] Fix `ObjectNormalizer` gives warnings on normalizing with public static property [HttpKernel] Correctly merge `max-age`/`s-maxage` and `Expires` headers [Security][Validator] Check translations for Czech [Security] Fix serialized object representation in tests [DoctrineBridge] Fix risky test warnings [Serializer] Catch `NotNormalizableValueException` for variadic parameters
2 parents f4fce9d + cd77610 commit 836a614

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

Resources/config/session.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@
9090
'session_factory' => service('session.factory')->ignoreOnInvalid(),
9191
'logger' => service('logger')->ignoreOnInvalid(),
9292
'session_collector' => service('data_collector.request.session_collector')->ignoreOnInvalid(),
93+
'request_stack' => service('request_stack')->ignoreOnInvalid(),
9394
]),
9495
param('kernel.debug'),
9596
param('session.storage.options'),

Tests/DependencyInjection/FrameworkExtensionTestCase.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -687,7 +687,7 @@ public function testNullSessionHandler()
687687
$this->assertNull($container->getParameter('session.save_path'));
688688
$this->assertSame('session.handler.native', (string) $container->getAlias('session.handler'));
689689

690-
$expected = ['session_factory', 'logger', 'session_collector'];
690+
$expected = ['session_factory', 'logger', 'session_collector', 'request_stack'];
691691
$this->assertEquals($expected, array_keys($container->getDefinition('session_listener')->getArgument(0)->getValues()));
692692
$this->assertFalse($container->getDefinition('session.storage.factory.native')->getArgument(3));
693693
}
@@ -1894,7 +1894,7 @@ public function testSessionCookieSecureAuto()
18941894
{
18951895
$container = $this->createContainerFromFile('session_cookie_secure_auto');
18961896

1897-
$expected = ['session_factory', 'logger', 'session_collector'];
1897+
$expected = ['session_factory', 'logger', 'session_collector', 'request_stack'];
18981898
$this->assertEquals($expected, array_keys($container->getDefinition('session_listener')->getArgument(0)->getValues()));
18991899
}
19001900

0 commit comments

Comments
 (0)