Skip to content

Commit 1142f0c

Browse files
TysonAndreTysonAndre
committed
Make more opcache signatures consistent with reflection
1 parent 4845c3f commit 1142f0c

File tree

1 file changed

+58
-63
lines changed

1 file changed

+58
-63
lines changed

‎ext/opcache/Optimizer/zend_func_info.c

Lines changed: 58 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -794,65 +794,62 @@ static const func_info_t func_infos[] = {
794794

795795
/* ext/mbstring */
796796
F1("mb_convert_case", MAY_BE_FALSE | MAY_BE_STRING),
797-
F1("mb_strtoupper", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
798-
F1("mb_strtolower", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
799-
F1("mb_language", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE | MAY_BE_STRING),
800-
F1("mb_internal_encoding", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE | MAY_BE_STRING),
801-
F1("mb_http_input", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
802-
F1("mb_http_output", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE | MAY_BE_STRING),
803-
F1("mb_detect_order", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_STRING),
804-
F1("mb_substitute_character", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE | MAY_BE_LONG | MAY_BE_STRING),
805-
F0("mb_parse_str", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE),
806-
F1("mb_output_handler", MAY_BE_NULL | MAY_BE_STRING),
807-
F1("mb_preferred_mime_name", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
808-
F0("mb_strlen", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG),
809-
F0("mb_strpos", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG),
810-
F0("mb_strrpos", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG),
811-
F0("mb_stripos", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG),
812-
F0("mb_strripos", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG),
813-
F1("mb_strstr", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
814-
F1("mb_strrchr", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
815-
F1("mb_stristr", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
816-
F1("mb_strrichr", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
817-
F0("mb_substr_count", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG),
818-
F1("mb_substr", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
819-
F1("mb_strcut", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
820-
F0("mb_strwidth", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG),
821-
F1("mb_strimwidth", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
822-
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),
823-
F1("mb_detect_encoding", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
797+
F1("mb_strtoupper", MAY_BE_FALSE | MAY_BE_STRING),
798+
F1("mb_strtolower", MAY_BE_FALSE | MAY_BE_STRING),
799+
F1("mb_language", MAY_BE_FALSE | MAY_BE_TRUE | MAY_BE_STRING),
800+
F1("mb_internal_encoding", MAY_BE_FALSE | MAY_BE_TRUE | MAY_BE_STRING),
801+
F1("mb_http_input", MAY_BE_FALSE | MAY_BE_STRING),
802+
F1("mb_http_output", MAY_BE_FALSE | MAY_BE_TRUE | MAY_BE_STRING),
803+
F1("mb_detect_order", MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_STRING),
804+
F1("mb_substitute_character", MAY_BE_FALSE | MAY_BE_TRUE | MAY_BE_LONG | MAY_BE_STRING),
805+
F0("mb_parse_str", MAY_BE_FALSE | MAY_BE_TRUE),
806+
F1("mb_output_handler", MAY_BE_STRING),
807+
F1("mb_preferred_mime_name", MAY_BE_FALSE | MAY_BE_STRING),
808+
F0("mb_strlen", MAY_BE_FALSE | MAY_BE_LONG),
809+
F0("mb_strpos", MAY_BE_FALSE | MAY_BE_LONG),
810+
F0("mb_strrpos", MAY_BE_FALSE | MAY_BE_LONG),
811+
F0("mb_stripos", MAY_BE_FALSE | MAY_BE_LONG),
812+
F0("mb_strripos", MAY_BE_FALSE | MAY_BE_LONG),
813+
F1("mb_strstr", MAY_BE_FALSE | MAY_BE_STRING),
814+
F1("mb_strrchr", MAY_BE_FALSE | MAY_BE_STRING),
815+
F1("mb_stristr", MAY_BE_FALSE | MAY_BE_STRING),
816+
F1("mb_strrichr", MAY_BE_FALSE | MAY_BE_STRING),
817+
F0("mb_substr_count", MAY_BE_FALSE | MAY_BE_LONG),
818+
F1("mb_substr", MAY_BE_FALSE | MAY_BE_STRING),
819+
F1("mb_strcut", MAY_BE_FALSE | MAY_BE_STRING),
820+
F0("mb_strwidth", MAY_BE_FALSE | MAY_BE_LONG),
821+
F1("mb_strimwidth", MAY_BE_FALSE | MAY_BE_STRING),
822+
F1("mb_convert_encoding", MAY_BE_FALSE | MAY_BE_STRING | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_ANY),
823+
F1("mb_detect_encoding", MAY_BE_FALSE | MAY_BE_STRING),
824824
F1("mb_list_encodings", MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_STRING),
825825
F1("mb_encoding_aliases", MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_STRING),
826-
F1("mb_convert_kana", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
827-
F1("mb_encode_mimeheader", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
828-
F1("mb_decode_mimeheader", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
829-
F1("mb_convert_variables", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
830-
F1("mb_encode_numericentity", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
831-
F1("mb_decode_numericentity", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
832-
F0("mb_send_mail", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE),
826+
F1("mb_convert_kana", MAY_BE_FALSE | MAY_BE_STRING),
827+
F1("mb_encode_mimeheader", MAY_BE_FALSE | MAY_BE_STRING),
828+
F1("mb_decode_mimeheader", MAY_BE_FALSE | MAY_BE_STRING),
829+
F1("mb_convert_variables", MAY_BE_FALSE | MAY_BE_STRING),
830+
F1("mb_encode_numericentity", MAY_BE_FALSE | MAY_BE_STRING),
831+
F1("mb_decode_numericentity", MAY_BE_FALSE | MAY_BE_STRING),
832+
F0("mb_send_mail", MAY_BE_FALSE | MAY_BE_TRUE),
833833
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),
834834
F0("mb_check_encoding", MAY_BE_FALSE | MAY_BE_TRUE),
835835

836-
F1("mb_regex_encoding", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE | MAY_BE_STRING),
837-
F1("mb_regex_set_options", MAY_BE_FALSE | MAY_BE_STRING),
836+
F1("mb_regex_encoding", MAY_BE_FALSE | MAY_BE_TRUE | MAY_BE_STRING),
837+
F1("mb_regex_set_options", MAY_BE_STRING),
838838
F0("mb_ereg", MAY_BE_FALSE | MAY_BE_LONG),
839839
F0("mb_eregi", MAY_BE_FALSE | MAY_BE_LONG),
840840
F1("mb_ereg_replace", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
841841
F1("mb_eregi_replace", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
842842
F1("mb_ereg_replace_callback", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
843843
F1("mb_split", MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_STRING),
844844
F0("mb_ereg_match", MAY_BE_FALSE | MAY_BE_TRUE),
845-
F0("mb_ereg_search", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE),
846-
F1("mb_ereg_search_pos", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_LONG),
847-
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),
848-
F0("mb_ereg_search_init", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE),
845+
F1("mb_ereg_search_pos", MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_LONG),
846+
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),
849847
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),
850848
F0("mb_ereg_search_getpos", MAY_BE_LONG),
851-
F0("mb_ereg_search_setpos", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE),
852849

853850
/* ext/iconv */
854-
F1("iconv", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
855-
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),
851+
F1("iconv", MAY_BE_FALSE | MAY_BE_STRING),
852+
F1("iconv_get_encoding", MAY_BE_FALSE | MAY_BE_STRING | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_STRING),
856853
F0("iconv_strlen", MAY_BE_FALSE | MAY_BE_LONG),
857854
F1("iconv_substr", MAY_BE_FALSE | MAY_BE_STRING),
858855
F0("iconv_strpos", MAY_BE_FALSE | MAY_BE_LONG),
@@ -862,7 +859,7 @@ static const func_info_t func_infos[] = {
862859
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),
863860

864861
/* ext/json */
865-
F1("json_encode", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
862+
F1("json_encode", MAY_BE_FALSE | MAY_BE_STRING),
866863
F1("json_decode", MAY_BE_ANY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_ANY),
867864
F1("json_last_error_msg", MAY_BE_STRING),
868865

@@ -875,7 +872,6 @@ static const func_info_t func_infos[] = {
875872
F1("utf8_decode", MAY_BE_STRING),
876873

877874
/* ext/zlib */
878-
F0("readgzfile", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG),
879875
F1("gzgetc", MAY_BE_FALSE | MAY_BE_STRING),
880876
F1("gzgets", MAY_BE_FALSE | MAY_BE_STRING),
881877
F1("gzread", MAY_BE_FALSE | MAY_BE_STRING),
@@ -890,8 +886,8 @@ static const func_info_t func_infos[] = {
890886
F1("gzinflate", MAY_BE_FALSE | MAY_BE_STRING),
891887
F1("gzencode", MAY_BE_FALSE | MAY_BE_STRING),
892888
F1("gzdecode", MAY_BE_FALSE | MAY_BE_STRING),
893-
F1("zlib_encode", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
894-
F1("zlib_decode", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
889+
F1("zlib_encode", MAY_BE_FALSE | MAY_BE_STRING),
890+
F1("zlib_decode", MAY_BE_FALSE | MAY_BE_STRING),
895891
F1("zlib_get_coding_type", MAY_BE_FALSE | MAY_BE_STRING),
896892
F1("ob_gzhandler", MAY_BE_FALSE | MAY_BE_STRING),
897893

@@ -904,7 +900,7 @@ static const func_info_t func_infos[] = {
904900
F1("hash_hkdf", MAY_BE_STRING),
905901
F1("hash_init", MAY_BE_OBJECT),
906902
F1("hash_final", MAY_BE_STRING),
907-
F1("hash_copy", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_OBJECT),
903+
F1("hash_copy", MAY_BE_OBJECT),
908904
F1("hash_algos", MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_STRING),
909905
F1("hash_pbkdf2", MAY_BE_STRING),
910906
F1("mhash_keygen_s2k", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
@@ -993,13 +989,12 @@ static const func_info_t func_infos[] = {
993989

994990
/* ext/session */
995991
F1("session_get_cookie_params", MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_ANY),
996-
F1("session_name", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
997-
F1("session_module_name", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
998-
F1("session_save_path", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
999-
FN("session_id", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
1000-
F1("session_create_id", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
1001-
F1("session_cache_limiter", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
1002-
F0("session_cache_expire", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG),
992+
F1("session_name", MAY_BE_FALSE | MAY_BE_STRING),
993+
F1("session_module_name", MAY_BE_FALSE | MAY_BE_STRING),
994+
F1("session_save_path", MAY_BE_FALSE | MAY_BE_STRING),
995+
FN("session_id", MAY_BE_FALSE | MAY_BE_STRING),
996+
F1("session_create_id", MAY_BE_FALSE | MAY_BE_STRING),
997+
F1("session_cache_limiter", MAY_BE_FALSE | MAY_BE_STRING),
1003998
F1("session_encode", MAY_BE_FALSE | MAY_BE_STRING),
1004999
F0("session_gc", MAY_BE_FALSE | MAY_BE_LONG),
10051000
F0("session_abort", MAY_BE_FALSE | MAY_BE_TRUE),
@@ -1117,17 +1112,17 @@ static const func_info_t func_infos[] = {
11171112
F1("filter_list", MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_STRING),
11181113

11191114
/* ext/gettext */
1120-
F1("textdomain", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
1121-
F1("gettext", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
1122-
F1("_", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
1123-
F1("dgettext", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
1124-
F1("dcgettext", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
1115+
F1("textdomain", MAY_BE_FALSE | MAY_BE_STRING),
1116+
F1("gettext", MAY_BE_FALSE | MAY_BE_STRING),
1117+
F1("_", MAY_BE_FALSE | MAY_BE_STRING),
1118+
F1("dgettext", MAY_BE_FALSE | MAY_BE_STRING),
1119+
F1("dcgettext", MAY_BE_FALSE | MAY_BE_STRING),
11251120
F1("bindtextdomain", MAY_BE_FALSE | MAY_BE_STRING),
11261121
#if HAVE_NGETTEXT
1127-
F1("ngettext", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
1122+
F1("ngettext", MAY_BE_FALSE | MAY_BE_STRING),
11281123
#endif
11291124
#if HAVE_DNGETTEXT
1130-
F1("dcngettext", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
1125+
F1("dcngettext", MAY_BE_FALSE | MAY_BE_STRING),
11311126
#endif
11321127
#if HAVE_BIND_TEXTDOMAIN_CODESET
11331128
F1("bind_textdomain_codeset", MAY_BE_FALSE | MAY_BE_STRING),
@@ -1137,7 +1132,7 @@ static const func_info_t func_infos[] = {
11371132
F1("finfo_open", MAY_BE_FALSE | MAY_BE_RESOURCE),
11381133
F1("finfo_file", MAY_BE_FALSE | MAY_BE_STRING),
11391134
F1("finfo_buffer", MAY_BE_FALSE | MAY_BE_STRING),
1140-
F1("mime_content_type", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
1135+
F1("mime_content_type", MAY_BE_FALSE | MAY_BE_STRING),
11411136

11421137
/* ext/gd */
11431138
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),

0 commit comments

Comments
 (0)