Support cast to null when node is empty

jewome62 · jewome62 · commit 9840d27c432f · 2019-12-11T15:55:15.000+01:00
diff --git a/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php b/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
@@ -323,12 +323,16 @@ private function parseXmlAttributes(\DOMNode $node, array $context = []): array
      */
     private function parseXmlValue(\DOMNode $node, array $context = [])
     {
+        $typeCastNodes = (bool) ($context[self::TYPE_CAST_NODES] ?? $this->defaultContext[self::TYPE_CAST_NODES]);
+
         if (!$node->hasChildNodes()) {
+            if($typeCastNodes && '' === $node->nodeValue) {
+                return null;
+            }
+
             return $node->nodeValue;
         }
 
-        $typeCastNodes = (bool) ($context[self::TYPE_CAST_NODES] ?? $this->defaultContext[self::TYPE_CAST_NODES]);
-
         if (1 === $node->childNodes->length && \in_array($node->firstChild->nodeType, [XML_TEXT_NODE, XML_CDATA_SECTION_NODE])) {
             if (!is_numeric($node->firstChild->nodeValue) || !$typeCastNodes) {
                 return $node->firstChild->nodeValue;
diff --git a/src/Symfony/Component/Serializer/Tests/Encoder/XmlEncoderTest.php b/src/Symfony/Component/Serializer/Tests/Encoder/XmlEncoderTest.php
@@ -301,7 +301,11 @@ public function testNoTypeCastAttribute()
 </document>
 XML;
 
-        $data = $this->encoder->decode($source, 'xml', ['xml_type_cast_attributes' => false]);
+        $data = $this->encoder->decode($source, 'xml', [
+            XmlEncoder::TYPE_CAST_ATTRIBUTES => false,
+            XmlEncoder::TYPE_CAST_NODES => false
+        ]);
+        
         $expected = [
             '@a' => '018',
             '@b' => '-12.11',
@@ -451,8 +455,22 @@ public function testDecodeNumericNodeValue()
 
         $result = $this->encoder->decode($source, 'xml');
         $this->assertEquals($expected, $result);
-        $this->assertIsInt($result['foo']);
-        $this->assertIsFloat($result['bar']);
+        $this->assertInternalType('int', $result['foo']);
+        $this->assertInternalType('float', $result['bar']);
+    }
+
+    public function testDecodeEmptyNodeValue()
+    {
+        $source = '<?xml version="1.0"?>'."\n".
+            '<response><foo/></response>'."\n";
+
+        $expected = [
+            'foo' => null
+        ];
+
+        $result = $this->encoder->decode($source, 'xml');
+        $this->assertEquals($expected, $result);
+        $this->assertNull($result['foo']);
     }
 
     public function testDecodeRootAttributes()
