Skip to content

Commit 9cd6c57

Browse files
committed
Merge branch 'PHP-8.0'
* PHP-8.0: Sync ext/mysqli optimizer func info entries with the stubs
2 parents b964d00 + 780293b commit 9cd6c57

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Zend/Optimizer/zend_func_info.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ static const func_info_t old_func_infos[] = {
360360
F1("mysqli_fetch_array", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_ANY),
361361
F1("mysqli_fetch_assoc", MAY_BE_NULL | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_ANY),
362362
F1("mysqli_fetch_all", MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_ANY),
363-
F1("mysqli_fetch_object", MAY_BE_NULL | MAY_BE_OBJECT),
363+
F1("mysqli_fetch_object", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_OBJECT),
364364
F1("mysqli_affected_rows", MAY_BE_LONG | MAY_BE_STRING),
365365
F1("mysqli_character_set_name", MAY_BE_STRING),
366366
F0("mysqli_debug", MAY_BE_TRUE),
@@ -374,7 +374,7 @@ static const func_info_t old_func_infos[] = {
374374
F1("mysqli_fetch_fields", MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_OBJECT),
375375
F1("mysqli_fetch_field_direct", MAY_BE_FALSE | MAY_BE_OBJECT),
376376
F1("mysqli_fetch_lengths", MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_LONG),
377-
F1("mysqli_fetch_row", MAY_BE_NULL | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_ANY),
377+
F1("mysqli_fetch_row", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_ANY),
378378
F1("mysqli_get_client_info", MAY_BE_STRING),
379379
F1("mysqli_get_host_info", MAY_BE_STRING),
380380
F1("mysqli_get_server_info", MAY_BE_STRING),

0 commit comments

Comments
 (0)