Skip to content

Commit 7b4ec02

Browse files
xabbuhxabbuh
committed
Merge branch '5.4' into 6.4
* 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
2 parents bfc3039 + df81a1a commit 7b4ec02

File tree

26 files changed

+476
-261
lines changed

26 files changed

+476
-261
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
*/
2626
class EntityTypePerformanceTest extends FormPerformanceTestCase
2727
{
28-
private const ENTITY_CLASS = 'Symfony\Bridge\Doctrine\Tests\Fixtures\SingleIntIdEntity';
28+
private const ENTITY_CLASS = SingleIntIdEntity::class;
2929

3030
private EntityManager $em;
3131

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

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,9 @@ public function testCompileWidgetWithVariables()
6262
if (class_exists(Nodes::class)) {
6363
$arguments = new Nodes([
6464
new NameExpression('form', 0),
65-
new ArrayExpression([
66-
new ConstantExpression('foo', 0),
67-
new ConstantExpression('bar', 0),
65+
new ArrayExpression([
66+
new ConstantExpression('foo', 0),
67+
new ConstantExpression('bar', 0),
6868
], 0),
6969
]);
7070
} else {
@@ -226,9 +226,9 @@ public function testCompileLabelWithAttributes()
226226
$arguments = new Nodes([
227227
new NameExpression('form', 0),
228228
new ConstantExpression(null, 0),
229-
new ArrayExpression([
230-
new ConstantExpression('foo', 0),
231-
new ConstantExpression('bar', 0),
229+
new ArrayExpression([
230+
new ConstantExpression('foo', 0),
231+
new ConstantExpression('bar', 0),
232232
], 0),
233233
]);
234234
} else {
@@ -268,11 +268,11 @@ public function testCompileLabelWithLabelAndAttributes()
268268
$arguments = new Nodes([
269269
new NameExpression('form', 0),
270270
new ConstantExpression('value in argument', 0),
271-
new ArrayExpression([
272-
new ConstantExpression('foo', 0),
273-
new ConstantExpression('bar', 0),
274-
new ConstantExpression('label', 0),
275-
new ConstantExpression('value in attributes', 0),
271+
new ArrayExpression([
272+
new ConstantExpression('foo', 0),
273+
new ConstantExpression('bar', 0),
274+
new ConstantExpression('label', 0),
275+
new ConstantExpression('value in attributes', 0),
276276
], 0),
277277
]);
278278
} else {
@@ -310,14 +310,14 @@ public function testCompileLabelWithLabelThatEvaluatesToNull()
310310
if (class_exists(Nodes::class)) {
311311
$arguments = new Nodes([
312312
new NameExpression('form', 0),
313-
new ConditionalExpression(
314-
// if
315-
new ConstantExpression(true, 0),
316-
// then
317-
new ConstantExpression(null, 0),
318-
// else
319-
new ConstantExpression(null, 0),
320-
0
313+
new ConditionalExpression(
314+
// if
315+
new ConstantExpression(true, 0),
316+
// then
317+
new ConstantExpression(null, 0),
318+
// else
319+
new ConstantExpression(null, 0),
320+
0
321321
),
322322
]);
323323
} else {
@@ -361,20 +361,20 @@ public function testCompileLabelWithLabelThatEvaluatesToNullAndAttributes()
361361
if (class_exists(Nodes::class)) {
362362
$arguments = new Nodes([
363363
new NameExpression('form', 0),
364-
new ConditionalExpression(
365-
// if
366-
new ConstantExpression(true, 0),
367-
// then
368-
new ConstantExpression(null, 0),
369-
// else
370-
new ConstantExpression(null, 0),
371-
0
372-
),
373-
new ArrayExpression([
374-
new ConstantExpression('foo', 0),
375-
new ConstantExpression('bar', 0),
376-
new ConstantExpression('label', 0),
377-
new ConstantExpression('value in attributes', 0),
364+
new ConditionalExpression(
365+
// if
366+
new ConstantExpression(true, 0),
367+
// then
368+
new ConstantExpression(null, 0),
369+
// else
370+
new ConstantExpression(null, 0),
371+
0
372+
),
373+
new ArrayExpression([
374+
new ConstantExpression('foo', 0),
375+
new ConstantExpression('bar', 0),
376+
new ConstantExpression('label', 0),
377+
new ConstantExpression('value in attributes', 0),
378378
], 0),
379379
]);
380380
} else {

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

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTestCase.php

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

680-
$expected = ['session_factory', 'logger', 'session_collector'];
680+
$expected = ['session_factory', 'logger', 'session_collector', 'request_stack'];
681681
$this->assertEquals($expected, array_keys($container->getDefinition('session_listener')->getArgument(0)->getValues()));
682682
$this->assertFalse($container->getDefinition('session.storage.factory.native')->getArgument(3));
683683
}
@@ -1939,7 +1939,7 @@ public function testSessionCookieSecureAuto()
19391939
{
19401940
$container = $this->createContainerFromFile('session_cookie_secure_auto');
19411941

1942-
$expected = ['session_factory', 'logger', 'session_collector'];
1942+
$expected = ['session_factory', 'logger', 'session_collector', 'request_stack'];
19431943
$this->assertEquals($expected, array_keys($container->getDefinition('session_listener')->getArgument(0)->getValues()));
19441944
}
19451945

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy