bug #31073 #30998 Fix deprecated setCircularReferenceHandler call (dhaarbrink)

nicolas-grekas · nicolas-grekas · commit 3d2bc481ccfe · 2019-04-11T13:04:26.000+02:00
This PR was squashed before being merged into the 4.3-dev branch (closes #31073). Discussion ---------- #30998 Fix deprecated setCircularReferenceHandler call | Q | A | ------------- | --- | Branch? | 4.2 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #30998 | License | MIT Instead of calling the `setCircularReferenceHandler()` method, it puts the handler in the default context. Commits ------- 3a68040 #30998 Fix deprecated setCircularReferenceHandler call
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -1510,7 +1510,10 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder
         }
 
         if (isset($config['circular_reference_handler']) && $config['circular_reference_handler']) {
-            $container->getDefinition('serializer.normalizer.object')->addMethodCall('setCircularReferenceHandler', [new Reference($config['circular_reference_handler'])]);
+            $arguments = $container->getDefinition('serializer.normalizer.object')->getArguments();
+            $context = ($arguments[6] ?? []) + ['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) {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
@@ -1146,8 +1146,8 @@ public function testSerializerEnabled()
         $this->assertNull($container->getDefinition('serializer.mapping.class_metadata_factory')->getArgument(1));
         $this->assertEquals(new Reference('serializer.name_converter.camel_case_to_snake_case'), $container->getDefinition('serializer.name_converter.metadata_aware')->getArgument(1));
         $this->assertEquals(new Reference('property_info', ContainerBuilder::IGNORE_ON_INVALID_REFERENCE), $container->getDefinition('serializer.normalizer.object')->getArgument(3));
-        $this->assertEquals(['setCircularReferenceHandler', [new Reference('my.circular.reference.handler')]], $container->getDefinition('serializer.normalizer.object')->getMethodCalls()[0]);
-        $this->assertEquals(['setMaxDepthHandler', [new Reference('my.max.depth.handler')]], $container->getDefinition('serializer.normalizer.object')->getMethodCalls()[1]);
+        $this->assertArrayHasKey('circular_reference_handler', $container->getDefinition('serializer.normalizer.object')->getArgument(6));
+        $this->assertEquals(['setMaxDepthHandler', [new Reference('my.max.depth.handler')]], $container->getDefinition('serializer.normalizer.object')->getMethodCalls()[0]);
     }
 
     public function testRegisterSerializerExtractor()

Original file line number	Diff line number	Diff line change
`@@ -1510,7 +1510,10 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder`
`1510`	`1510`	`}`
`1511`	`1511`
`1512`	`1512`	`if (isset($config['circular_reference_handler']) && $config['circular_reference_handler']) {`
`1513`		`- $container->getDefinition('serializer.normalizer.object')->addMethodCall('setCircularReferenceHandler', [new Reference($config['circular_reference_handler'])]);`
	`1513`	`+ $arguments = $container->getDefinition('serializer.normalizer.object')->getArguments();`
	`1514`	`+ $context = ($arguments[6] ?? []) + ['circular_reference_handler' => new Reference($config['circular_reference_handler'])];`
	`1515`	`+ $container->getDefinition('serializer.normalizer.object')->setArgument(5, null);`
	`1516`	`+ $container->getDefinition('serializer.normalizer.object')->setArgument(6, $context);`
`1514`	`1517`	`}`
`1515`	`1518`
`1516`	`1519`	`if ($config['max_depth_handler'] ?? false) {`