[prev in list] [next in list] [prev in thread] [next in thread] 

List:       php-cvs
Subject:    [PHP-CVS] [php-src] master: Merge branch 'PHP-8.2'
From:       Niels Dossche <noreply () php ! net>
Date:       2023-05-29 17:15:33
Message-ID: KNlslloHj5qVkjWapigIaj5RzFxGaSCqJwoEfh2EWw () main ! php ! net
[Download RAW message or body]

Author: Niels Dossche (nielsdos)
Date: 2023-05-29T19:00:57+02:00

Commit: https://github.com/php/php-src/commit/f90962dd88e2e777c1a3fe13e5888135c0fefcd8
Raw diff: https://github.com/php/php-src/commit/f90962dd88e2e777c1a3fe13e5888135c0fefcd8.diff

Merge branch 'PHP-8.2'

* PHP-8.2:
  Fix return value in stub file for DOMNodeList::item

Changed paths:
  M  ext/dom/php_dom.stub.php
  M  ext/dom/php_dom_arginfo.h


Diff:

diff --git a/ext/dom/php_dom.stub.php b/ext/dom/php_dom.stub.php
index 21886e501508..0ef5c4e5cf0b 100644
--- 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
index d1234f140401..3a3fb9afd82e 100644
--- 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: 9a6a0c2a5626466aa6397f0892ee5b08ec335e14 */
+ * Stub hash: 060166e1fd79f7447f0eaafb626b33e12791e93b */
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_dom_import_simplexml, 0, 1, DOMElement, 0)
 	ZEND_ARG_TYPE_INFO(0, node, IS_OBJECT, 0)

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[prev in list] [next in list] [prev in thread] [next in thread]