Merge branch 'PHP-8.1' into PHP-8.2

nielsdos · nielsdos · commit dfa89879a52a · 2023-05-29T18:50:54.000+02:00
* PHP-8.1:
  Fix return value in stub file for DOMNodeList::item
diff --git a/NEWS b/NEWS
@@ -10,6 +10,7 @@ PHP                                                                        NEWS
     and segfaults with replaceWith). (nielsdos)
   . Fixed bug GH-10234 (Setting DOMAttr::textContent results in an empty
     attribute value). (nielsdos)
+  . Fix return value in stub file for DOMNodeList::item. (divinity76)
 
 - Opcache:
   . Fix allocation loop in zend_shared_alloc_startup(). (nielsdos)
diff --git a/ext/dom/php_dom.stub.php b/ext/dom/php_dom.stub.php
@@ -467,7 +467,7 @@ public function count(): int {}
 
     public function getIterator(): Iterator {}
 
-    /** @return DOMNode|DOMNameSpaceNode|null */
+    /** @return DOMElement|DOMNode|DOMNameSpaceNode|null */
     public function item(int $index) {}
 }
 
diff --git a/ext/dom/php_dom_arginfo.h b/ext/dom/php_dom_arginfo.h

Original file line number	Diff line number	Diff line change
`@@ -467,7 +467,7 @@ public function count(): int {}`
`467`	`467`
`468`	`468`	`public function getIterator(): Iterator {}`
`469`	`469`
`470`		`- /** @return DOMNode\|DOMNameSpaceNode\|null */`
	`470`	`+ /** @return DOMElement\|DOMNode\|DOMNameSpaceNode\|null */`
`471`	`471`	`public function item(int $index) {}`
`472`	`472`	`}`
`473`	`473`