Skip to content

Commit 83e0bfb

Browse files
nikicnikic
committed
Merge branch 'PHP-7.3' into PHP-7.4
2 parents 0cfa2e5 + 5d3e3a6 commit 83e0bfb

File tree

3 files changed

+11
-10
lines changed

3 files changed

+11
-10
lines changed

‎ext/mysqli/mysqli_api.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2028,8 +2028,8 @@ PHP_FUNCTION(mysqli_stmt_send_long_data)
20282028
}
20292029
/* }}} */
20302030

2031-
/* {{{ proto mixed mysqli_stmt_affected_rows(object stmt)
2032-
Return the number of rows affected in the last query for the given link */
2031+
/* {{{ proto string|int|false mysqli_stmt_affected_rows(object stmt)
2032+
Return the number of rows affected in the last query for the given link. */
20332033
PHP_FUNCTION(mysqli_stmt_affected_rows)
20342034
{
20352035
MY_STMT *stmt;

‎ext/mysqli/mysqli_priv.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ PHP_MYSQLI_EXPORT(zend_object *) mysqli_objects_new(zend_class_entry *);
9090
mysql->multi_query = 1; \
9191
}
9292

93+
/* Numbers that cannot be represented as a signed int are converted to a string instead (affects 32-bit builds). */
9394
#define MYSQLI_RETURN_LONG_INT(__val) \
9495
{ \
9596
if ((__val) < ZEND_LONG_MAX) { \

‎ext/opcache/Optimizer/zend_func_info.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -942,7 +942,7 @@ static const func_info_t func_infos[] = {
942942
F1("mysqli_query", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE | MAY_BE_OBJECT),
943943
F0("mysqli_multi_query", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE),
944944
F0("mysqli_set_charset", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE),
945-
F1("mysqli_get_charset", MAY_BE_NULL | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_ANY),
945+
F1("mysqli_get_charset", MAY_BE_NULL | MAY_BE_OBJECT),
946946
F0("mysqli_begin_transaction", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE),
947947
F0("mysqli_savepoint", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE),
948948
F0("mysqli_release_savepoint", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE),
@@ -951,7 +951,7 @@ static const func_info_t func_infos[] = {
951951
F1("mysqli_fetch_all", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_ANY),
952952
F1("mysqli_fetch_object", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_OBJECT),
953953
F0("mysqli_free_result", MAY_BE_NULL),
954-
F0("mysqli_affected_rows", MAY_BE_NULL | MAY_BE_LONG),
954+
F1("mysqli_affected_rows", MAY_BE_NULL | MAY_BE_LONG | MAY_BE_STRING),
955955
F0("mysqli_autocommit", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE),
956956
F0("mysqli_stmt_bind_param", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE),
957957
F0("mysqli_stmt_bind_result", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE),
@@ -987,14 +987,14 @@ static const func_info_t func_infos[] = {
987987
F0("mysqli_get_server_version", MAY_BE_NULL | MAY_BE_LONG),
988988
F1("mysqli_info", MAY_BE_NULL | MAY_BE_STRING),
989989
F1("mysqli_init", MAY_BE_FALSE | MAY_BE_OBJECT),
990-
F0("mysqli_insert_id", MAY_BE_NULL | MAY_BE_LONG),
990+
F1("mysqli_insert_id", MAY_BE_NULL | MAY_BE_LONG | MAY_BE_STRING),
991991
F0("mysqli_kill", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE),
992992
F0("mysqli_more_results", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE),
993993
F0("mysqli_next_result", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE),
994994
F0("mysqli_stmt_more_results", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE),
995995
F0("mysqli_stmt_next_result", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE),
996996
F0("mysqli_num_fields", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG),
997-
F0("mysqli_num_rows", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG),
997+
F1("mysqli_num_rows", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG | MAY_BE_STRING),
998998
F0("mysqli_options", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE),
999999
F0("mysqli_ping", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE),
10001000
F1("mysqli_prepare", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_OBJECT),
@@ -1003,19 +1003,19 @@ static const func_info_t func_infos[] = {
10031003
F1("mysqli_real_escape_string", MAY_BE_NULL | MAY_BE_STRING),
10041004
F0("mysqli_rollback", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE),
10051005
F0("mysqli_stmt_send_long_data", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE),
1006-
F0("mysqli_stmt_affected_rows", MAY_BE_NULL | MAY_BE_LONG),
1006+
F1("mysqli_stmt_affected_rows", MAY_BE_NULL | MAY_BE_LONG | MAY_BE_STRING),
10071007
F0("mysqli_stmt_close", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE),
10081008
F0("mysqli_stmt_data_seek", MAY_BE_NULL | MAY_BE_FALSE),
10091009
F0("mysqli_stmt_field_count", MAY_BE_NULL | MAY_BE_LONG),
10101010
F0("mysqli_stmt_free_result", MAY_BE_NULL),
1011-
F0("mysqli_stmt_insert_id", MAY_BE_NULL | MAY_BE_LONG),
1011+
F1("mysqli_stmt_insert_id", MAY_BE_NULL | MAY_BE_LONG | MAY_BE_STRING),
10121012
F0("mysqli_stmt_param_count", MAY_BE_NULL | MAY_BE_LONG),
10131013
F0("mysqli_stmt_reset", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE),
1014-
F0("mysqli_stmt_num_rows", MAY_BE_NULL | MAY_BE_LONG),
1014+
F1("mysqli_stmt_num_rows", MAY_BE_NULL | MAY_BE_LONG | MAY_BE_STRING),
10151015
F0("mysqli_select_db", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE),
10161016
F1("mysqli_sqlstate", MAY_BE_NULL | MAY_BE_STRING),
10171017
F0("mysqli_ssl_set", MAY_BE_NULL | MAY_BE_TRUE),
1018-
F1("mysqli_stat", MAY_BE_NULL | MAY_BE_STRING),
1018+
F1("mysqli_stat", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
10191019
F0("mysqli_refresh", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE),
10201020
F0("mysqli_stmt_attr_set", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE),
10211021
F0("mysqli_stmt_attr_get", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG),

0 commit comments

Comments
 (0)