From 34ef804b04a8d4481490a248e867fca696b5c590 Mon Sep 17 00:00:00 2001 From: Dharman Date: Wed, 6 Jan 2021 12:59:27 +0000 Subject: Make fetch_* OO same as func Clsoses GH-6580. --- ext/mysqli/mysqli.stub.php | 6 +++--- ext/mysqli/mysqli_arginfo.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ext/mysqli/mysqli.stub.php b/ext/mysqli/mysqli.stub.php index 0e6fe71d61..9963c52763 100644 --- a/ext/mysqli/mysqli.stub.php +++ b/ext/mysqli/mysqli.stub.php @@ -355,19 +355,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 fb49d5eac5..9881a984df 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: 0403f612783ee03ff4f586f136b5d3481ecd072c */ + * Stub hash: 5a8b778eaa9efcca7d3ad8bfdbaa31d9d07b25e8 */ 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) -- cgit v1.2.1