[Serializer] Fix Traceable decoration priorities

mtarld · mtarld · commit 96fc2dcc2d3b · 2022-10-02T10:07:24.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer_debug.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer_debug.php
@@ -17,7 +17,7 @@
 return static function (ContainerConfigurator $container) {
     $container->services()
         ->set('debug.serializer', TraceableSerializer::class)
-            ->decorate('serializer', null, 255)
+            ->decorate('serializer')
             ->args([
                 service('debug.serializer.inner'),
                 service('serializer.data_collector'),
diff --git a/src/Symfony/Component/Serializer/DependencyInjection/SerializerPass.php b/src/Symfony/Component/Serializer/DependencyInjection/SerializerPass.php
@@ -44,7 +44,7 @@ public function process(ContainerBuilder $container)
         if ($container->getParameter('kernel.debug') && $container->hasDefinition('serializer.data_collector')) {
             foreach (array_keys($normalizers) as $normalizer) {
                 $container->register('debug.'.$normalizer, TraceableNormalizer::class)
-                    ->setDecoratedService($normalizer, null, 255)
+                    ->setDecoratedService($normalizer)
                     ->setArguments([new Reference('debug.'.$normalizer.'.inner'), new Reference('serializer.data_collector')]);
             }
         }
@@ -59,7 +59,7 @@ public function process(ContainerBuilder $container)
         if ($container->getParameter('kernel.debug') && $container->hasDefinition('serializer.data_collector')) {
             foreach (array_keys($encoders) as $encoder) {
                 $container->register('debug.'.$encoder, TraceableEncoder::class)
-                    ->setDecoratedService($encoder, null, 255)
+                    ->setDecoratedService($encoder)
                     ->setArguments([new Reference('debug.'.$encoder.'.inner'), new Reference('serializer.data_collector')]);
             }
         }
diff --git a/src/Symfony/Component/Serializer/Tests/DependencyInjection/SerializerPassTest.php b/src/Symfony/Component/Serializer/Tests/DependencyInjection/SerializerPassTest.php
@@ -108,12 +108,12 @@ public function testNormalizersAndEncodersAreDecoredAndOrderedWhenCollectingData
         $traceableEncoderDefinition = $container->getDefinition('debug.e');
 
         $this->assertEquals(TraceableNormalizer::class, $traceableNormalizerDefinition->getClass());
-        $this->assertEquals(['n', null, 255], $traceableNormalizerDefinition->getDecoratedService());
+        $this->assertEquals(['n', null, 0], $traceableNormalizerDefinition->getDecoratedService());
         $this->assertEquals(new Reference('debug.n.inner'), $traceableNormalizerDefinition->getArgument(0));
         $this->assertEquals(new Reference('serializer.data_collector'), $traceableNormalizerDefinition->getArgument(1));
 
         $this->assertEquals(TraceableEncoder::class, $traceableEncoderDefinition->getClass());
-        $this->assertEquals(['e', null, 255], $traceableEncoderDefinition->getDecoratedService());
+        $this->assertEquals(['e', null, 0], $traceableEncoderDefinition->getDecoratedService());
         $this->assertEquals(new Reference('debug.e.inner'), $traceableEncoderDefinition->getArgument(0));
         $this->assertEquals(new Reference('serializer.data_collector'), $traceableEncoderDefinition->getArgument(1));
     }

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public function process(ContainerBuilder $container)`
`44`	`44`	`if ($container->getParameter('kernel.debug') && $container->hasDefinition('serializer.data_collector')) {`
`45`	`45`	`foreach (array_keys($normalizers) as $normalizer) {`
`46`	`46`	`$container->register('debug.'.$normalizer, TraceableNormalizer::class)`
`47`		`- ->setDecoratedService($normalizer, null, 255)`
	`47`	`+ ->setDecoratedService($normalizer)`
`48`	`48`	`->setArguments([new Reference('debug.'.$normalizer.'.inner'), new Reference('serializer.data_collector')]);`
`49`	`49`	`}`
`50`	`50`	`}`
`@@ -59,7 +59,7 @@ public function process(ContainerBuilder $container)`
`59`	`59`	`if ($container->getParameter('kernel.debug') && $container->hasDefinition('serializer.data_collector')) {`
`60`	`60`	`foreach (array_keys($encoders) as $encoder) {`
`61`	`61`	`$container->register('debug.'.$encoder, TraceableEncoder::class)`
`62`		`- ->setDecoratedService($encoder, null, 255)`
	`62`	`+ ->setDecoratedService($encoder)`
`63`	`63`	`->setArguments([new Reference('debug.'.$encoder.'.inner'), new Reference('serializer.data_collector')]);`
`64`	`64`	`}`
`65`	`65`	`}`