serializer default context binded parameter

soyuka · soyuka · commit 606f5043c1f4 · 2018-11-13T16:46:13.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -1376,7 +1376,7 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder
         }
 
         if ($config['default_context'] ?? false) {
-            $container->getDefinition('serializer.normalizer.object')->setArgument('default_context', $config['default_context']);
+            $container->setParameter('serializer.default_context', $config['default_context']);
         }
     }
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
@@ -980,7 +980,7 @@ public function testSerializerEnabled()
         $this->assertEquals(new Reference('property_info', ContainerBuilder::IGNORE_ON_INVALID_REFERENCE), $container->getDefinition('serializer.normalizer.object')->getArgument(3));
         $this->assertEquals(array('setCircularReferenceHandler', array(new Reference('my.circular.reference.handler'))), $container->getDefinition('serializer.normalizer.object')->getMethodCalls()[0]);
         $this->assertEquals(array('setMaxDepthHandler', array(new Reference('my.max.depth.handler'))), $container->getDefinition('serializer.normalizer.object')->getMethodCalls()[1]);
-        $this->assertEquals(array('enable_max_depth' => true), $container->getDefinition('serializer.normalizer.object')->getArgument('default_context'));
+        $this->assertEquals(array('enable_max_depth' => true), $container->getParameter('serializer.default_context'));
     }
 
     public function testRegisterSerializerExtractor()
diff --git a/src/Symfony/Component/Serializer/DependencyInjection/SerializerPass.php b/src/Symfony/Component/Serializer/DependencyInjection/SerializerPass.php
@@ -50,11 +50,20 @@ public function process(ContainerBuilder $container)
 
         $serializerDefinition = $container->getDefinition($this->serializerService);
         $serializerDefinition->replaceArgument(0, $normalizers);
+        $this->addDefaultContextParameterBinding($normalizers);
 
         if (!$encoders = $this->findAndSortTaggedServices($this->encoderTag, $container)) {
             throw new RuntimeException(sprintf('You must tag at least one service as "%s" to use the "%s" service.', $this->encoderTag, $this->serializerService));
         }
 
         $serializerDefinition->replaceArgument(1, $encoders);
+        $this->addDefaultContextParameterBinding($encoders);
+    }
+
+    private function addDefaultContextParameterBinding($services)
+    {
+        foreach ($services as $service) {
+            $service->getDefinition()->setBindings(array('$defaultContext' => '%serializer.default_context%'));
+        }
     }
 }
diff --git a/src/Symfony/Component/Serializer/Tests/DependencyInjection/SerializerPassTest.php b/src/Symfony/Component/Serializer/Tests/DependencyInjection/SerializerPassTest.php
@@ -72,4 +72,17 @@ public function testServicesAreOrderedAccordingToPriority()
         $this->assertEquals($expected, $definition->getArgument(0));
         $this->assertEquals($expected, $definition->getArgument(1));
     }
+
+    public function testServiceHasDefaultContextParameterBinding()
+    {
+        $container = new ContainerBuilder();
+
+        $definition = $container->register('serializer')->setArguments(array(null, null));
+        $container->register('n3')->addTag('serializer.normalizer')->addTag('serializer.encoder');
+
+        $serializerPass = new SerializerPass();
+        $serializerPass->process($container);
+
+        $this->assertEquals(array('$defaultContext' => '%serializer.default_context%'), $definition->getBindings());
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -1376,7 +1376,7 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder`
`1376`	`1376`	`}`
`1377`	`1377`
`1378`	`1378`	`if ($config['default_context'] ?? false) {`
`1379`		`- $container->getDefinition('serializer.normalizer.object')->setArgument('default_context', $config['default_context']);`
	`1379`	`+ $container->setParameter('serializer.default_context', $config['default_context']);`
`1380`	`1380`	`}`
`1381`	`1381`	`}`
`1382`	`1382`
Original file line number	Diff line number	Diff line change
`@@ -980,7 +980,7 @@ public function testSerializerEnabled()`
`980`	`980`	`$this->assertEquals(new Reference('property_info', ContainerBuilder::IGNORE_ON_INVALID_REFERENCE), $container->getDefinition('serializer.normalizer.object')->getArgument(3));`
`981`	`981`	`$this->assertEquals(array('setCircularReferenceHandler', array(new Reference('my.circular.reference.handler'))), $container->getDefinition('serializer.normalizer.object')->getMethodCalls()[0]);`
`982`	`982`	`$this->assertEquals(array('setMaxDepthHandler', array(new Reference('my.max.depth.handler'))), $container->getDefinition('serializer.normalizer.object')->getMethodCalls()[1]);`
`983`		`- $this->assertEquals(array('enable_max_depth' => true), $container->getDefinition('serializer.normalizer.object')->getArgument('default_context'));`
	`983`	`+ $this->assertEquals(array('enable_max_depth' => true), $container->getParameter('serializer.default_context'));`
`984`	`984`	`}`
`985`	`985`
`986`	`986`	`public function testRegisterSerializerExtractor()`
Original file line number	Diff line number	Diff line change
`@@ -50,11 +50,20 @@ public function process(ContainerBuilder $container)`
`50`	`50`
`51`	`51`	`$serializerDefinition = $container->getDefinition($this->serializerService);`
`52`	`52`	`$serializerDefinition->replaceArgument(0, $normalizers);`
	`53`	`+ $this->addDefaultContextParameterBinding($normalizers);`
`53`	`54`
`54`	`55`	`if (!$encoders = $this->findAndSortTaggedServices($this->encoderTag, $container)) {`
`55`	`56`	`throw new RuntimeException(sprintf('You must tag at least one service as "%s" to use the "%s" service.', $this->encoderTag, $this->serializerService));`
`56`	`57`	`}`
`57`	`58`
`58`	`59`	`$serializerDefinition->replaceArgument(1, $encoders);`
	`60`	`+ $this->addDefaultContextParameterBinding($encoders);`
	`61`	`+ }`
	`62`	`+`
	`63`	`+ private function addDefaultContextParameterBinding($services)`
	`64`	`+ {`
	`65`	`+ foreach ($services as $service) {`
	`66`	`+ $service->getDefinition()->setBindings(array('$defaultContext' => '%serializer.default_context%'));`
	`67`	`+ }`
`59`	`68`	`}`
`60`	`69`	`}`