Add AbstractObjectNormalizer::ENABLE_TYPE_CONVERSION for scalar type transformation

Jeroeny · Jeroeny · commit 0b3d41f40c5c · 2023-10-19T16:35:15.000+02:00
diff --git a/src/Symfony/Component/Serializer/CHANGELOG.md b/src/Symfony/Component/Serializer/CHANGELOG.md
@@ -11,6 +11,7 @@ CHANGELOG
  * Make `ProblemNormalizer` give details about Messenger's `ValidationFailedException`
  * Add `XmlEncoder::CDATA_WRAPPING` context option
  * Deprecate `AnnotationLoader`, use `AttributeLoader` instead
+ * Add `AbstractObjectNormalizer::ENABLE_TYPE_CONVERSION` for scalar type transformation
 
 6.3
 ---
diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
@@ -56,6 +56,13 @@ abstract class AbstractObjectNormalizer extends AbstractNormalizer
      */
     public const DISABLE_TYPE_ENFORCEMENT = 'disable_type_enforcement';
 
+    /**
+     * While denormalizing, convert scalar types to the expected type.
+     *
+     * Enabled by default for the XML and CSV format, because all basic datatypes are represented as strings.
+     */
+    public const ENABLE_TYPE_CONVERSION = 'enable_type_conversion';
+
     /**
      * Flag to control whether fields with the value `null` should be output
      * when normalizing or omitted.
@@ -320,6 +327,10 @@ public function denormalize(mixed $data, string $type, string $format = null, ar
             return null;
         }
 
+        if (!isset($context[self::ENABLE_TYPE_CONVERSION]) && (XmlEncoder::FORMAT === $format || CsvEncoder::FORMAT === $format)) {
+            $context[self::ENABLE_TYPE_CONVERSION] = true;
+        }
+
         $allowedAttributes = $this->getAllowedAttributes($type, $context, true);
         $normalizedData = $this->prepareForDenormalization($data);
         $extraAttributes = [];
@@ -461,7 +472,7 @@ private function validateAndDenormalize(array $types, string $currentClass, stri
                 // In XML and CSV all basic datatypes are represented as strings, it is e.g. not possible to determine,
                 // if a value is meant to be a string, float, int or a boolean value from the serialized representation.
                 // That's why we have to transform the values, if one of these non-string basic datatypes is expected.
-                if (\is_string($data) && (XmlEncoder::FORMAT === $format || CsvEncoder::FORMAT === $format)) {
+                if (\is_string($data) && ($context[self::ENABLE_TYPE_CONVERSION] ?? false)) {
                     if ('' === $data) {
                         if (Type::BUILTIN_TYPE_ARRAY === $builtinType = $type->getBuiltinType()) {
                             return [];
@@ -595,7 +606,7 @@ private function validateAndDenormalize(array $types, string $currentClass, stri
             throw $missingConstructorArgumentsException;
         }
 
-        if ($data === '' && !$hasNonObjectType && (XmlEncoder::FORMAT === $format || CsvEncoder::FORMAT === $format)) {
+        if ($data === '' && !$hasNonObjectType && ($context[self::ENABLE_TYPE_CONVERSION] ?? false)) {
             return null;
         } elseif (!$isUnionType && isset($e)) {
             throw $e;
