Fix return type of DOMNodeList::item()

It can also return DOMNameSpaceNode :(
php · Jul 21, 2021 · 1602db2 · 1602db2
1 parent 21d9931
commit 1602db2
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 5 deletions.
diff --git a/ext/dom/php_dom.stub.php b/ext/dom/php_dom.stub.php
@@ -230,8 +230,8 @@ public function count(): int {}
 
     public function getIterator(): Iterator {}
 
-    /** @tentative-return-type */
-    public function item(int $index): ?DOMNode {}
+    /** @return DOMNode|DOMNamespaceNode|null */
+    public function item(int $index) {}
 }
 
 class DOMCharacterData extends DOMNode implements DOMChildNode

diff --git a/ext/dom/php_dom_arginfo.h b/ext/dom/php_dom_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 9085cafc2477ac2efa9929a681251bf0f2f39879 */
+ * Stub hash: 2931a77f1b3b92494ce05cf44c2175dfae5f777f */
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_dom_import_simplexml, 0, 1, DOMElement, 1)
 	ZEND_ARG_TYPE_INFO(0, node, IS_OBJECT, 0)
@@ -135,7 +135,7 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_DOMNodeList_getIterator, 0, 0, Iterator, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_OBJ_INFO_EX(arginfo_class_DOMNodeList_item, 0, 1, DOMNode, 1)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMNodeList_item, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO(0, index, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
@@ -443,7 +443,9 @@ ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_OBJ_INFO_EX(arginfo_class_DOMNamedNodeMap_g
 	ZEND_ARG_TYPE_INFO(0, localName, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
-#define arginfo_class_DOMNamedNodeMap_item arginfo_class_DOMNodeList_item
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_OBJ_INFO_EX(arginfo_class_DOMNamedNodeMap_item, 0, 1, DOMNode, 1)
+	ZEND_ARG_TYPE_INFO(0, index, IS_LONG, 0)
+ZEND_END_ARG_INFO()
 
 #define arginfo_class_DOMNamedNodeMap_count arginfo_class_DOMNode_getLineNo
 

diff --git a/ext/dom/tests/xpath_domnamespacenode.phpt b/ext/dom/tests/xpath_domnamespacenode.phpt
@@ -0,0 +1,35 @@
+--TEST--
+DOMXPath::query() can return DOMNodeList with DOMNameSpaceNode items
+--FILE--
+<?php
+
+$xml = <<<'XML'
+<?xml version="1.0" encoding="UTF-8"?>
+<test></test>
+XML;
+$doc = new DomDocument;
+$doc->loadXML($xml);
+$xpath = new DOMXPath($doc);
+$nodes = $xpath->query('//namespace::*');
+var_dump($nodes->item(0));
+
+?>
+--EXPECT--
+object(DOMNameSpaceNode)#3 (8) {
+  ["nodeName"]=>
+  string(9) "xmlns:xml"
+  ["nodeValue"]=>
+  string(36) "http://www.w3.org/XML/1998/namespace"
+  ["nodeType"]=>
+  int(18)
+  ["prefix"]=>
+  string(3) "xml"
+  ["localName"]=>
+  string(3) "xml"
+  ["namespaceURI"]=>
+  string(36) "http://www.w3.org/XML/1998/namespace"
+  ["ownerDocument"]=>
+  string(22) "(object value omitted)"
+  ["parentNode"]=>
+  string(22) "(object value omitted)"
+}