Merge branch 'PHP-8.0'

* PHP-8.0:
  Make fetch_* OO same as func

2 files changed, 4 insertions, 4 deletions

diff --git a/ext/mysqli/mysqli.stub.php b/ext/mysqli/mysqli.stub.php
index aaf1613137..1c3a5b53ea 100644
--- a/ext/mysqli/mysqli.stub.php
+++ b/ext/mysqli/mysqli.stub.php
@@ -353,19 +353,19 @@ class mysqli_result implements IteratorAggregate
     public function fetch_array(int $mode = MYSQLI_BOTH) {}
 
     /**
-     * @return array|null
+     * @return array|null|false
      * @alias mysqli_fetch_assoc
      */
     public function fetch_assoc() {}
 
     /**
-     * @return object|null
+     * @return object|null|false
      * @alias mysqli_fetch_object
      */
     public function fetch_object(string $class = "stdClass", array $constructor_args = []) {}
 
     /**
-     * @return array|null
+     * @return array|null|false
      * @alias mysqli_fetch_row
      */
     public function fetch_row() {}
diff --git a/ext/mysqli/mysqli_arginfo.h b/ext/mysqli/mysqli_arginfo.h
index 38d86d8e24..16d020ddd8 100644
--- a/ext/mysqli/mysqli_arginfo.h
+++ b/ext/mysqli/mysqli_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 64abcf3939756da46fbd9f6c41b6f59eff89cc65 */
+ * Stub hash: a41875cecd71e72e1c1d3fc9c4d1442a65cd2d15 */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_mysqli_affected_rows, 0, 1, MAY_BE_LONG|MAY_BE_STRING)
 	ZEND_ARG_OBJ_INFO(0, mysql, mysqli, 0)