bug #31117 [FrameworkBundle] fix math depth handler configuration (Raulnet)

fabpot · fabpot · commit 097c229d92c7 · 2019-04-21T18:12:22.000+02:00
This PR was merged into the 4.2 branch. Discussion ---------- [FrameworkBundle] fix math depth handler configuration | Q | A | ------------- | --- | Branch? | 4.2 f | Bug fix? | no "fix deprecated" | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #30998 | License | MIT | Doc PR | fix serializer configuration max_deep_handler Commits ------- fb9fc80 fix math depth handler
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -1410,7 +1410,9 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder
         }
 
         if ($config['max_depth_handler'] ?? false) {
-            $container->getDefinition('serializer.normalizer.object')->addMethodCall('setMaxDepthHandler', [new Reference($config['max_depth_handler'])]);
+            $defaultContext = $container->getDefinition('serializer.normalizer.object')->getArgument(6);
+            $defaultContext += ['max_depth_handler' => new Reference($config['max_depth_handler'])];
+            $container->getDefinition('serializer.normalizer.object')->replaceArgument(6, $defaultContext);
         }
     }
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer.xml
@@ -62,6 +62,8 @@
             <argument type="service" id="serializer.property_accessor" />
             <argument type="service" id="property_info" on-invalid="ignore" />
             <argument type="service" id="serializer.mapping.class_discriminator_resolver" on-invalid="ignore" />
+            <argument>null</argument>
+            <argument type="collection" />
 
             <!-- Run after all custom normalizers -->
             <tag name="serializer.normalizer" priority="-1000" />
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
@@ -1073,7 +1073,8 @@ public function testSerializerEnabled()
         $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('max_depth_handler', $container->getDefinition('serializer.normalizer.object')->getArgument(6));
+        $this->assertEquals($container->getDefinition('serializer.normalizer.object')->getArgument(6)['max_depth_handler'], new Reference('my.max.depth.handler'));
     }
 
     public function testRegisterSerializerExtractor()
diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
@@ -110,6 +110,10 @@ public function __construct(ClassMetadataFactoryInterface $classMetadataFactory
                 }
             }
         }
+
+        if (isset($this->defaultContext[self::CIRCULAR_REFERENCE_HANDLER]) && !\is_callable($this->defaultContext[self::CIRCULAR_REFERENCE_HANDLER])) {
+            throw new InvalidArgumentException(sprintf('Invalid callback found in the "%s" default context option.', self::CIRCULAR_REFERENCE_HANDLER));
+        }
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -1410,7 +1410,9 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder`
`1410`	`1410`	`}`
`1411`	`1411`
`1412`	`1412`	`if ($config['max_depth_handler'] ?? false) {`
`1413`		`- $container->getDefinition('serializer.normalizer.object')->addMethodCall('setMaxDepthHandler', [new Reference($config['max_depth_handler'])]);`
	`1413`	`+ $defaultContext = $container->getDefinition('serializer.normalizer.object')->getArgument(6);`
	`1414`	`+ $defaultContext += ['max_depth_handler' => new Reference($config['max_depth_handler'])];`
	`1415`	`+ $container->getDefinition('serializer.normalizer.object')->replaceArgument(6, $defaultContext);`
`1414`	`1416`	`}`
`1415`	`1417`	`}`
`1416`	`1418`
Original file line number	Diff line number	Diff line change
`@@ -1073,7 +1073,8 @@ public function testSerializerEnabled()`
`1073`	`1073`	`$this->assertEquals(new Reference('serializer.name_converter.camel_case_to_snake_case'), $container->getDefinition('serializer.name_converter.metadata_aware')->getArgument(1));`
`1074`	`1074`	`$this->assertEquals(new Reference('property_info', ContainerBuilder::IGNORE_ON_INVALID_REFERENCE), $container->getDefinition('serializer.normalizer.object')->getArgument(3));`
`1075`	`1075`	`$this->assertEquals(['setCircularReferenceHandler', [new Reference('my.circular.reference.handler')]], $container->getDefinition('serializer.normalizer.object')->getMethodCalls()[0]);`
`1076`		`- $this->assertEquals(['setMaxDepthHandler', [new Reference('my.max.depth.handler')]], $container->getDefinition('serializer.normalizer.object')->getMethodCalls()[1]);`
	`1076`	`+ $this->assertArrayHasKey('max_depth_handler', $container->getDefinition('serializer.normalizer.object')->getArgument(6));`
	`1077`	`+ $this->assertEquals($container->getDefinition('serializer.normalizer.object')->getArgument(6)['max_depth_handler'], new Reference('my.max.depth.handler'));`
`1077`	`1078`	`}`
`1078`	`1079`
`1079`	`1080`	`public function testRegisterSerializerExtractor()`
Original file line number	Diff line number	Diff line change
`@@ -110,6 +110,10 @@ public function __construct(ClassMetadataFactoryInterface $classMetadataFactory`
`110`	`110`	`}`
`111`	`111`	`}`
`112`	`112`	`}`
	`113`	`+`
	`114`	`+ if (isset($this->defaultContext[self::CIRCULAR_REFERENCE_HANDLER]) && !\is_callable($this->defaultContext[self::CIRCULAR_REFERENCE_HANDLER])) {`
	`115`	`+ throw new InvalidArgumentException(sprintf('Invalid callback found in the "%s" default context option.', self::CIRCULAR_REFERENCE_HANDLER));`
	`116`	`+ }`
`113`	`117`	`}`
`114`	`118`
`115`	`119`	`/**`