Merge branch '5.4' into 6.4

xabbuh · xabbuh · commit cd776106cf3c · 2024-10-09T10:40:40.000+02:00
* 5.4:
  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
  [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
  [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
diff --git a/Resources/config/session.php b/Resources/config/session.php
@@ -90,6 +90,7 @@
                     'session_factory' => service('session.factory')->ignoreOnInvalid(),
                     'logger' => service('logger')->ignoreOnInvalid(),
                     'session_collector' => service('data_collector.request.session_collector')->ignoreOnInvalid(),
+                    'request_stack' => service('request_stack')->ignoreOnInvalid(),
                 ]),
                 param('kernel.debug'),
                 param('session.storage.options'),
diff --git a/Tests/DependencyInjection/FrameworkExtensionTestCase.php b/Tests/DependencyInjection/FrameworkExtensionTestCase.php
@@ -677,7 +677,7 @@ public function testNullSessionHandler()
         $this->assertNull($container->getParameter('session.save_path'));
         $this->assertSame('session.handler.native', (string) $container->getAlias('session.handler'));
 
-        $expected = ['session_factory', 'logger', 'session_collector'];
+        $expected = ['session_factory', 'logger', 'session_collector', 'request_stack'];
         $this->assertEquals($expected, array_keys($container->getDefinition('session_listener')->getArgument(0)->getValues()));
         $this->assertFalse($container->getDefinition('session.storage.factory.native')->getArgument(3));
     }
@@ -1939,7 +1939,7 @@ public function testSessionCookieSecureAuto()
     {
         $container = $this->createContainerFromFile('session_cookie_secure_auto');
 
-        $expected = ['session_factory', 'logger', 'session_collector'];
+        $expected = ['session_factory', 'logger', 'session_collector', 'request_stack'];
         $this->assertEquals($expected, array_keys($container->getDefinition('session_listener')->getArgument(0)->getValues()));
     }
 

Original file line number	Diff line number	Diff line change
`@@ -677,7 +677,7 @@ public function testNullSessionHandler()`
`677`	`677`	`$this->assertNull($container->getParameter('session.save_path'));`
`678`	`678`	`$this->assertSame('session.handler.native', (string) $container->getAlias('session.handler'));`
`679`	`679`
`680`		`- $expected = ['session_factory', 'logger', 'session_collector'];`
	`680`	`+ $expected = ['session_factory', 'logger', 'session_collector', 'request_stack'];`
`681`	`681`	`$this->assertEquals($expected, array_keys($container->getDefinition('session_listener')->getArgument(0)->getValues()));`
`682`	`682`	`$this->assertFalse($container->getDefinition('session.storage.factory.native')->getArgument(3));`
`683`	`683`	`}`
`@@ -1939,7 +1939,7 @@ public function testSessionCookieSecureAuto()`
`1939`	`1939`	`{`
`1940`	`1940`	`$container = $this->createContainerFromFile('session_cookie_secure_auto');`
`1941`	`1941`
`1942`		`- $expected = ['session_factory', 'logger', 'session_collector'];`
	`1942`	`+ $expected = ['session_factory', 'logger', 'session_collector', 'request_stack'];`
`1943`	`1943`	`$this->assertEquals($expected, array_keys($container->getDefinition('session_listener')->getArgument(0)->getValues()));`
`1944`	`1944`	`}`
`1945`	`1945`