right output

nielsdos · nielsdos · commit 6e39d1d81f4c · 2023-06-15T20:17:22.000+02:00
diff --git a/ext/dom/php_dom.c b/ext/dom/php_dom.c
@@ -1474,9 +1474,8 @@ static void dom_libxml_reconcile_ensure_namespaces_are_declared(xmlNodePtr nodep
 	/* Put on stack to avoid allocation.
 	 * Although libxml2 currently does not use this for the reconciliation, it still
 	 * makes sense to do this just in case libxml2's internal change in the future. */
-	//xmlDOMWrapCtxt dummy_ctxt = {0};
-	//xmlDOMWrapReconcileNamespaces(&dummy_ctxt, nodep, /* options */ 0);
-	xmlReconciliateNs(nodep->doc, nodep);
+	xmlDOMWrapCtxt dummy_ctxt = {0};
+	xmlDOMWrapReconcileNamespaces(&dummy_ctxt, nodep, /* options */ 0);
 }
 
 void dom_reconcile_ns(xmlDocPtr doc, xmlNodePtr nodep) /* {{{ */
diff --git a/ext/dom/tests/bug47530.phpt b/ext/dom/tests/bug47530.phpt
@@ -118,18 +118,18 @@ test_appendChild_with_shadowing();
 --EXPECT--
 -- Test document fragment with import --
 <?xml version="1.0"?>
-<html xmlns="https://php.net/something" xmlns:ns="https://php.net/whatever"><default:element xmlns:default="https://php.net/something" ns:foo="https://php.net/bar"/></html>
+<html xmlns="https://php.net/something" xmlns:ns="https://php.net/whatever"><element ns:foo="https://php.net/bar"/></html>
 -- Test document fragment without import --
 <?xml version="1.0"?>
-<html xmlns=""><element xmlns:foo="https://php.net/bar"><foo:bar/><bar/></element></html>
+<html xmlns=""><element xmlns:foo="https://php.net/bar"><foo:bar/><bar xmlns=""/></element></html>
 string(7) "foo:bar"
 string(19) "https://php.net/bar"
 -- Test document import --
 <?xml version="1.0"?>
-<feed xmlns="http://www.w3.org/2005/Atom" xmlns:default="http://www.w3.org/1999/xhtml">
-<default:div xmlns="http://www.w3.org/1999/xhtml">
-    <default:p>Test-Text</default:p>
-</default:div>
+<feed xmlns="http://www.w3.org/2005/Atom">
+<div xmlns="http://www.w3.org/1999/xhtml">
+    <p>Test-Text</p>
+</div>
 </feed>
 -- Test partial document import --
 <?xml version="1.0"?>
diff --git a/ext/dom/tests/bug47847.phpt b/ext/dom/tests/bug47847.phpt
@@ -22,6 +22,6 @@ echo $aDOM->saveXML();
 ?>
 --EXPECT--
 <?xml version="1.0"?>
-<inner xmlns="http://php.net" xmlns:ns="http://php.net">
-<WATCH-MY-NAMESPACE xmlns=""/>
-</inner>
+<ns:inner xmlns="http://php.net" xmlns:ns="http://php.net">
+<ns:WATCH-MY-NAMESPACE xmlns=""/>
+</ns:inner>
diff --git a/ext/dom/tests/bug55294.phpt b/ext/dom/tests/bug55294.phpt
@@ -24,6 +24,6 @@ echo $bDOM->saveXML(), "\n";
 ?>
 --EXPECT--
 <?xml version="1.0"?>
-<B xmlns="http://example.com/A" xmlns:default="http://example.com/C">
-<default:C xmlns="http://example.com/C" xmlns:default="http://example.com/Z"/>
+<B xmlns="http://example.com/A">
+<C xmlns="http://example.com/C" xmlns:default="http://example.com/Z"/>
 </B>
