Skip to content

Commit 74fd832

Browse files
committed
Merge branch '7.1' into 7.2
* 7.1: [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 91e5b65 + 836a614 commit 74fd832

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
@@ -689,7 +689,7 @@ public function testNullSessionHandler()
689689
$this->assertNull($container->getParameter('session.save_path'));
690690
$this->assertSame('session.handler.native', (string) $container->getAlias('session.handler'));
691691

692-
$expected = ['session_factory', 'logger', 'session_collector'];
692+
$expected = ['session_factory', 'logger', 'session_collector', 'request_stack'];
693693
$this->assertEquals($expected, array_keys($container->getDefinition('session_listener')->getArgument(0)->getValues()));
694694
$this->assertFalse($container->getDefinition('session.storage.factory.native')->getArgument(3));
695695
}
@@ -1926,7 +1926,7 @@ public function testSessionCookieSecureAuto()
19261926
{
19271927
$container = $this->createContainerFromFile('session_cookie_secure_auto');
19281928

1929-
$expected = ['session_factory', 'logger', 'session_collector'];
1929+
$expected = ['session_factory', 'logger', 'session_collector', 'request_stack'];
19301930
$this->assertEquals($expected, array_keys($container->getDefinition('session_listener')->getArgument(0)->getValues()));
19311931
}
19321932

0 commit comments

Comments
 (0)