symfony
diff --git a/‎DependencyInjection/FrameworkExtension.php
Copy file name to clipboardExpand all lines: DependencyInjection/FrameworkExtension.php
+7-6Lines changed: 7 additions & 6 deletions b/‎DependencyInjection/FrameworkExtension.php
Copy file name to clipboardExpand all lines: DependencyInjection/FrameworkExtension.php
+7-6Lines changed: 7 additions & 6 deletions
diff --git a/‎Resources/config/serializer.php
Copy file name to clipboardExpand all lines: Resources/config/serializer.php
+2-1Lines changed: 2 additions & 1 deletion b/‎Resources/config/serializer.php
Copy file name to clipboardExpand all lines: Resources/config/serializer.php
+2-1Lines changed: 2 additions & 1 deletion
diff --git a/‎Tests/Translation/TranslatorTest.php
Copy file name to clipboardExpand all lines: Tests/Translation/TranslatorTest.php
+1-1Lines changed: 1 addition & 1 deletion b/‎Tests/Translation/TranslatorTest.php
Copy file name to clipboardExpand all lines: Tests/Translation/TranslatorTest.php
+1-1Lines changed: 1 addition & 1 deletion
@@ -1996,18 +1996,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): void
 
@@ -129,6 +129,8 @@
                 service('property_info')->ignoreOnInvalid(),
                 service('serializer.mapping.class_discriminator_resolver')->ignoreOnInvalid(),
                 null,
+                null,
+                service('property_info')->ignoreOnInvalid(),
             ])
             ->tag('serializer.normalizer', ['priority' => -1000])
 
@@ -143,7 +145,6 @@
                 service('serializer.mapping.class_discriminator_resolver')->ignoreOnInvalid(),
                 null,
                 [],
-                service('property_info')->ignoreOnInvalid(),
             ])
 
         ->alias(PropertyNormalizer::class, 'serializer.normalizer.property')
 
@@ -272,7 +272,7 @@ protected function getLoader()
         $loader
             ->expects($this->exactly(7))
             ->method('load')
-            ->willReturnOnConsecutiveCalls(
+            ->willReturn(
                 $this->getCatalogue('fr', [
                     'foo' => 'foo (FR)',
                 ]),
Original file line number	Diff line number	Diff line change
`@@ -1996,18 +1996,19 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder`
`1996`	`1996`	`$container->setParameter('serializer.default_context', $defaultContext);`
`1997`	`1997`	`}`
`1998`	`1998`
	`1999`	`+ $arguments = $container->getDefinition('serializer.normalizer.object')->getArguments();`
	`2000`	`+ $context = [];`
	`2001`	`+`
`1999`	`2002`	`if (isset($config['circular_reference_handler']) && $config['circular_reference_handler']) {`
`2000`		`- $arguments = $container->getDefinition('serializer.normalizer.object')->getArguments();`
`2001`		`- $context = ($arguments[6] ?? $defaultContext) + ['circular_reference_handler' => new Reference($config['circular_reference_handler'])];`
	`2003`	`+ $context += ($arguments[6] ?? $defaultContext) + ['circular_reference_handler' => new Reference($config['circular_reference_handler'])];`
`2002`	`2004`	`$container->getDefinition('serializer.normalizer.object')->setArgument(5, null);`
`2003`		`- $container->getDefinition('serializer.normalizer.object')->setArgument(6, $context);`
`2004`	`2005`	`}`
`2005`	`2006`
`2006`	`2007`	`if ($config['max_depth_handler'] ?? false) {`
`2007`		`- $arguments = $container->getDefinition('serializer.normalizer.object')->getArguments();`
`2008`		`- $context = ($arguments[6] ?? $defaultContext) + ['max_depth_handler' => new Reference($config['max_depth_handler'])];`
`2009`		`- $container->getDefinition('serializer.normalizer.object')->setArgument(6, $context);`
	`2008`	`+ $context += ($arguments[6] ?? $defaultContext) + ['max_depth_handler' => new Reference($config['max_depth_handler'])];`
`2010`	`2009`	`}`
	`2010`	`+`
	`2011`	`+ $container->getDefinition('serializer.normalizer.object')->setArgument(6, $context);`
`2011`	`2012`	`}`
`2012`	`2013`
`2013`	`2014`	`private function registerPropertyInfoConfiguration(ContainerBuilder $container, PhpFileLoader $loader): void`