Merge pull request #697 from schmittjoh/xml-list

Deserializing XMLList with Namespaces not (always) working as intended
schmittjoh · Jan 19, 2017 · 30d0b79 · 30d0b79
2 parents f2200da + 17b78ad
commit 30d0b79
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 5 deletions.
diff --git a/src/JMS/Serializer/XmlDeserializationVisitor.php b/src/JMS/Serializer/XmlDeserializationVisitor.php
@@ -150,13 +150,15 @@ public function visitArray($data, array $type, Context $context)
             $namespace = isset($classMetadata->xmlNamespaces[''])?$classMetadata->xmlNamespaces['']:$namespace;
         }
 
-        if (0 === $data->count()){
-            $hasNode = false;
+        if (null !== $namespace) {
+            $prefix = uniqid('ns-');
+            $data->registerXPathNamespace($prefix, $namespace);
+            $nodes = $data->xpath("$prefix:$entryName");
         } else {
-            $hasNode = null !== $namespace ? isset($data->children($namespace)->$entryName) : isset($data->$entryName);
+            $nodes = $data->xpath($entryName);
         }
 
-        if (false === $hasNode) {
+        if (!count($nodes)) {
             if (null === $this->result) {
                 return $this->result = array();
             }
@@ -175,7 +177,6 @@ public function visitArray($data, array $type, Context $context)
                     $this->result = &$result;
                 }
 
-                $nodes = $data->children($namespace)->$entryName;
                 foreach ($nodes as $v) {
                     $result[] = $this->navigator->accept($v, $type['params'][0], $context);
                 }

diff --git a/tests/JMS/Serializer/Tests/Serializer/XmlSerializationTest.php b/tests/JMS/Serializer/Tests/Serializer/XmlSerializationTest.php
@@ -280,6 +280,31 @@ public function testXmlAttributeMapWithoutArray()
         $this->serializer->serialize(new Input($attributes), $this->getFormat());
     }
 
+    public function testObjectWithOnlyNamespacesAndList()
+    {
+        $object = new ObjectWithNamespacesAndList();
+
+        $object->phones = array();
+        $object->addresses = array();
+
+        $object->phonesAlternativeB = array();
+        $object->addressesAlternativeB = array();
+
+        $object->phonesAlternativeC = array('777', '888');
+        $object->addressesAlternativeC = array('A'=>'Street 7', 'B'=>'Street 8');
+
+        $object->phonesAlternativeD = array();
+        $object->addressesAlternativeD = array();
+
+        $this->assertEquals(
+            $this->getContent('object_with_only_namespaces_and_list'),
+            $this->serialize($object, SerializationContext::create())
+        );
+
+        $deserialized = $this->deserialize($this->getContent('object_with_only_namespaces_and_list'), get_class($object));
+        $this->assertEquals($object, $deserialized);
+    }
+
     public function testDeserializingNull()
     {
         $this->markTestSkipped('Not supported in XML.');

diff --git a/tests/JMS/Serializer/Tests/Serializer/xml/object_with_only_namespaces_and_list.xml b/tests/JMS/Serializer/Tests/Serializer/xml/object_with_only_namespaces_and_list.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ObjectWithNamespacesAndList xmlns="http://example.com/namespace" xmlns:x="http://example.com/namespace2">
+  <x:phone><![CDATA[777]]></x:phone>
+  <x:phone><![CDATA[888]]></x:phone>
+  <x:address id="A"><![CDATA[Street 7]]></x:address>
+  <x:address id="B"><![CDATA[Street 8]]></x:address>
+</ObjectWithNamespacesAndList>