move wiring of the property info extractor to the ObjectNormalizer

xabbuh · xabbuh · commit 518bc283a079 · 2024-04-30T16:40:59.000+02:00
The PropertyNormalizer does not handle a property info extractor. It looks like the argument was accidentally added to instead of the ObjectNormalizer in #52917.
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -1854,18 +1854,19 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder
             $container->setParameter('serializer.default_context', $defaultContext);
         }
 
+        $arguments = $container->getDefinition('serializer.normalizer.object')->getArguments();
+        $context = [];
+
         if (isset($config['circular_reference_handler']) && $config['circular_reference_handler']) {
-            $arguments = $container->getDefinition('serializer.normalizer.object')->getArguments();
-            $context = ($arguments[6] ?? $defaultContext) + ['circular_reference_handler' => new Reference($config['circular_reference_handler'])];
+            $context += ($arguments[6] ?? $defaultContext) + ['circular_reference_handler' => new Reference($config['circular_reference_handler'])];
             $container->getDefinition('serializer.normalizer.object')->setArgument(5, null);
-            $container->getDefinition('serializer.normalizer.object')->setArgument(6, $context);
         }
 
         if ($config['max_depth_handler'] ?? false) {
-            $arguments = $container->getDefinition('serializer.normalizer.object')->getArguments();
-            $context = ($arguments[6] ?? $defaultContext) + ['max_depth_handler' => new Reference($config['max_depth_handler'])];
-            $container->getDefinition('serializer.normalizer.object')->setArgument(6, $context);
+            $context += ($arguments[6] ?? $defaultContext) + ['max_depth_handler' => new Reference($config['max_depth_handler'])];
         }
+
+        $container->getDefinition('serializer.normalizer.object')->setArgument(6, $context);
     }
 
     private function registerPropertyInfoConfiguration(ContainerBuilder $container, PhpFileLoader $loader)
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer.php
@@ -125,6 +125,8 @@
                 service('property_info')->ignoreOnInvalid(),
                 service('serializer.mapping.class_discriminator_resolver')->ignoreOnInvalid(),
                 null,
+                null,
+                service('property_info')->ignoreOnInvalid(),
             ])
             ->tag('serializer.normalizer', ['priority' => -1000])
 
@@ -138,7 +140,6 @@
                 service('serializer.mapping.class_discriminator_resolver')->ignoreOnInvalid(),
                 null,
                 [],
-                service('property_info')->ignoreOnInvalid(),
             ])
 
         ->alias(PropertyNormalizer::class, 'serializer.normalizer.property')

Original file line number	Diff line number	Diff line change
`@@ -1854,18 +1854,19 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder`
`1854`	`1854`	`$container->setParameter('serializer.default_context', $defaultContext);`
`1855`	`1855`	`}`
`1856`	`1856`
	`1857`	`+ $arguments = $container->getDefinition('serializer.normalizer.object')->getArguments();`
	`1858`	`+ $context = [];`
	`1859`	`+`
`1857`	`1860`	`if (isset($config['circular_reference_handler']) && $config['circular_reference_handler']) {`
`1858`		`- $arguments = $container->getDefinition('serializer.normalizer.object')->getArguments();`
`1859`		`- $context = ($arguments[6] ?? $defaultContext) + ['circular_reference_handler' => new Reference($config['circular_reference_handler'])];`
	`1861`	`+ $context += ($arguments[6] ?? $defaultContext) + ['circular_reference_handler' => new Reference($config['circular_reference_handler'])];`
`1860`	`1862`	`$container->getDefinition('serializer.normalizer.object')->setArgument(5, null);`
`1861`		`- $container->getDefinition('serializer.normalizer.object')->setArgument(6, $context);`
`1862`	`1863`	`}`
`1863`	`1864`
`1864`	`1865`	`if ($config['max_depth_handler'] ?? false) {`
`1865`		`- $arguments = $container->getDefinition('serializer.normalizer.object')->getArguments();`
`1866`		`- $context = ($arguments[6] ?? $defaultContext) + ['max_depth_handler' => new Reference($config['max_depth_handler'])];`
`1867`		`- $container->getDefinition('serializer.normalizer.object')->setArgument(6, $context);`
	`1866`	`+ $context += ($arguments[6] ?? $defaultContext) + ['max_depth_handler' => new Reference($config['max_depth_handler'])];`
`1868`	`1867`	`}`
	`1868`	`+`
	`1869`	`+ $container->getDefinition('serializer.normalizer.object')->setArgument(6, $context);`
`1869`	`1870`	`}`
`1870`	`1871`
`1871`	`1872`	`private function registerPropertyInfoConfiguration(ContainerBuilder $container, PhpFileLoader $loader)`