Merge branch '5.4' into 6.4

* 5.4:
  minor symfony#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

Author: xabbuh

src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypePerformanceTest.php

@@ -25,7 +25,7 @@
  */
 class EntityTypePerformanceTest extends FormPerformanceTestCase
 {
-    private const ENTITY_CLASS = 'Symfony\Bridge\Doctrine\Tests\Fixtures\SingleIntIdEntity';
+    private const ENTITY_CLASS = SingleIntIdEntity::class;
 
     private EntityManager $em;
 

src/Symfony/Bridge/Twig/Tests/Node/SearchAndRenderBlockNodeTest.php

@@ -62,9 +62,9 @@ public function testCompileWidgetWithVariables()
         if (class_exists(Nodes::class)) {
             $arguments = new Nodes([
                 new NameExpression('form', 0),
-            new ArrayExpression([
-                new ConstantExpression('foo', 0),
-                new ConstantExpression('bar', 0),
+                new ArrayExpression([
+                    new ConstantExpression('foo', 0),
+                    new ConstantExpression('bar', 0),
                 ], 0),
             ]);
         } else {
@@ -226,9 +226,9 @@ public function testCompileLabelWithAttributes()
             $arguments = new Nodes([
                 new NameExpression('form', 0),
                 new ConstantExpression(null, 0),
-            new ArrayExpression([
-                new ConstantExpression('foo', 0),
-                new ConstantExpression('bar', 0),
+                new ArrayExpression([
+                    new ConstantExpression('foo', 0),
+                    new ConstantExpression('bar', 0),
                 ], 0),
             ]);
         } else {
@@ -268,11 +268,11 @@ public function testCompileLabelWithLabelAndAttributes()
             $arguments = new Nodes([
                 new NameExpression('form', 0),
                 new ConstantExpression('value in argument', 0),
-            new ArrayExpression([
-                new ConstantExpression('foo', 0),
-                new ConstantExpression('bar', 0),
-                new ConstantExpression('label', 0),
-                new ConstantExpression('value in attributes', 0),
+                new ArrayExpression([
+                    new ConstantExpression('foo', 0),
+                    new ConstantExpression('bar', 0),
+                    new ConstantExpression('label', 0),
+                    new ConstantExpression('value in attributes', 0),
                 ], 0),
             ]);
         } else {
@@ -310,14 +310,14 @@ public function testCompileLabelWithLabelThatEvaluatesToNull()
         if (class_exists(Nodes::class)) {
             $arguments = new Nodes([
                 new NameExpression('form', 0),
-            new ConditionalExpression(
-                // if
-                new ConstantExpression(true, 0),
-                // then
-                new ConstantExpression(null, 0),
-                // else
-                new ConstantExpression(null, 0),
-                0
+                new ConditionalExpression(
+                    // if
+                    new ConstantExpression(true, 0),
+                    // then
+                    new ConstantExpression(null, 0),
+                    // else
+                    new ConstantExpression(null, 0),
+                    0
                 ),
             ]);
         } else {
@@ -361,20 +361,20 @@ public function testCompileLabelWithLabelThatEvaluatesToNullAndAttributes()
         if (class_exists(Nodes::class)) {
             $arguments = new Nodes([
                 new NameExpression('form', 0),
-            new ConditionalExpression(
-                // if
-                new ConstantExpression(true, 0),
-                // then
-                new ConstantExpression(null, 0),
-                // else
-                new ConstantExpression(null, 0),
-                0
-            ),
-            new ArrayExpression([
-                new ConstantExpression('foo', 0),
-                new ConstantExpression('bar', 0),
-                new ConstantExpression('label', 0),
-                new ConstantExpression('value in attributes', 0),
+                new ConditionalExpression(
+                    // if
+                    new ConstantExpression(true, 0),
+                    // then
+                    new ConstantExpression(null, 0),
+                    // else
+                    new ConstantExpression(null, 0),
+                    0
+                ),
+                new ArrayExpression([
+                    new ConstantExpression('foo', 0),
+                    new ConstantExpression('bar', 0),
+                    new ConstantExpression('label', 0),
+                    new ConstantExpression('value in attributes', 0),
                 ], 0),
             ]);
         } else {

src/Symfony/Bundle/FrameworkBundle/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'),

src/Symfony/Bundle/FrameworkBundle/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()));
     }