Skip to content

Commit 5f334d4

Browse files
committed
make priority integers & fix test checking definition to be private
1 parent bd82c72 commit 5f334d4

File tree

3 files changed

+12
-15
lines changed

3 files changed

+12
-15
lines changed

DependencyInjection/FrameworkExtension.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1465,9 +1465,6 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder
14651465
{
14661466
$loader->load('serializer.php');
14671467

1468-
$serializerExtractor = $container->getDefinition('property_info.serializer_extractor');
1469-
$serializerExtractor->setPublic(false);
1470-
14711468
$chainLoader = $container->getDefinition('serializer.mapping.chain_loader');
14721469

14731470
if (!class_exists(PropertyAccessor::class)) {

Resources/config/serializer.php

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -73,31 +73,31 @@
7373
// Normalizer
7474
->set('serializer.normalizer.constraint_violation_list', ConstraintViolationListNormalizer::class)
7575
->args([[], service('serializer.name_converter.metadata_aware')])
76-
->tag('serializer.normalizer', ['priority' => '-915'])
76+
->tag('serializer.normalizer', ['priority' => -915])
7777

7878
->set('serializer.normalizer.datetimezone', DateTimeZoneNormalizer::class)
79-
->tag('serializer.normalizer', ['priority' => '-915'])
79+
->tag('serializer.normalizer', ['priority' => -915])
8080

8181
->set('serializer.normalizer.dateinterval', DateIntervalNormalizer::class)
82-
->tag('serializer.normalizer', ['priority' => '-915'])
82+
->tag('serializer.normalizer', ['priority' => -915])
8383

8484
->set('serializer.normalizer.data_uri', DataUriNormalizer::class)
8585
->args([service('mime_types')->nullOnInvalid()])
86-
->tag('serializer.normalizer', ['priority' => '-920'])
86+
->tag('serializer.normalizer', ['priority' => -920])
8787

8888
->set('serializer.normalizer.datetime', DateTimeNormalizer::class)
89-
->tag('serializer.normalizer', ['priority' => '-910'])
89+
->tag('serializer.normalizer', ['priority' => -910])
9090

9191
->set('serializer.normalizer.json_serializable', JsonSerializableNormalizer::class)
92-
->tag('serializer.normalizer', ['priority' => '-900'])
92+
->tag('serializer.normalizer', ['priority' => -900])
9393

9494
->set('serializer.normalizer.problem', ProblemNormalizer::class)
9595
->args([param('kernel.debug')])
96-
->tag('serializer.normalizer', ['priority' => '-890'])
96+
->tag('serializer.normalizer', ['priority' => -890])
9797

9898
->set('serializer.denormalizer.unwrapping', UnwrappingDenormalizer::class)
9999
->args([service('serializer.property_accessor')])
100-
->tag('serializer.normalizer', ['priority' => '1000'])
100+
->tag('serializer.normalizer', ['priority' => 1000])
101101

102102
->set('serializer.normalizer.object', ObjectNormalizer::class)
103103
->args([
@@ -109,12 +109,12 @@
109109
null,
110110
[],
111111
])
112-
->tag('serializer.normalizer', ['priority' => '-1000'])
112+
->tag('serializer.normalizer', ['priority' => -1000])
113113

114114
->alias(ObjectNormalizer::class, 'serializer.normalizer.object')
115115

116116
->set('serializer.denormalizer.array', ArrayDenormalizer::class)
117-
->tag('serializer.normalizer', ['priority' => '-990'])
117+
->tag('serializer.normalizer', ['priority' => -990])
118118

119119
// Loader
120120
->set('serializer.mapping.chain_loader', LoaderChain::class)
@@ -164,7 +164,7 @@
164164
// PropertyInfo extractor
165165
->set('property_info.serializer_extractor', SerializerExtractor::class)
166166
->args([service('serializer.mapping.class_metadata_factory')])
167-
->tag('property_info.list_extractor', ['priority' => '-999'])
167+
->tag('property_info.list_extractor', ['priority' => -999])
168168

169169
// ErrorRenderer integration
170170
->alias('error_renderer', 'error_renderer.serializer')

Tests/DependencyInjection/FrameworkExtensionTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1063,7 +1063,7 @@ public function testRegisterSerializerExtractor()
10631063
$serializerExtractorDefinition = $container->getDefinition('property_info.serializer_extractor');
10641064

10651065
$this->assertEquals('serializer.mapping.class_metadata_factory', $serializerExtractorDefinition->getArgument(0)->__toString());
1066-
$this->assertFalse($serializerExtractorDefinition->isPublic());
1066+
$this->assertTrue(!$serializerExtractorDefinition->isPublic() || $serializerExtractorDefinition->isPrivate());
10671067
$tag = $serializerExtractorDefinition->getTag('property_info.list_extractor');
10681068
$this->assertEquals(['priority' => -999], $tag[0]);
10691069
}

0 commit comments

Comments
 (0)