[Serializer] Fix deserializing XML Attributes into string properties

Hanmac · Hanmac · commit 9a7183ea49d5 · 2025-02-13T11:22:00.000+01:00
diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
@@ -615,6 +615,21 @@ private function validateAndDenormalize(array $types, string $currentClass, stri
             }
         }
 
+        if (is_numeric($data) && XmlEncoder::FORMAT === $format) {
+            // encoder parsed them wrong, so they might need to be transformed back
+            foreach ($types as $type) {
+                $builtinType = $type->getBuiltinType();
+                switch ($builtinType) {
+                    case Type::BUILTIN_TYPE_STRING:
+                        return (string) $data;
+                    case Type::BUILTIN_TYPE_FLOAT:
+                        return (float) $data;
+                    case Type::BUILTIN_TYPE_INT:
+                        return (int) $data;
+                }
+            }
+        }
+
         if ($isNullable) {
             return null;
         }
diff --git a/src/Symfony/Component/Serializer/Tests/Fixtures/Attributes/SerializedNameAttributeDummy.php b/src/Symfony/Component/Serializer/Tests/Fixtures/Attributes/SerializedNameAttributeDummy.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Symfony\Component\Serializer\Tests\Fixtures\Attributes;
+
+use Symfony\Component\Serializer\Attribute\SerializedName;
+
+class SerializedNameAttributeDummy
+{
+    #[SerializedName('@foo')]
+    public string $foo;
+}
diff --git a/src/Symfony/Component/Serializer/Tests/SerializerTest.php b/src/Symfony/Component/Serializer/Tests/SerializerTest.php
@@ -32,6 +32,7 @@
 use Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactory;
 use Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactoryInterface;
 use Symfony\Component\Serializer\Mapping\Loader\AttributeLoader;
+use Symfony\Component\Serializer\NameConverter\MetadataAwareNameConverter;
 use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
 use Symfony\Component\Serializer\Normalizer\AbstractObjectNormalizer;
 use Symfony\Component\Serializer\Normalizer\ArrayDenormalizer;
@@ -51,6 +52,7 @@
 use Symfony\Component\Serializer\Tests\Fixtures\Attributes\AbstractDummy;
 use Symfony\Component\Serializer\Tests\Fixtures\Attributes\AbstractDummyFirstChild;
 use Symfony\Component\Serializer\Tests\Fixtures\Attributes\AbstractDummySecondChild;
+use Symfony\Component\Serializer\Tests\Fixtures\Attributes\SerializedNameAttributeDummy;
 use Symfony\Component\Serializer\Tests\Fixtures\DenormalizableDummy;
 use Symfony\Component\Serializer\Tests\Fixtures\DummyFirstChildQuux;
 use Symfony\Component\Serializer\Tests\Fixtures\DummyMessageInterface;
@@ -766,6 +768,19 @@ public function testDeserializeNullableIntInXml()
         $this->assertNull($obj->value);
     }
 
+    public function testDeserializeIntAsStringPropertyInXML()
+    {
+        $classMetadataFactory = new ClassMetadataFactory(new AttributeLoader());
+        $nameConverter = new MetadataAwareNameConverter($classMetadataFactory);
+        $extractor = new PropertyInfoExtractor([], [new ReflectionExtractor()]);
+        $serializer = new Serializer([new ObjectNormalizer($classMetadataFactory, $nameConverter, null, $extractor)], ['xml' => new XmlEncoder()]);
+
+        $obj = $serializer->deserialize('<?xml version="1.0" encoding="UTF-8"?><NameAttributeDummy foo="123" />', SerializedNameAttributeDummy::class, 'xml');
+
+        $this->assertSame('123', $obj->foo);
+    }
+
+
     public function testUnionTypeDeserializable()
     {
         $classMetadataFactory = new ClassMetadataFactory(new AttributeLoader());
