Merge branch 'PHP-8.3' into PHP-8.4

* PHP-8.3: Fix phpGH-16473: dom_import_simplexml stub is wrong
DanielEScherzer · Oct 17, 2024 · 55266d4 · 55266d4
2 parents d8e5166 + c26d5f2
commit 55266d4
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 5 deletions.
diff --git a/NEWS b/NEWS
@@ -32,6 +32,7 @@ PHP                                                                        NEWS
     (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
@@ -1234,7 +1234,7 @@ public static function quote(string $str): string {}
     }
 #endif
 
-    function dom_import_simplexml(object $node): DOMElement {}
+    function dom_import_simplexml(object $node): DOMAttr|DOMElement {}
 }
 
 namespace Dom
@@ -2168,5 +2168,5 @@ public static function quote(string $str): string {}
     }
 #endif
 
-    function import_simplexml(object $node): Element {}
+    function import_simplexml(object $node): Attr|Element {}
 }
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"