getting closer.

dcarbone · Apr 24, 2024 · 0fa01f6 · 0fa01f6
1 parent 86ee6fe
commit 0fa01f6
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/template/core/interfaces/interface_xml_serializable_config.php b/template/core/interfaces/interface_xml_serializable_config.php
@@ -52,7 +52,7 @@ interface <?php echo PHPFHIR_INTERFACE_XML_SERIALIZALE_CONFIG; ?>
      * @param int $libxmlOpts
      * @return static
      */
-    public function setLibxmlOpts(int $libxmlOpts): self
+    public function setLibxmlOpts(int $libxmlOpts): self;
 
     /**
      * Must return the set libxml option flags

diff --git a/template/types/class_xhtml.php b/template/types/class_xhtml.php
@@ -84,19 +84,21 @@ public function getNode(): null|\DOMNode
     public function setNode(null|string|\DOMNode $node): self
     {
         if (null === $node) {
-            $newNode = null;
-        } else if (is_string($node)) {
-            $dom = new \DOMDocument();
+            $this->_trackValueSet($this->_node, null);
+            $this->_node = null;
+            return $this;
+        }
+        $dom = new \DOMDocument();
+        if (is_string($node)) {
             $dom->loadHTML($node);
-            $newNode = $dom->documentElement;
         } else if ($node instanceof \DOMDocument) {
-            $dom = new \DOMDocument();
             $dom->appendChild($dom->importNode($node->documentElement, true));
-            $newNode = $dom->documentElement;
         } else {
-            $dom = new \DOMDocument();
             $dom->appendChild($dom->importNode($node, true));
-            $newNode = $dom->documentElement;
+        }
+        $newNode = $dom->documentElement;
+        if ('' !== ($ens = (string)$newNode->namespaceURI)) {
+            $this->_setFHIRXMLNamespace($ens);
         }
         $this->_trackValueSet($this->_node, $newNode);
         $this->_node = $newNode;

diff --git a/template/types/serialization/xml/unserialize/header.php b/template/types/serialization/xml/unserialize/header.php
@@ -72,7 +72,7 @@ public static function xmlUnserialize(null|string|\DOMElement $element, null|<?p
             ));
         }
 <?php endif; ?>
-        if ('' === $type->_getFHIRXMLNamespace() && $element->namespaceURI) {
-            $type->_setFHIRXMLNamespace($element->namespaceURI);
+        if ('' === $type->_getFHIRXMLNamespace() && '' !== ($ens = (string)$element->namespaceURI)) {
+            $type->_setFHIRXMLNamespace($ens);
         }
 <?php return ob_get_clean();