Skip to content

Commit 9996b6f

Browse files
Merge branch '6.1' into 6.2
* 6.1: (26 commits) 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 [HttpClient] Fix Copy as curl with base uri [DoctrineBridge] Add missing break [PropertyInfo] CS fix [Serializer] Try all possible denormalization route with union types when ALLOW_EXTRA_ATTRIBUTES=false CS fix [Cache] Respect $save option in ChainAdapter [ExpressionLanguage] fix tests (bis) [ExpressionLanguage] fix tests Allow passing null in twig_is_selected_choice [Cache] Respect $save option in ArrayAdapter [HttpKernel] Disable session tracking while collecting profiler data [MonologBridge] Fixed support of elasticsearch 7.+ in ElasticsearchLogstashHandler Fix HttpClientTrait::jsonEncode flags usage [DoctrineBridge] Extend type guessing on enum fields [FrameworkBundle] Lower JsonSerializableNormalizer priority [WebProfilerBundle] Bump http-kernel requirement to ^6.1 [Messenger] move resetting services at worker stopped into ResetServicesListener [PropertyInfo] Fix multi phpdoc covered promoted properties ...
2 parents 03d05a3 + ad527ca commit 9996b6f

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
@@ -99,7 +99,7 @@
9999

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

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

Tests/DependencyInjection/FrameworkExtensionTest.php

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

14401440
$this->assertEquals(JsonSerializableNormalizer::class, $definition->getClass());
1441-
$this->assertEquals(-900, $tag[0]['priority']);
1441+
$this->assertEquals(-950, $tag[0]['priority']);
14421442
}
14431443

14441444
public function testObjectNormalizerRegistered()

0 commit comments

Comments
 (0)