Merge branch 'master' of git://github.com/dyeshurun/gedcomx-php into …

…xml-namespace-bug
FamilySearch · Sep 13, 2016 · bad8a53 · bad8a53
2 parents 53b5900 + 957f926
commit bad8a53
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 21 deletions.
diff --git a/src/Common/EvidenceReference.php b/src/Common/EvidenceReference.php
@@ -203,7 +203,7 @@ protected function setKnownChildElement(\XMLReader $xml)
      */
     protected function setKnownAttribute(\XMLReader $xml)
     {
-        if (parent::setKnownAttribute(\XMLReader::$xml)) {
+        if (parent::setKnownAttribute($xml)) {
             return true;
         } else {
             if (($xml->localName == 'resourceId') && (empty($xml->namespaceURI))) {

diff --git a/src/Common/ExtensibleData.php b/src/Common/ExtensibleData.php
@@ -264,6 +264,7 @@ public function initFromReader(\XMLReader $xml)
                 else if (!$this->setKnownChildElement($xml)) {
                     $n = $xml->localName;
                     $ns = $xml->namespaceURI;
+                    $elementIsEmpty = $xml->isEmptyElement;
                     $dom = new \DOMDocument();
                     $nodeFactory = $dom;
                     $dom->formatOutput = true;
@@ -273,34 +274,32 @@ public function initFromReader(\XMLReader $xml)
                     if ($xml->hasAttributes) {
                         $moreAttributes = $xml->moveToFirstAttribute();
                         while ($moreAttributes) {
-                            $e->setAttributeNS($xml->namespaceURI, $xml->localName, $xml->value);
+                            $e->setAttributeNS($ns, $xml->localName, $xml->value);
                             $moreAttributes = $xml->moveToNextAttribute();
                         }
                     }
                     $dom = $e;
-
-                    //create any child elements...
-                    while ($xml->read() && $xml->nodeType != \XMLReader::END_ELEMENT && $xml->localName != $n && $xml->namespaceURI != $ns) {
-                        if ($xml->nodeType == \XMLReader::ELEMENT) {
-                            $e = $nodeFactory->createElementNS($xml->namespaceURI, $xml->localName);
-                            $dom->appendChild($e);
-                            if ($xml->hasAttributes) {
-                                $moreAttributes = $xml->moveToFirstAttribute();
-                                while ($moreAttributes) {
-                                    $e->setAttributeNS($xml->namespaceURI, $xml->localName, $xml->value);
-                                    $moreAttributes = $xml->moveToNextAttribute();
+                    if (!$elementIsEmpty) {
+                        //create any child elements...
+                        while ($xml->read() && $xml->nodeType != \XMLReader::END_ELEMENT && $xml->localName != $n) {
+                            if ($xml->nodeType == \XMLReader::ELEMENT) {
+                                $e = $nodeFactory->createElementNS($xml->namespaceURI, $xml->localName);
+                                $dom->appendChild($e);
+                                if ($xml->hasAttributes) {
+                                    $moreAttributes = $xml->moveToFirstAttribute();
+                                    while ($moreAttributes) {
+                                        $e->setAttributeNS($xml->namespaceURI, $xml->localName, $xml->value);
+                                        $moreAttributes = $xml->moveToNextAttribute();
+                                    }
                                 }
+                            } else if ($xml->nodeType == \XMLReader::TEXT) {
+                                $dom->textContent = $xml->value;
+                            } else if ($xml->nodeType == \XMLReader::END_ELEMENT) {
+                                $dom = $dom->parentNode;
                             }
-                            $dom = $e;
-                        }
-                        else if ($xml->nodeType == \XMLReader::TEXT) {
-                            $dom->textContent = $xml->value;
-                        }
-                        else if ($xml->nodeType == \XMLReader::END_ELEMENT) {
-                            $dom = $dom->parentNode;
                         }
                     }
-                    array_push($this->extensionElements, $nodeFactory);
+                    array_push($this->extensionElements, $dom);
                 }
                 $xml->read(); //advance the reader.
             }