make priority integers & fix definitions to be private

Tobion · Tobion · commit ad6b433ac11a · 2020-06-19T14:55:25.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -1465,9 +1465,6 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder
     {
         $loader->load('serializer.php');
 
-        $serializerExtractor = $container->getDefinition('property_info.serializer_extractor');
-        $serializerExtractor->setPublic(false);
-
         $chainLoader = $container->getDefinition('serializer.mapping.chain_loader');
 
         if (!class_exists(PropertyAccessor::class)) {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer.php
@@ -52,6 +52,8 @@
     ;
 
     $container->services()
+        ->defaults()->private()
+
         ->set('serializer', Serializer::class)
             ->public()
             ->args([[], []])
@@ -73,31 +75,31 @@
         // Normalizer
         ->set('serializer.normalizer.constraint_violation_list', ConstraintViolationListNormalizer::class)
             ->args([[], service('serializer.name_converter.metadata_aware')])
-            ->tag('serializer.normalizer', ['priority' => '-915'])
+            ->tag('serializer.normalizer', ['priority' => -915])
 
         ->set('serializer.normalizer.datetimezone', DateTimeZoneNormalizer::class)
-            ->tag('serializer.normalizer', ['priority' => '-915'])
+            ->tag('serializer.normalizer', ['priority' => -915])
 
         ->set('serializer.normalizer.dateinterval', DateIntervalNormalizer::class)
-            ->tag('serializer.normalizer', ['priority' => '-915'])
+            ->tag('serializer.normalizer', ['priority' => -915])
 
         ->set('serializer.normalizer.data_uri', DataUriNormalizer::class)
             ->args([service('mime_types')->nullOnInvalid()])
-            ->tag('serializer.normalizer', ['priority' => '-920'])
+            ->tag('serializer.normalizer', ['priority' => -920])
 
         ->set('serializer.normalizer.datetime', DateTimeNormalizer::class)
-            ->tag('serializer.normalizer', ['priority' => '-910'])
+            ->tag('serializer.normalizer', ['priority' => -910])
 
         ->set('serializer.normalizer.json_serializable', JsonSerializableNormalizer::class)
-            ->tag('serializer.normalizer', ['priority' => '-900'])
+            ->tag('serializer.normalizer', ['priority' => -900])
 
         ->set('serializer.normalizer.problem', ProblemNormalizer::class)
             ->args([param('kernel.debug')])
-            ->tag('serializer.normalizer', ['priority' => '-890'])
+            ->tag('serializer.normalizer', ['priority' => -890])
 
         ->set('serializer.denormalizer.unwrapping', UnwrappingDenormalizer::class)
             ->args([service('serializer.property_accessor')])
-            ->tag('serializer.normalizer', ['priority' => '1000'])
+            ->tag('serializer.normalizer', ['priority' => 1000])
 
         ->set('serializer.normalizer.object', ObjectNormalizer::class)
             ->args([
@@ -109,12 +111,12 @@
                 null,
                 [],
             ])
-            ->tag('serializer.normalizer', ['priority' => '-1000'])
+            ->tag('serializer.normalizer', ['priority' => -1000])
 
         ->alias(ObjectNormalizer::class, 'serializer.normalizer.object')
 
         ->set('serializer.denormalizer.array', ArrayDenormalizer::class)
-            ->tag('serializer.normalizer', ['priority' => '-990'])
+            ->tag('serializer.normalizer', ['priority' => -990])
 
         // Loader
         ->set('serializer.mapping.chain_loader', LoaderChain::class)
@@ -164,7 +166,7 @@
         // PropertyInfo extractor
         ->set('property_info.serializer_extractor', SerializerExtractor::class)
             ->args([service('serializer.mapping.class_metadata_factory')])
-            ->tag('property_info.list_extractor', ['priority' => '-999'])
+            ->tag('property_info.list_extractor', ['priority' => -999])
 
         // ErrorRenderer integration
         ->alias('error_renderer', 'error_renderer.serializer')

Original file line number	Diff line number	Diff line change
`@@ -1465,9 +1465,6 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder`
`1465`	`1465`	`{`
`1466`	`1466`	`$loader->load('serializer.php');`
`1467`	`1467`
`1468`		`- $serializerExtractor = $container->getDefinition('property_info.serializer_extractor');`
`1469`		`- $serializerExtractor->setPublic(false);`
`1470`		`-`
`1471`	`1468`	`$chainLoader = $container->getDefinition('serializer.mapping.chain_loader');`
`1472`	`1469`
`1473`	`1470`	`if (!class_exists(PropertyAccessor::class)) {`