Fix denormalizing empty string into object|null parameter

Jeroeny · Jeroeny · commit 37ba2079f98f · 2023-10-19T16:18:46.000+02:00
diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
@@ -434,11 +434,16 @@ private function validateAndDenormalize(array $types, string $currentClass, stri
         $isUnionType = \count($types) > 1;
         $extraAttributesException = null;
         $missingConstructorArgumentsException = null;
+        $hasNonObjectType = false;
+        $isUnionTypeOrNullable = $isUnionType;
+
         foreach ($types as $type) {
             if (null === $data && $type->isNullable()) {
                 return null;
             }
 
+            $isUnionTypeOrNullable = $isUnionTypeOrNullable ?: $type->isNullable();
+            $hasNonObjectType = $hasNonObjectType ?: Type::BUILTIN_TYPE_OBJECT !== $type->getBuiltinType();
             $collectionValueType = $type->isCollection() ? $type->getCollectionValueTypes()[0] ?? null : null;
 
             // Fix a collection that contains the only one element
@@ -564,17 +569,17 @@ private function validateAndDenormalize(array $types, string $currentClass, stri
                     return $data;
                 }
             } catch (NotNormalizableValueException|InvalidArgumentException $e) {
-                if (!$isUnionType) {
+                if (!$isUnionTypeOrNullable) {
                     throw $e;
                 }
             } catch (ExtraAttributesException $e) {
-                if (!$isUnionType) {
+                if (!$isUnionTypeOrNullable) {
                     throw $e;
                 }
 
                 $extraAttributesException ??= $e;
             } catch (MissingConstructorArgumentsException $e) {
-                if (!$isUnionType) {
+                if (!$isUnionTypeOrNullable) {
                     throw $e;
                 }
 
@@ -590,6 +595,12 @@ private function validateAndDenormalize(array $types, string $currentClass, stri
             throw $missingConstructorArgumentsException;
         }
 
+        if ($data === '' && !$hasNonObjectType && (XmlEncoder::FORMAT === $format || CsvEncoder::FORMAT === $format)) {
+            return null;
+        } elseif (!$isUnionType && isset($e)) {
+            throw $e;
+        }
+
         if ($context[self::DISABLE_TYPE_ENFORCEMENT] ?? $this->defaultContext[self::DISABLE_TYPE_ENFORCEMENT] ?? false) {
             return $data;
         }
