Merge branch 'PHP-8.2' into PHP-8.3

ndossche · ndossche · commit c26d5f20e878 · 2024-10-17T23:27:23.000+02:00
* PHP-8.2: Fix phpGH-16473: dom_import_simplexml stub is wrong
diff --git a/NEWS b/NEWS
@@ -24,6 +24,7 @@ PHP                                                                        NEWS
   . Add missing hierarchy checks to replaceChild. (nielsdos)
   . Fixed bug GH-16336 (Attribute intern document mismanagement). (nielsdos)
   . Fixed bug GH-16338 (Null-dereference in ext/dom/node.c). (nielsdos)
+  . Fixed bug GH-16473 (dom_import_simplexml stub is wrong). (nielsdos)
 
 - EXIF:
   . Fixed bug GH-16409 (Segfault in exif_thumbnail when not dealing with a
diff --git a/ext/dom/php_dom.stub.php b/ext/dom/php_dom.stub.php
@@ -975,4 +975,4 @@ public function registerPhpFunctions(string|array|null $restrict = null): void {
 }
 #endif
 
-function dom_import_simplexml(object $node): DOMElement {}
+function dom_import_simplexml(object $node): DOMAttr|DOMElement {}
diff --git a/ext/dom/php_dom_arginfo.h b/ext/dom/php_dom_arginfo.h
diff --git a/ext/dom/tests/gh16473.phpt b/ext/dom/tests/gh16473.phpt
@@ -0,0 +1,13 @@
+--TEST--
+GH-16473 (dom_import_simplexml stub is wrong)
+--EXTENSIONS--
+dom
+simplexml
+--FILE--
+<?php
+$root = simplexml_load_string('<root xmlns:x="urn:x" x:attr="foo"/>');
+$attr = $root->attributes('urn:x');
+var_dump(dom_import_simplexml($attr)->textContent);
+?>
+--EXPECT--
+string(3) "foo"

Original file line number	Diff line number	Diff line change
`@@ -975,4 +975,4 @@ public function registerPhpFunctions(string\|array\|null $restrict = null): void {`
`975`	`975`	`}`
`976`	`976`	`#endif`
`977`	`977`
`978`		`-function dom_import_simplexml(object $node): DOMElement {}`
	`978`	`+function dom_import_simplexml(object $node): DOMAttr\|DOMElement {}`