Merge branch 'PHP-8.1' into PHP-8.2

ndossche · ndossche · commit 19886d3af5eb · 2023-09-27T22:33:45.000+02:00
* PHP-8.1:
  Restore old namespace reconciliation behaviour
diff --git a/NEWS b/NEWS
@@ -13,6 +13,9 @@ PHP                                                                        NEWS
   . Fixed bug GH-11997 (ctype_alnum 5 times slower in PHP 8.1 or greater).
     (nielsdos)
 
+- DOM:
+  . Restore old namespace reconciliation behaviour. (nielsdos)
+
 - Filter:
   . Fix explicit FILTER_REQUIRE_SCALAR with FILTER_CALLBACK (ilutov)
 
diff --git a/ext/dom/php_dom.c b/ext/dom/php_dom.c
@@ -1440,11 +1440,16 @@ static void dom_reconcile_ns_internal(xmlDocPtr doc, xmlNodePtr nodep, xmlNodePt
 
 static void dom_libxml_reconcile_ensure_namespaces_are_declared(xmlNodePtr nodep)
 {
+	/* Ideally we'd use the DOM-wrapped version, but we cannot: https://github.com/php/php-src/pull/12308. */
+#if 0
 	/* 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);
+#else
+	xmlReconciliateNs(nodep->doc, nodep);
+#endif
 }
 
 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"><element ns:foo="https://php.net/bar"/></html>
+<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>
 -- Test document fragment without import --
 <?xml version="1.0"?>
-<html xmlns=""><element xmlns:foo="https://php.net/bar"><foo:bar/><bar xmlns=""/></element></html>
+<html xmlns=""><element xmlns:foo="https://php.net/bar"><foo:bar/><bar/></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">
-<div xmlns="http://www.w3.org/1999/xhtml">
-    <p>Test-Text</p>
-</div>
+<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>
 -- Test partial document import --
 <?xml version="1.0"?>
diff --git a/ext/dom/tests/bug47847.phpt b/ext/dom/tests/bug47847.phpt
@@ -2,6 +2,8 @@
 Bug #47847 (importNode loses the namespace of an XML element)
 --EXTENSIONS--
 dom
+--XFAIL--
+See https://github.com/php/php-src/pull/12308
 --FILE--
 <?php
 $fromdom = new DOMDocument();
diff --git a/ext/dom/tests/bug55294.phpt b/ext/dom/tests/bug55294.phpt
@@ -2,6 +2,8 @@
 Bug #55294 (DOMDocument::importNode shifts namespaces when "default" namespace exists)
 --EXTENSIONS--
 dom
+--XFAIL--
+See https://github.com/php/php-src/pull/12308
 --FILE--
 <?php
 
diff --git a/ext/dom/tests/specific_namespace_behaviour.phpt b/ext/dom/tests/specific_namespace_behaviour.phpt
@@ -0,0 +1,27 @@
+--TEST--
+DOM: specific namespace behaviour for applications with fixed serialization requirements
+--EXTENSIONS--
+dom
+--FILE--
+<?php
+
+$dom1 = new DOMDocument();
+$dom1->loadXML(<<<XML
+<wsse:Security xmlns:wsse="foo:bar">
+    <ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+    </ds:Signature>
+</wsse:Security>
+XML);
+$dom2 = new DOMDocument();
+$dom2->loadXML('<xml><child/></xml>');
+$wsse = $dom2->importNode($dom1->documentElement, true);
+$dom2->firstChild->firstChild->appendChild($wsse);
+echo $dom2->saveXML();
+
+?>
+--EXPECT--
+<?xml version="1.0"?>
+<xml><child><wsse:Security xmlns:wsse="foo:bar" xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+    <ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+    </ds:Signature>
+</wsse:Security></child></xml>
