Merge branch 'PHP-8.4'

* PHP-8.4:
  Fix phpGH-16473: dom_import_simplexml stub is wrong

Author: ndossche

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
@@ -2171,5 +2171,5 @@ public static function quote(string $str): string {}
     }
 #endif
 
-    function import_simplexml(object $node): Element {}
+    function import_simplexml(object $node): Attr|Element {}
 }

ext/dom/php_dom_arginfo.h

@@ -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"