Skip to content

Commit 41af933

Browse files
committed
Fix GH-16473: dom_import_simplexml stub is wrong
It's been wrong since PHP 8.0 at least, and the signature was inherited in 8.4-dev to the new DOM methods. Closes GH-16489.
1 parent 6a8d0a0 commit 41af933

File tree

4 files changed

+17
-3
lines changed

4 files changed

+17
-3
lines changed

NEWS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ PHP NEWS
2121
- DOM:
2222
. Fixed bug GH-16316 (DOMXPath breaks when not initialized properly).
2323
(nielsdos)
24+
. Fixed bug GH-16473 (dom_import_simplexml stub is wrong). (nielsdos)
2425

2526
- EXIF:
2627
. Fixed bug GH-16409 (Segfault in exif_thumbnail when not dealing with a

ext/dom/php_dom.stub.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -933,4 +933,4 @@ public function registerPhpFunctions(string|array|null $restrict = null): void {
933933
}
934934
#endif
935935

936-
function dom_import_simplexml(object $node): DOMElement {}
936+
function dom_import_simplexml(object $node): DOMAttr|DOMElement {}

ext/dom/php_dom_arginfo.h

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ext/dom/tests/gh16473.phpt

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
--TEST--
2+
GH-16473 (dom_import_simplexml stub is wrong)
3+
--EXTENSIONS--
4+
dom
5+
simplexml
6+
--FILE--
7+
<?php
8+
$root = simplexml_load_string('<root xmlns:x="urn:x" x:attr="foo"/>');
9+
$attr = $root->attributes('urn:x');
10+
var_dump(dom_import_simplexml($attr)->textContent);
11+
?>
12+
--EXPECT--
13+
string(3) "foo"

0 commit comments

Comments
 (0)