More mysqli func info fixes

Mainly changing resource returns to objects

diff --git a/ext/opcache/Optimizer/zend_func_info.c b/ext/opcache/Optimizer/zend_func_info.c
index 4b1b676ed8548c0b5cbef011f5a283e488c70ed9..45234a318722c4eb79c9e4f22e98935c45af0c8b 100644 (file)
--- a/ext/opcache/Optimizer/zend_func_info.c
+++ b/ext/opcache/Optimizer/zend_func_info.c
@@ -1020,7 +1020,7 @@ static const func_info_t func_infos[] = {
        F1("mysqli_get_client_stats",                           MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_STRING),
        F1("mysqli_error_list",                                         MAY_BE_NULL | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_ARRAY),
        F1("mysqli_get_links_stats",                            MAY_BE_NULL | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_LONG),
-       F1("mysqli_query",                                                      MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE | MAY_BE_RESOURCE),
+       F1("mysqli_query",                                                      MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE | MAY_BE_OBJECT),
        F0("mysqli_multi_query",                                        MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE),
        F0("mysqli_set_charset",                                        MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE),
        F1("mysqli_get_charset",                                        MAY_BE_NULL | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_ANY),
@@ -1046,11 +1046,11 @@ static const func_info_t func_infos[] = {
        F1("mysqli_error",                                                      MAY_BE_NULL | MAY_BE_STRING),
        F0("mysqli_stmt_execute",                                       MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE),
        F0("mysqli_poll",                                                       MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG),
-       F1("mysqli_reap_async_query",                           MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE | MAY_BE_RESOURCE),
-       F1("mysqli_stmt_get_result",                            MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_RESOURCE),
-       F1("mysqli_get_warnings",                                       MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_RESOURCE),
+       F1("mysqli_reap_async_query",                           MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE | MAY_BE_OBJECT),
+       F1("mysqli_stmt_get_result",                            MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_OBJECT),
+       F1("mysqli_get_warnings",                                       MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_OBJECT),
        F1("mysqli_stmt_error_list",                            MAY_BE_NULL | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_ARRAY),
-       F1("mysqli_stmt_get_warnings",                          MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_RESOURCE),
+       F1("mysqli_stmt_get_warnings",                          MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_OBJECT),
        F0("mysqli_stmt_fetch",                                         MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE),
        F1("mysqli_fetch_field",                                        MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_OBJECT),
        F1("mysqli_fetch_fields",                                       MAY_BE_NULL | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_OBJECT),
@@ -1067,18 +1067,18 @@ static const func_info_t func_infos[] = {
        F1("mysqli_get_server_info",                            MAY_BE_NULL | MAY_BE_STRING),
        F0("mysqli_get_server_version",                         MAY_BE_NULL | MAY_BE_LONG),
        F1("mysqli_info",                                                       MAY_BE_NULL | MAY_BE_STRING),
-       F1("mysqli_init",                                                       MAY_BE_FALSE | MAY_BE_RESOURCE),
+       F1("mysqli_init",                                                       MAY_BE_FALSE | MAY_BE_OBJECT),
        F0("mysqli_insert_id",                                          MAY_BE_NULL | MAY_BE_LONG),
        F0("mysqli_kill",                                                       MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE),
        F0("mysqli_more_results",                                       MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE),
        F0("mysqli_next_result",                                        MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE),
        F0("mysqli_stmt_more_results",                          MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE),
        F0("mysqli_stmt_next_result",                           MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE),
-       F0("mysqli_num_fields",                                         MAY_BE_NULL | MAY_BE_LONG),
-       F0("mysqli_num_rows",                                           MAY_BE_NULL | MAY_BE_LONG),
+       F0("mysqli_num_fields",                                         MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG),
+       F0("mysqli_num_rows",                                           MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG),
        F0("mysqli_options",                                            MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE),
        F0("mysqli_ping",                                                       MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE),
-       F1("mysqli_prepare",                                            MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_RESOURCE),
+       F1("mysqli_prepare",                                            MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_OBJECT),
        F0("mysqli_real_connect",                                       MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE),
        F0("mysqli_real_query",                                         MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE),
        F1("mysqli_real_escape_string",                         MAY_BE_NULL | MAY_BE_STRING),
@@ -1102,15 +1102,15 @@ static const func_info_t func_infos[] = {
        F0("mysqli_stmt_attr_get",                                      MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG),
        F0("mysqli_stmt_errno",                                         MAY_BE_NULL | MAY_BE_LONG),
        F1("mysqli_stmt_error",                                         MAY_BE_NULL | MAY_BE_STRING),
-       F1("mysqli_stmt_init",                                          MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_RESOURCE),
+       F1("mysqli_stmt_init",                                          MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_OBJECT),
        F0("mysqli_stmt_prepare",                                       MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE),
-       F1("mysqli_stmt_result_metadata",                       MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_RESOURCE),
+       F1("mysqli_stmt_result_metadata",                       MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_OBJECT),
        F0("mysqli_stmt_store_result",                          MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE),
        F1("mysqli_stmt_sqlstate",                                      MAY_BE_NULL | MAY_BE_STRING),
-       F1("mysqli_store_result",                                       MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_RESOURCE),
+       F1("mysqli_store_result",                                       MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_OBJECT),
        F0("mysqli_thread_id",                                          MAY_BE_NULL | MAY_BE_LONG),
        I0("mysqli_thread_safe",                                        MAY_BE_FALSE | MAY_BE_TRUE),
-       F1("mysqli_use_result",                                         MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_RESOURCE),
+       F1("mysqli_use_result",                                         MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_OBJECT),
        F0("mysqli_warning_count",                                      MAY_BE_NULL | MAY_BE_LONG),
 
        /* ext/curl */