Skip to content

Commit 51418a2

Browse files
committed
[Serializer] Fix code skipped by premature return
1 parent 0c33fbb commit 51418a2

File tree

1 file changed

+11
-13
lines changed

1 file changed

+11
-13
lines changed

DependencyInjection/FrameworkExtension.php

+11-13
Original file line numberDiff line numberDiff line change
@@ -2004,24 +2004,22 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder
20042004
$container->setParameter('serializer.default_context', $defaultContext);
20052005
}
20062006

2007-
if (!$container->hasDefinition('serializer.normalizer.object')) {
2008-
return;
2009-
}
2007+
if ($container->hasDefinition('serializer.normalizer.object')) {
2008+
$arguments = $container->getDefinition('serializer.normalizer.object')->getArguments();
2009+
$context = $arguments[6] ?? $defaultContext;
20102010

2011-
$arguments = $container->getDefinition('serializer.normalizer.object')->getArguments();
2012-
$context = $arguments[6] ?? $defaultContext;
2011+
if (isset($config['circular_reference_handler']) && $config['circular_reference_handler']) {
2012+
$context += ['circular_reference_handler' => new Reference($config['circular_reference_handler'])];
2013+
$container->getDefinition('serializer.normalizer.object')->setArgument(5, null);
2014+
}
20132015

2014-
if (isset($config['circular_reference_handler']) && $config['circular_reference_handler']) {
2015-
$context += ['circular_reference_handler' => new Reference($config['circular_reference_handler'])];
2016-
$container->getDefinition('serializer.normalizer.object')->setArgument(5, null);
2017-
}
2016+
if ($config['max_depth_handler'] ?? false) {
2017+
$context += ['max_depth_handler' => new Reference($config['max_depth_handler'])];
2018+
}
20182019

2019-
if ($config['max_depth_handler'] ?? false) {
2020-
$context += ['max_depth_handler' => new Reference($config['max_depth_handler'])];
2020+
$container->getDefinition('serializer.normalizer.object')->setArgument(6, $context);
20212021
}
20222022

2023-
$container->getDefinition('serializer.normalizer.object')->setArgument(6, $context);
2024-
20252023
$container->getDefinition('serializer.normalizer.property')->setArgument(5, $defaultContext);
20262024
}
20272025

0 commit comments

Comments
 (0)