Skip to content

Commit 1a42efe

Browse files
Merge branch '5.4' into 6.0
* 5.4: Exclude from baseline generation deprecations triggered in legacy test [HttpFoundation] Update "[Session] Overwrite invalid session id" to only validate when files session storage is used [DoctrineBridge] Add missing break [FrameworkBundle] Lower JsonSerializableNormalizer priority
2 parents f98edd6 + 7cbc790 commit 1a42efe

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Resources/config/serializer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898

9999
->set('serializer.normalizer.json_serializable', JsonSerializableNormalizer::class)
100100
->args([null, null])
101-
->tag('serializer.normalizer', ['priority' => -900])
101+
->tag('serializer.normalizer', ['priority' => -950])
102102

103103
->set('serializer.normalizer.problem', ProblemNormalizer::class)
104104
->args([param('kernel.debug')])

Tests/DependencyInjection/FrameworkExtensionTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1378,7 +1378,7 @@ public function testJsonSerializableNormalizerRegistered()
13781378
$tag = $definition->getTag('serializer.normalizer');
13791379

13801380
$this->assertEquals(JsonSerializableNormalizer::class, $definition->getClass());
1381-
$this->assertEquals(-900, $tag[0]['priority']);
1381+
$this->assertEquals(-950, $tag[0]['priority']);
13821382
}
13831383

13841384
public function testObjectNormalizerRegistered()

0 commit comments

Comments
 (0)