Skip to content

Commit 7b2c098

Browse files
committed
Merge branch 'PHP-8.0'
* PHP-8.0: Make fetch_* OO same as func
2 parents 63263ab + 34ef804 commit 7b2c098

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

ext/mysqli/mysqli.stub.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -353,19 +353,19 @@ public function fetch_all(int $mode = MYSQLI_NUM) {}
353353
public function fetch_array(int $mode = MYSQLI_BOTH) {}
354354

355355
/**
356-
* @return array|null
356+
* @return array|null|false
357357
* @alias mysqli_fetch_assoc
358358
*/
359359
public function fetch_assoc() {}
360360

361361
/**
362-
* @return object|null
362+
* @return object|null|false
363363
* @alias mysqli_fetch_object
364364
*/
365365
public function fetch_object(string $class = "stdClass", array $constructor_args = []) {}
366366

367367
/**
368-
* @return array|null
368+
* @return array|null|false
369369
* @alias mysqli_fetch_row
370370
*/
371371
public function fetch_row() {}

ext/mysqli/mysqli_arginfo.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* This is a generated file, edit the .stub.php file instead.
2-
* Stub hash: 64abcf3939756da46fbd9f6c41b6f59eff89cc65 */
2+
* Stub hash: a41875cecd71e72e1c1d3fc9c4d1442a65cd2d15 */
33

44
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_mysqli_affected_rows, 0, 1, MAY_BE_LONG|MAY_BE_STRING)
55
ZEND_ARG_OBJ_INFO(0, mysql, mysqli, 0)

0 commit comments

Comments
 (0)