Skip to content

Commit bdff469

Browse files
committed
Merge branch '5.2' into 5.x
* 5.2: fix code style [Uid] Hardcode UuidV3 & UuidV5 TYPE conditional constants [Uid] Use the Uuid constructor when reconstructing an Ulid from its RFC-4122 version stop using void in test files parse cookie values containing the equal sign make some time dependent tests more resilient fix code style Remove full head content in HTML to text converter do not break when loading schemas from network paths on Windows apply the sort callback on the whole search result
2 parents 1437e2f + a5461b4 commit bdff469

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

Tests/DependencyInjection/Fixtures/php/full.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
'fallback' => 'fr',
5252
'paths' => ['%kernel.project_dir%/Fixtures/translations'],
5353
'cache_dir' => '%kernel.cache_dir%/translations',
54-
'enabled_locales' => ['fr', 'en']
54+
'enabled_locales' => ['fr', 'en'],
5555
],
5656
'validation' => [
5757
'enabled' => true,

Tests/DependencyInjection/Fixtures/php/http_client_retry.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
'multiplier' => 2,
1212
'max_delay' => 0,
1313
'jitter' => 0.3,
14-
]
14+
],
1515
],
1616
'scoped_clients' => [
1717
'foo' => [

Tests/DependencyInjection/Fixtures/php/workflow_with_no_events_to_dispatch.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
'type' => 'state_machine',
99
'marking_store' => [
1010
'type' => 'method',
11-
'property' => 'state'
11+
'property' => 'state',
1212
],
1313
'supports' => [
1414
FrameworkExtensionTest::class,
@@ -33,9 +33,9 @@
3333
'two',
3434
],
3535
'to' => [
36-
'three'
37-
]
38-
]
36+
'three',
37+
],
38+
],
3939
],
4040
],
4141
],

Tests/DependencyInjection/Fixtures/php/workflow_with_specified_events_to_dispatch.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
'type' => 'state_machine',
99
'marking_store' => [
1010
'type' => 'method',
11-
'property' => 'state'
11+
'property' => 'state',
1212
],
1313
'supports' => [
1414
FrameworkExtensionTest::class,
@@ -36,9 +36,9 @@
3636
'two',
3737
],
3838
'to' => [
39-
'three'
40-
]
41-
]
39+
'three',
40+
],
41+
],
4242
],
4343
],
4444
],

Tests/DependencyInjection/FrameworkExtensionTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1393,7 +1393,7 @@ public function testCachePoolServices()
13931393
$this->assertEquals($expected, $chain->getArguments());
13941394
}
13951395

1396-
public function testRedisTagAwareAdapter(): void
1396+
public function testRedisTagAwareAdapter()
13971397
{
13981398
$container = $this->createContainerFromFile('cache', [], true);
13991399

0 commit comments

Comments
 (0)