fix merge

xabbuh · xabbuh · commit f6a425b11859 · 2023-11-24T16:10:40.000+01:00
diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
@@ -185,11 +185,10 @@ public function normalize(mixed $object, string $format = null, array $context =
             }
 
             $attributeContext = $this->getAttributeNormalizationContext($object, $attribute, $context);
-            $discriminatorMapping = $this->classDiscriminatorResolver?->getMappingForMappedObject($object);
 
             try {
-                $attributeValue = $attribute === $discriminatorMapping?->getTypeProperty()
-                    ? $discriminatorMapping
+                $attributeValue = $attribute === $this->classDiscriminatorResolver?->getMappingForMappedObject($object)?->getTypeProperty()
+                    ? $this->classDiscriminatorResolver?->getTypeForMappedObject($object)
                     : $this->getAttributeValue($object, $attribute, $format, $attributeContext);
             } catch (UninitializedPropertyException $e) {
                 if ($context[self::SKIP_UNINITIALIZED_VALUES] ?? $this->defaultContext[self::SKIP_UNINITIALIZED_VALUES] ?? true) {
