diff options
Diffstat (limited to 'ext/mysqli/mysqli_fe.c')
| -rw-r--r-- | ext/mysqli/mysqli_fe.c | 52 |
1 files changed, 34 insertions, 18 deletions
diff --git a/ext/mysqli/mysqli_fe.c b/ext/mysqli/mysqli_fe.c index 4f1f4a3527..db6763af03 100644 --- a/ext/mysqli/mysqli_fe.c +++ b/ext/mysqli/mysqli_fe.c @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 7 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2017 The PHP Group | + | Copyright (c) 1997-2018 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -63,10 +63,6 @@ ZEND_BEGIN_ARG_INFO(arginfo_class_mysqli_stmt_bind_param, 0) ZEND_ARG_VARIADIC_INFO(1, vars) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO(all_args_force_by_ref, 0) - ZEND_ARG_VARIADIC_INFO(1, vars) -ZEND_END_ARG_INFO() - ZEND_BEGIN_ARG_INFO_EX(arginfo_mysqli_poll, 0, 0, 4) ZEND_ARG_ARRAY_INFO(1, read, 1) ZEND_ARG_ARRAY_INFO(1, write, 1) @@ -243,18 +239,14 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_mysqli_fetch_object, 0, 0, 1) -#if PHP_VERSION_ID > 50399 MYSQLI_ZEND_ARG_OBJ_INFO_RESULT() ZEND_ARG_INFO(0, class_name) ZEND_ARG_ARRAY_INFO(0, params, 0) -#endif ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_class_mysqli_fetch_object, 0, 0, 0) -#if PHP_VERSION_ID > 50399 ZEND_ARG_INFO(0, class_name) ZEND_ARG_ARRAY_INFO(0, params, 0) -#endif ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_mysqli_kill, 0, 0, 2) @@ -269,6 +261,17 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_mysqli_query, 0, 0, 2) MYSQLI_ZEND_ARG_OBJ_INFO_LINK() ZEND_ARG_INFO(0, query) + ZEND_ARG_INFO(0, resultmode) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_mysqli_multi_query, 0, 0, 1) + MYSQLI_ZEND_ARG_OBJ_INFO_LINK() + ZEND_ARG_INFO(0, query) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_mysqli_real_query, 0, 0, 1) + MYSQLI_ZEND_ARG_OBJ_INFO_LINK() + ZEND_ARG_INFO(0, query) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_mysqli_prepare, 0, 0, 2) @@ -283,6 +286,19 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_class_mysqli_query, 0, 0, 1) ZEND_ARG_INFO(0, query) + ZEND_ARG_INFO(0, resultmode) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_mysqli_prepare, 0, 0, 1) + ZEND_ARG_INFO(0, query) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_mysqli_multi_query, 0, 0, 1) + ZEND_ARG_INFO(0, query) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_mysqli_real_query, 0, 0, 1) + ZEND_ARG_INFO(0, query) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_mysqli_options, 0, 0, 3) @@ -450,7 +466,7 @@ const zend_function_entry mysqli_functions[] = { PHP_FE(mysqli_insert_id, arginfo_mysqli_only_link) PHP_FE(mysqli_kill, arginfo_mysqli_kill) PHP_FE(mysqli_more_results, arginfo_mysqli_only_link) - PHP_FE(mysqli_multi_query, arginfo_mysqli_query) + PHP_FE(mysqli_multi_query, arginfo_mysqli_multi_query) PHP_FE(mysqli_next_result, arginfo_mysqli_only_link) PHP_FE(mysqli_num_fields, arginfo_mysqli_only_result) PHP_FE(mysqli_num_rows, arginfo_mysqli_only_result) @@ -464,7 +480,7 @@ const zend_function_entry mysqli_functions[] = { PHP_FE(mysqli_query, arginfo_mysqli_query) PHP_FE(mysqli_real_connect, arginfo_mysqli_real_connect) PHP_FE(mysqli_real_escape_string, arginfo_mysqli_real_escape_string) - PHP_FE(mysqli_real_query, arginfo_mysqli_query) + PHP_FE(mysqli_real_query, arginfo_mysqli_real_query) #if defined(MYSQLI_USE_MYSQLND) PHP_FE(mysqli_reap_async_query, arginfo_mysqli_only_link) #endif @@ -550,7 +566,7 @@ const zend_function_entry mysqli_link_methods[] = { PHP_FALIAS(get_warnings, mysqli_get_warnings, arginfo_mysqli_no_params) PHP_FALIAS(init,mysqli_init_method, arginfo_mysqli_no_params) PHP_FALIAS(kill,mysqli_kill, arginfo_class_mysqli_kill) - PHP_FALIAS(multi_query, mysqli_multi_query, arginfo_class_mysqli_query) + PHP_FALIAS(multi_query, mysqli_multi_query, arginfo_class_mysqli_multi_query) PHP_FALIAS(__construct, mysqli_link_construct, arginfo_mysqli_connect) PHP_FALIAS(more_results, mysqli_more_results, arginfo_mysqli_no_params) PHP_FALIAS(next_result, mysqli_next_result, arginfo_mysqli_no_params) @@ -559,7 +575,7 @@ const zend_function_entry mysqli_link_methods[] = { #if defined(MYSQLI_USE_MYSQLND) ZEND_FENTRY(poll, ZEND_FN(mysqli_poll), arginfo_mysqli_poll, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC) #endif - PHP_FALIAS(prepare, mysqli_prepare, arginfo_class_mysqli_query) + PHP_FALIAS(prepare, mysqli_prepare, arginfo_class_mysqli_prepare) PHP_FALIAS(query, mysqli_query, arginfo_class_mysqli_query) PHP_FALIAS(real_connect, mysqli_real_connect, arginfo_class_mysqli_real_connect) PHP_FALIAS(real_escape_string, mysqli_real_escape_string, arginfo_class_mysqli_real_escape_string) @@ -567,7 +583,7 @@ const zend_function_entry mysqli_link_methods[] = { PHP_FALIAS(reap_async_query, mysqli_reap_async_query, arginfo_mysqli_no_params) #endif PHP_FALIAS(escape_string, mysqli_real_escape_string, arginfo_class_mysqli_real_escape_string) - PHP_FALIAS(real_query, mysqli_real_query, arginfo_class_mysqli_query) + PHP_FALIAS(real_query, mysqli_real_query, arginfo_class_mysqli_real_query) PHP_FALIAS(release_savepoint, mysqli_release_savepoint, arginfo_class_mysqli_release_savepoint) PHP_FALIAS(rollback, mysqli_rollback, arginfo_class_mysqli_rollback) PHP_FALIAS(savepoint, mysqli_savepoint, arginfo_class_mysqli_savepoint) @@ -583,7 +599,7 @@ const zend_function_entry mysqli_link_methods[] = { PHP_FALIAS(thread_safe, mysqli_thread_safe, arginfo_mysqli_no_params) PHP_FALIAS(use_result, mysqli_use_result, arginfo_mysqli_no_params) PHP_FALIAS(refresh,mysqli_refresh, arginfo_class_mysqli_refresh) - {NULL, NULL, NULL} + PHP_FE_END }; /* }}} */ @@ -608,7 +624,7 @@ const zend_function_entry mysqli_result_methods[] = { PHP_FALIAS(fetch_row, mysqli_fetch_row, arginfo_mysqli_no_params) PHP_FALIAS(field_seek, mysqli_field_seek, arginfo_class_mysqli_result_and_fieldnr) PHP_FALIAS(free_result, mysqli_free_result, arginfo_mysqli_no_params) - {NULL, NULL, NULL} + PHP_FE_END }; /* }}} */ @@ -636,12 +652,12 @@ const zend_function_entry mysqli_stmt_methods[] = { PHP_FALIAS(send_long_data, mysqli_stmt_send_long_data, arginfo_class_mysqli_stmt_send_long_data) PHP_FALIAS(free_result, mysqli_stmt_free_result, arginfo_mysqli_no_params) PHP_FALIAS(reset, mysqli_stmt_reset, arginfo_mysqli_no_params) - PHP_FALIAS(prepare, mysqli_stmt_prepare, arginfo_class_mysqli_query) + PHP_FALIAS(prepare, mysqli_stmt_prepare, arginfo_class_mysqli_prepare) PHP_FALIAS(store_result, mysqli_stmt_store_result, arginfo_mysqli_no_params) #if defined(MYSQLI_USE_MYSQLND) PHP_FALIAS(get_result, mysqli_stmt_get_result, arginfo_mysqli_no_params) #endif - {NULL, NULL, NULL} + PHP_FE_END }; /* }}} */ |