From 1142f0c4a5a80b26325979a9fc29f971235c60bf Mon Sep 17 00:00:00 2001 From: Tyson Andre Date: Wed, 4 Dec 2019 09:40:42 -0500 Subject: [PATCH] Make more opcache signatures consistent with reflection --- ext/opcache/Optimizer/zend_func_info.c | 121 ++++++++++++------------- 1 file changed, 58 insertions(+), 63 deletions(-) diff --git a/ext/opcache/Optimizer/zend_func_info.c b/ext/opcache/Optimizer/zend_func_info.c index 6c28914e3c..1ab821f2b4 100644 --- a/ext/opcache/Optimizer/zend_func_info.c +++ b/ext/opcache/Optimizer/zend_func_info.c @@ -794,47 +794,47 @@ static const func_info_t func_infos[] = { /* ext/mbstring */ F1("mb_convert_case", MAY_BE_FALSE | MAY_BE_STRING), - F1("mb_strtoupper", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), - F1("mb_strtolower", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), - F1("mb_language", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE | MAY_BE_STRING), - F1("mb_internal_encoding", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE | MAY_BE_STRING), - F1("mb_http_input", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), - F1("mb_http_output", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE | MAY_BE_STRING), - F1("mb_detect_order", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_STRING), - F1("mb_substitute_character", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE | MAY_BE_LONG | MAY_BE_STRING), - F0("mb_parse_str", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), - F1("mb_output_handler", MAY_BE_NULL | MAY_BE_STRING), - F1("mb_preferred_mime_name", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), - F0("mb_strlen", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), - F0("mb_strpos", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), - F0("mb_strrpos", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), - F0("mb_stripos", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), - F0("mb_strripos", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), - F1("mb_strstr", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), - F1("mb_strrchr", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), - F1("mb_stristr", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), - F1("mb_strrichr", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), - F0("mb_substr_count", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), - F1("mb_substr", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), - F1("mb_strcut", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), - F0("mb_strwidth", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), - F1("mb_strimwidth", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), - F1("mb_convert_encoding", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_ANY), - F1("mb_detect_encoding", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), + F1("mb_strtoupper", MAY_BE_FALSE | MAY_BE_STRING), + F1("mb_strtolower", MAY_BE_FALSE | MAY_BE_STRING), + F1("mb_language", MAY_BE_FALSE | MAY_BE_TRUE | MAY_BE_STRING), + F1("mb_internal_encoding", MAY_BE_FALSE | MAY_BE_TRUE | MAY_BE_STRING), + F1("mb_http_input", MAY_BE_FALSE | MAY_BE_STRING), + F1("mb_http_output", MAY_BE_FALSE | MAY_BE_TRUE | MAY_BE_STRING), + F1("mb_detect_order", MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_STRING), + F1("mb_substitute_character", MAY_BE_FALSE | MAY_BE_TRUE | MAY_BE_LONG | MAY_BE_STRING), + F0("mb_parse_str", MAY_BE_FALSE | MAY_BE_TRUE), + F1("mb_output_handler", MAY_BE_STRING), + F1("mb_preferred_mime_name", MAY_BE_FALSE | MAY_BE_STRING), + F0("mb_strlen", MAY_BE_FALSE | MAY_BE_LONG), + F0("mb_strpos", MAY_BE_FALSE | MAY_BE_LONG), + F0("mb_strrpos", MAY_BE_FALSE | MAY_BE_LONG), + F0("mb_stripos", MAY_BE_FALSE | MAY_BE_LONG), + F0("mb_strripos", MAY_BE_FALSE | MAY_BE_LONG), + F1("mb_strstr", MAY_BE_FALSE | MAY_BE_STRING), + F1("mb_strrchr", MAY_BE_FALSE | MAY_BE_STRING), + F1("mb_stristr", MAY_BE_FALSE | MAY_BE_STRING), + F1("mb_strrichr", MAY_BE_FALSE | MAY_BE_STRING), + F0("mb_substr_count", MAY_BE_FALSE | MAY_BE_LONG), + F1("mb_substr", MAY_BE_FALSE | MAY_BE_STRING), + F1("mb_strcut", MAY_BE_FALSE | MAY_BE_STRING), + F0("mb_strwidth", MAY_BE_FALSE | MAY_BE_LONG), + F1("mb_strimwidth", MAY_BE_FALSE | MAY_BE_STRING), + F1("mb_convert_encoding", MAY_BE_FALSE | MAY_BE_STRING | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_ANY), + F1("mb_detect_encoding", MAY_BE_FALSE | MAY_BE_STRING), F1("mb_list_encodings", MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_STRING), F1("mb_encoding_aliases", MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_STRING), - F1("mb_convert_kana", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), - F1("mb_encode_mimeheader", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), - F1("mb_decode_mimeheader", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), - F1("mb_convert_variables", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), - F1("mb_encode_numericentity", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), - F1("mb_decode_numericentity", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), - F0("mb_send_mail", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F1("mb_convert_kana", MAY_BE_FALSE | MAY_BE_STRING), + F1("mb_encode_mimeheader", MAY_BE_FALSE | MAY_BE_STRING), + F1("mb_decode_mimeheader", MAY_BE_FALSE | MAY_BE_STRING), + F1("mb_convert_variables", MAY_BE_FALSE | MAY_BE_STRING), + F1("mb_encode_numericentity", MAY_BE_FALSE | MAY_BE_STRING), + F1("mb_decode_numericentity", MAY_BE_FALSE | MAY_BE_STRING), + F0("mb_send_mail", MAY_BE_FALSE | MAY_BE_TRUE), F1("mb_get_info", MAY_BE_FALSE | MAY_BE_LONG | MAY_BE_STRING | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_LONG | MAY_BE_ARRAY_OF_STRING | MAY_BE_ARRAY_OF_ARRAY), F0("mb_check_encoding", MAY_BE_FALSE | MAY_BE_TRUE), - F1("mb_regex_encoding", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE | MAY_BE_STRING), - F1("mb_regex_set_options", MAY_BE_FALSE | MAY_BE_STRING), + F1("mb_regex_encoding", MAY_BE_FALSE | MAY_BE_TRUE | MAY_BE_STRING), + F1("mb_regex_set_options", MAY_BE_STRING), F0("mb_ereg", MAY_BE_FALSE | MAY_BE_LONG), F0("mb_eregi", MAY_BE_FALSE | MAY_BE_LONG), F1("mb_ereg_replace", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), @@ -842,17 +842,14 @@ static const func_info_t func_infos[] = { F1("mb_ereg_replace_callback", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), F1("mb_split", MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_STRING), F0("mb_ereg_match", MAY_BE_FALSE | MAY_BE_TRUE), - F0("mb_ereg_search", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), - F1("mb_ereg_search_pos", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_LONG), - F1("mb_ereg_search_regs", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_FALSE | MAY_BE_ARRAY_OF_TRUE | MAY_BE_ARRAY_OF_STRING), - F0("mb_ereg_search_init", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F1("mb_ereg_search_pos", MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_LONG), + F1("mb_ereg_search_regs", MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_FALSE | MAY_BE_ARRAY_OF_TRUE | MAY_BE_ARRAY_OF_STRING), F1("mb_ereg_search_getregs", MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_FALSE | MAY_BE_ARRAY_OF_TRUE | MAY_BE_ARRAY_OF_STRING), F0("mb_ereg_search_getpos", MAY_BE_LONG), - F0("mb_ereg_search_setpos", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), /* ext/iconv */ - F1("iconv", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), - F1("iconv_get_encoding", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_STRING), + F1("iconv", MAY_BE_FALSE | MAY_BE_STRING), + F1("iconv_get_encoding", MAY_BE_FALSE | MAY_BE_STRING | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_STRING), F0("iconv_strlen", MAY_BE_FALSE | MAY_BE_LONG), F1("iconv_substr", MAY_BE_FALSE | MAY_BE_STRING), F0("iconv_strpos", MAY_BE_FALSE | MAY_BE_LONG), @@ -862,7 +859,7 @@ static const func_info_t func_infos[] = { F1("iconv_mime_decode_headers", MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_STRING | MAY_BE_ARRAY_OF_ARRAY), /* ext/json */ - F1("json_encode", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), + F1("json_encode", MAY_BE_FALSE | MAY_BE_STRING), F1("json_decode", MAY_BE_ANY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_ANY), F1("json_last_error_msg", MAY_BE_STRING), @@ -875,7 +872,6 @@ static const func_info_t func_infos[] = { F1("utf8_decode", MAY_BE_STRING), /* ext/zlib */ - F0("readgzfile", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), F1("gzgetc", MAY_BE_FALSE | MAY_BE_STRING), F1("gzgets", MAY_BE_FALSE | MAY_BE_STRING), F1("gzread", MAY_BE_FALSE | MAY_BE_STRING), @@ -890,8 +886,8 @@ static const func_info_t func_infos[] = { F1("gzinflate", MAY_BE_FALSE | MAY_BE_STRING), F1("gzencode", MAY_BE_FALSE | MAY_BE_STRING), F1("gzdecode", MAY_BE_FALSE | MAY_BE_STRING), - F1("zlib_encode", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), - F1("zlib_decode", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), + F1("zlib_encode", MAY_BE_FALSE | MAY_BE_STRING), + F1("zlib_decode", MAY_BE_FALSE | MAY_BE_STRING), F1("zlib_get_coding_type", MAY_BE_FALSE | MAY_BE_STRING), F1("ob_gzhandler", MAY_BE_FALSE | MAY_BE_STRING), @@ -904,7 +900,7 @@ static const func_info_t func_infos[] = { F1("hash_hkdf", MAY_BE_STRING), F1("hash_init", MAY_BE_OBJECT), F1("hash_final", MAY_BE_STRING), - F1("hash_copy", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_OBJECT), + F1("hash_copy", MAY_BE_OBJECT), F1("hash_algos", MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_STRING), F1("hash_pbkdf2", MAY_BE_STRING), F1("mhash_keygen_s2k", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), @@ -993,13 +989,12 @@ static const func_info_t func_infos[] = { /* ext/session */ F1("session_get_cookie_params", MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_ANY), - F1("session_name", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), - F1("session_module_name", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), - F1("session_save_path", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), - FN("session_id", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), - F1("session_create_id", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), - F1("session_cache_limiter", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), - F0("session_cache_expire", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), + F1("session_name", MAY_BE_FALSE | MAY_BE_STRING), + F1("session_module_name", MAY_BE_FALSE | MAY_BE_STRING), + F1("session_save_path", MAY_BE_FALSE | MAY_BE_STRING), + FN("session_id", MAY_BE_FALSE | MAY_BE_STRING), + F1("session_create_id", MAY_BE_FALSE | MAY_BE_STRING), + F1("session_cache_limiter", MAY_BE_FALSE | MAY_BE_STRING), F1("session_encode", MAY_BE_FALSE | MAY_BE_STRING), F0("session_gc", MAY_BE_FALSE | MAY_BE_LONG), F0("session_abort", MAY_BE_FALSE | MAY_BE_TRUE), @@ -1117,17 +1112,17 @@ static const func_info_t func_infos[] = { F1("filter_list", MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_STRING), /* ext/gettext */ - F1("textdomain", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), - F1("gettext", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), - F1("_", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), - F1("dgettext", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), - F1("dcgettext", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), + F1("textdomain", MAY_BE_FALSE | MAY_BE_STRING), + F1("gettext", MAY_BE_FALSE | MAY_BE_STRING), + F1("_", MAY_BE_FALSE | MAY_BE_STRING), + F1("dgettext", MAY_BE_FALSE | MAY_BE_STRING), + F1("dcgettext", MAY_BE_FALSE | MAY_BE_STRING), F1("bindtextdomain", MAY_BE_FALSE | MAY_BE_STRING), #if HAVE_NGETTEXT - F1("ngettext", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), + F1("ngettext", MAY_BE_FALSE | MAY_BE_STRING), #endif #if HAVE_DNGETTEXT - F1("dcngettext", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), + F1("dcngettext", MAY_BE_FALSE | MAY_BE_STRING), #endif #if HAVE_BIND_TEXTDOMAIN_CODESET F1("bind_textdomain_codeset", MAY_BE_FALSE | MAY_BE_STRING), @@ -1137,7 +1132,7 @@ static const func_info_t func_infos[] = { F1("finfo_open", MAY_BE_FALSE | MAY_BE_RESOURCE), F1("finfo_file", MAY_BE_FALSE | MAY_BE_STRING), F1("finfo_buffer", MAY_BE_FALSE | MAY_BE_STRING), - F1("mime_content_type", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), + F1("mime_content_type", MAY_BE_FALSE | MAY_BE_STRING), /* ext/gd */ F1("gd_info", MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_STRING | MAY_BE_ARRAY_OF_FALSE | MAY_BE_ARRAY_OF_TRUE), -- 2.50.1