From 0c33fbb75e67682eea5cec638075bf87ac3ad3d4 Mon Sep 17 00:00:00 2001
From: HypeMC <hypemc@gmail.com>
Date: Mon, 29 Jan 2024 10:12:01 +0100
Subject: [PATCH 1/2] [FrameworkBundle] Remove redundant `name` attribute from
`default_context`
---
DependencyInjection/Configuration.php | 1 -
1 file changed, 1 deletion(-)
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index 1939337bb..cb52a0704 100644
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -1196,7 +1196,6 @@ private function addSerializerSection(ArrayNodeDefinition $rootNode, callable $e
->end()
->arrayNode('default_context')
->normalizeKeys(false)
- ->useAttributeAsKey('name')
->validate()
->ifTrue(fn () => $this->debug && class_exists(JsonParser::class))
->then(fn (array $v) => $v + [JsonDecode::DETAILED_ERROR_MESSAGES => true])
From 51418a20079cb25af3fcb8fa8ae1ed82f7fdd1ce Mon Sep 17 00:00:00 2001
From: HypeMC <hypemc@gmail.com>
Date: Sun, 23 Mar 2025 17:46:24 +0100
Subject: [PATCH 2/2] [Serializer] Fix code skipped by premature return
---
DependencyInjection/FrameworkExtension.php | 24 ++++++++++------------
1 file changed, 11 insertions(+), 13 deletions(-)
diff --git a/DependencyInjection/FrameworkExtension.php b/DependencyInjection/FrameworkExtension.php
index 1c5725335..f585b5bbb 100644
--- a/DependencyInjection/FrameworkExtension.php
+++ b/DependencyInjection/FrameworkExtension.php
@@ -2004,24 +2004,22 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder
$container->setParameter('serializer.default_context', $defaultContext);
}
- if (!$container->hasDefinition('serializer.normalizer.object')) {
- return;
- }
+ if ($container->hasDefinition('serializer.normalizer.object')) {
+ $arguments = $container->getDefinition('serializer.normalizer.object')->getArguments();
+ $context = $arguments[6] ?? $defaultContext;
- $arguments = $container->getDefinition('serializer.normalizer.object')->getArguments();
- $context = $arguments[6] ?? $defaultContext;
+ if (isset($config['circular_reference_handler']) && $config['circular_reference_handler']) {
+ $context += ['circular_reference_handler' => new Reference($config['circular_reference_handler'])];
+ $container->getDefinition('serializer.normalizer.object')->setArgument(5, null);
+ }
- if (isset($config['circular_reference_handler']) && $config['circular_reference_handler']) {
- $context += ['circular_reference_handler' => new Reference($config['circular_reference_handler'])];
- $container->getDefinition('serializer.normalizer.object')->setArgument(5, null);
- }
+ if ($config['max_depth_handler'] ?? false) {
+ $context += ['max_depth_handler' => new Reference($config['max_depth_handler'])];
+ }
- if ($config['max_depth_handler'] ?? false) {
- $context += ['max_depth_handler' => new Reference($config['max_depth_handler'])];
+ $container->getDefinition('serializer.normalizer.object')->setArgument(6, $context);
}
- $container->getDefinition('serializer.normalizer.object')->setArgument(6, $context);
-
$container->getDefinition('serializer.normalizer.property')->setArgument(5, $defaultContext);
}