Merge branch '2.x'

* 2.x: fix setting view handler serializer options
FriendsOfSymfony · May 21, 2020 · a693110 · a693110
2 parents 007cba2 + 65bf5a3
commit a693110
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 1 deletion.
diff --git a/DependencyInjection/FOSRestExtension.php b/DependencyInjection/FOSRestExtension.php
@@ -378,7 +378,7 @@ private function loadSerializer(array $config, ContainerBuilder $container): voi
         }
 
         $options['serializeNullStrategy'] = $config['serializer']['serialize_null'];
-        $viewHandler->addArgument($options);
+        $viewHandler->replaceArgument(10, $options);
     }
 
     private function loadZoneMatcherListener(array $config, XmlFileLoader $loader, ContainerBuilder $container): void

diff --git a/Tests/DependencyInjection/FOSRestExtensionTest.php b/Tests/DependencyInjection/FOSRestExtensionTest.php
@@ -362,6 +362,32 @@ public function testViewSerializeNullIsTrue()
         $this->assertTrue($this->container->getDefinition('fos_rest.view_handler.default')->getArgument(6));
     }
 
+    public function testViewHandlerSerializerOptions()
+    {
+        $config = [
+            'fos_rest' => [
+                'body_listener' => false,
+                'exception' => [
+                    'exception_listener' => false,
+                    'serialize_exceptions' => false,
+                ],
+                'routing_loader' => false,
+                'serializer' => [
+                    'groups' => ['foo', 'bar'],
+                    'serialize_null' => true,
+                    'version' => '1.0',
+                ],
+            ],
+        ];
+        $this->extension->load($config, $this->container);
+
+        $this->assertEquals([
+            'exclusionStrategyGroups' => ['foo', 'bar'],
+            'exclusionStrategyVersion' => '1.0',
+            'serializeNullStrategy' => true,
+        ], $this->container->getDefinition('fos_rest.view_handler.default')->getArgument(10));
+    }
+
     public function testValidatorAliasWhenEnabled()
     {
         $config = [