Merge branch '5.4' into 6.3

* 5.4: [Serializer] Fix parsing XML root node attributes
symfony · Sep 29, 2023 · 855fc05 · 855fc05
2 parents 1c1a5f9 + b893175
commit 855fc05
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 9 deletions.
diff --git a/Encoder/XmlEncoder.php b/Encoder/XmlEncoder.php
@@ -154,15 +154,7 @@ public function decode(string $data, string $format, array $context = []): mixed
             return $rootNode->nodeValue;
         }
 
-        $data = [];
-
-        foreach ($rootNode->attributes as $attrKey => $attr) {
-            $data['@'.$attrKey] = $attr->nodeValue;
-        }
-
-        $data['#'] = $rootNode->nodeValue;
-
-        return $data;
+        return array_merge($this->parseXmlAttributes($rootNode, $context), ['#' => $rootNode->nodeValue]);
     }
 
     public function supportsEncoding(string $format): bool

diff --git a/Tests/Encoder/XmlEncoderTest.php b/Tests/Encoder/XmlEncoderTest.php
@@ -317,6 +317,21 @@ public function testDecodeFloatAttributeWithZeroWholeNumber()
         $this->assertSame(['@index' => 0.123, '#' => 'Name'], $this->encoder->decode($source, 'xml'));
     }
 
+    public function testNoTypeCastRootAttribute()
+    {
+        $source = <<<XML
+<?xml version="1.0"?>
+<document a="123"></document>
+XML;
+
+        $data = $this->encoder->decode($source, 'xml', ['xml_type_cast_attributes' => false]);
+        $expected = [
+            '@a' => '123',
+            '#' => '',
+        ];
+        $this->assertSame($expected, $data);
+    }
+
     public function testNoTypeCastAttribute()
     {
         $source = <<<XML