From: Peter Kokot Date: Thu, 27 Jun 2019 22:13:25 +0000 (+0200) Subject: Merge branch 'PHP-7.4' X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7f994990eab4ffc3eb8cddca413dc4bcd03e3457;p=php Merge branch 'PHP-7.4' * PHP-7.4: Remove HAVE_STRCOLL check --- 7f994990eab4ffc3eb8cddca413dc4bcd03e3457 diff --cc ext/opcache/Optimizer/zend_func_info.c index 2479c3bb51,36a3677d91..deadab541d --- a/ext/opcache/Optimizer/zend_func_info.c +++ b/ext/opcache/Optimizer/zend_func_info.c @@@ -146,103 -275,101 +146,101 @@@ static const func_info_t func_infos[] F0("sleep", MAY_BE_FALSE | MAY_BE_LONG), F0("usleep", MAY_BE_NULL | MAY_BE_FALSE), #if HAVE_NANOSLEEP - F0("time_nanosleep", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), - F0("time_sleep_until", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("time_nanosleep", MAY_BE_FALSE | MAY_BE_TRUE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_LONG), + F0("time_sleep_until", MAY_BE_FALSE | MAY_BE_TRUE), #endif #if HAVE_STRPTIME - F1("strptime", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_LONG | MAY_BE_ARRAY_OF_STRING), + F1("strptime", MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_LONG | MAY_BE_ARRAY_OF_STRING), #endif F0("flush", MAY_BE_NULL), - F1("wordwrap", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), - F1("htmlspecialchars", MAY_BE_NULL | MAY_BE_STRING), - F1("htmlentities", MAY_BE_NULL | MAY_BE_STRING), - FN("html_entity_decode", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), - FN("htmlspecialchars_decode", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), - F1("get_html_translation_table", MAY_BE_NULL | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_STRING), - F1("sha1", MAY_BE_NULL | MAY_BE_STRING), - F1("sha1_file", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), - F1("md5", MAY_BE_NULL | MAY_BE_STRING), - F1("md5_file", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), - F0("crc32", MAY_BE_NULL | MAY_BE_LONG), - F1("iptcparse", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_ARRAY), - F1("iptcembed", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), - F1("getimagesize", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_LONG | MAY_BE_ARRAY_OF_STRING), - F1("getimagesizefromstring", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_LONG | MAY_BE_ARRAY_OF_STRING), - F1("image_type_to_mime_type", MAY_BE_NULL | MAY_BE_STRING), + F1("wordwrap", MAY_BE_FALSE | MAY_BE_STRING), + F1("htmlspecialchars", MAY_BE_STRING), + F1("htmlentities", MAY_BE_STRING), + FN("html_entity_decode", MAY_BE_FALSE | MAY_BE_STRING), + FN("htmlspecialchars_decode", MAY_BE_FALSE | MAY_BE_STRING), + F1("get_html_translation_table", MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_STRING), + F1("sha1", MAY_BE_STRING), + F1("sha1_file", MAY_BE_FALSE | MAY_BE_STRING), + F1("md5", MAY_BE_STRING), + F1("md5_file", MAY_BE_FALSE | MAY_BE_STRING), + F0("crc32", MAY_BE_LONG), + F1("iptcparse", MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_ARRAY), + F1("iptcembed", MAY_BE_FALSE | MAY_BE_STRING), + F1("getimagesize", MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_LONG | MAY_BE_ARRAY_OF_STRING), + F1("getimagesizefromstring", MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_LONG | MAY_BE_ARRAY_OF_STRING), + F1("image_type_to_mime_type", MAY_BE_STRING), F1("image_type_to_extension", MAY_BE_FALSE | MAY_BE_STRING), - F0("phpinfo", MAY_BE_NULL | MAY_BE_TRUE), - F1("phpversion", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), - F0("phpcredits", MAY_BE_NULL | MAY_BE_TRUE), - I1("php_sapi_name", MAY_BE_FALSE | MAY_BE_STRING), - F1("php_uname", MAY_BE_NULL | MAY_BE_STRING), - I1("php_ini_scanned_files", MAY_BE_FALSE | MAY_BE_STRING), - I1("php_ini_loaded_file", MAY_BE_FALSE | MAY_BE_STRING), - F0("strnatcmp", MAY_BE_NULL | MAY_BE_LONG), - F0("strnatcasecmp", MAY_BE_NULL | MAY_BE_LONG), - F0("substr_count", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), - F0("strspn", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), - F0("strcspn", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), - F1("strtok", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), - FN("strtoupper", MAY_BE_NULL | MAY_BE_STRING), - FN("strtolower", MAY_BE_NULL | MAY_BE_STRING), - F0("strpos", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), - F0("stripos", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), - F0("strrpos", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), - F0("strripos", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), - F1("strrev", MAY_BE_NULL | MAY_BE_STRING), - F1("hebrev", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), - F1("hebrevc", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), - F1("nl2br", MAY_BE_NULL | MAY_BE_STRING), - F1("basename", MAY_BE_NULL | MAY_BE_STRING), + F0("phpinfo", MAY_BE_TRUE), + F1("phpversion", MAY_BE_FALSE | MAY_BE_STRING), + F0("phpcredits", MAY_BE_TRUE), + F1("php_sapi_name", MAY_BE_FALSE | MAY_BE_STRING), + F1("php_uname", MAY_BE_STRING), + F1("php_ini_scanned_files", MAY_BE_FALSE | MAY_BE_STRING), + F1("php_ini_loaded_file", MAY_BE_FALSE | MAY_BE_STRING), + F0("strnatcmp", MAY_BE_LONG), + F0("strnatcasecmp", MAY_BE_LONG), + F0("substr_count", MAY_BE_FALSE | MAY_BE_LONG), + F0("strspn", MAY_BE_FALSE | MAY_BE_LONG), + F0("strcspn", MAY_BE_FALSE | MAY_BE_LONG), + F1("strtok", MAY_BE_FALSE | MAY_BE_STRING), + FN("strtoupper", MAY_BE_STRING), + FN("strtolower", MAY_BE_STRING), + F0("strpos", MAY_BE_FALSE | MAY_BE_LONG), + F0("stripos", MAY_BE_FALSE | MAY_BE_LONG), + F0("strrpos", MAY_BE_FALSE | MAY_BE_LONG), + F0("strripos", MAY_BE_FALSE | MAY_BE_LONG), + F1("strrev", MAY_BE_STRING), + F1("hebrev", MAY_BE_STRING), + F1("hebrevc", MAY_BE_STRING), + FN("nl2br", MAY_BE_STRING), + F1("basename", MAY_BE_STRING), F1("dirname", MAY_BE_NULL | MAY_BE_STRING), - F1("pathinfo", MAY_BE_NULL | MAY_BE_STRING | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_STRING), - F1("stripslashes", MAY_BE_NULL | MAY_BE_STRING), - F1("stripcslashes", MAY_BE_NULL | MAY_BE_STRING), - F1("strstr", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), - F1("stristr", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), - F1("strrchr", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), - F1("str_shuffle", MAY_BE_NULL | MAY_BE_STRING), - F1("str_word_count", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_STRING), - F1("str_split", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_STRING), + F1("pathinfo", MAY_BE_STRING | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_STRING), + F1("stripslashes", MAY_BE_STRING), + F1("stripcslashes", MAY_BE_STRING), + F1("strstr", MAY_BE_FALSE | MAY_BE_STRING), + F1("stristr", MAY_BE_FALSE | MAY_BE_STRING), + F1("strrchr", MAY_BE_FALSE | MAY_BE_STRING), + F1("str_shuffle", MAY_BE_STRING), + F1("str_word_count", MAY_BE_FALSE | MAY_BE_LONG | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_STRING), + F1("str_split", MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_STRING), F1("strpbrk", MAY_BE_FALSE | MAY_BE_STRING), F0("substr_compare", MAY_BE_FALSE | MAY_BE_LONG), - #ifdef HAVE_STRCOLL - F0("strcoll", MAY_BE_NULL | MAY_BE_LONG), + F0("strcoll", MAY_BE_LONG), - #endif #ifdef HAVE_STRFMON - F1("money_format", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), + F1("money_format", MAY_BE_FALSE | MAY_BE_STRING), #endif - FN("substr", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), - FN("substr_replace", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_STRING), - F1("quotemeta", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), - FN("ucfirst", MAY_BE_NULL | MAY_BE_STRING), - FN("lcfirst", MAY_BE_NULL | MAY_BE_STRING), - F1("ucwords", MAY_BE_NULL | MAY_BE_STRING), - FN("strtr", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), - FN("addslashes", MAY_BE_NULL | MAY_BE_STRING), - F1("addcslashes", MAY_BE_NULL | MAY_BE_STRING), - FN("rtrim", MAY_BE_NULL | MAY_BE_STRING), - FN("str_replace", MAY_BE_NULL | MAY_BE_STRING | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_STRING | MAY_BE_ARRAY_OF_ARRAY | MAY_BE_ARRAY_OF_OBJECT), - FN("str_ireplace", MAY_BE_NULL | MAY_BE_STRING | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_STRING | MAY_BE_ARRAY_OF_ARRAY | MAY_BE_ARRAY_OF_OBJECT), + FN("substr", MAY_BE_FALSE | MAY_BE_STRING), + FN("substr_replace", MAY_BE_FALSE | MAY_BE_STRING | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_STRING), + F1("quotemeta", MAY_BE_STRING), + FN("ucfirst", MAY_BE_STRING), + FN("lcfirst", MAY_BE_STRING), + F1("ucwords", MAY_BE_STRING), + FN("strtr", MAY_BE_FALSE | MAY_BE_STRING), + FN("addslashes", MAY_BE_STRING), + F1("addcslashes", MAY_BE_STRING), + FN("rtrim", MAY_BE_STRING), + FN("str_replace", MAY_BE_STRING | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_STRING | MAY_BE_ARRAY_OF_ARRAY | MAY_BE_ARRAY_OF_OBJECT), + FN("str_ireplace", MAY_BE_STRING | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_STRING | MAY_BE_ARRAY_OF_ARRAY | MAY_BE_ARRAY_OF_OBJECT), F1("str_repeat", MAY_BE_NULL | MAY_BE_STRING), - F1("count_chars", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_LONG), - F1("chunk_split", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), - FN("trim", MAY_BE_NULL | MAY_BE_STRING), - FN("ltrim", MAY_BE_NULL | MAY_BE_STRING), - F1("strip_tags", MAY_BE_NULL | MAY_BE_STRING), - F0("similar_text", MAY_BE_NULL | MAY_BE_LONG), - F1("explode", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_STRING), - FN("implode", MAY_BE_NULL | MAY_BE_STRING), - FN("join", MAY_BE_NULL | MAY_BE_STRING), - FN("setlocale", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), + F1("count_chars", MAY_BE_FALSE | MAY_BE_STRING | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_LONG), + F1("chunk_split", MAY_BE_FALSE | MAY_BE_STRING), + FN("trim", MAY_BE_STRING), + FN("ltrim", MAY_BE_STRING), + F1("strip_tags", MAY_BE_STRING), + F0("similar_text", MAY_BE_LONG), + F1("explode", MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_STRING), + FN("implode", MAY_BE_STRING), + FN("join", MAY_BE_STRING), + FN("setlocale", MAY_BE_FALSE | MAY_BE_STRING), F1("localeconv", MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_LONG | MAY_BE_ARRAY_OF_STRING | MAY_BE_ARRAY_OF_ARRAY), #if HAVE_NL_LANGINFO - F1("nl_langinfo", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), + F1("nl_langinfo", MAY_BE_FALSE | MAY_BE_STRING), #endif - F1("soundex", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), - F0("levenshtein", MAY_BE_NULL | MAY_BE_LONG), - F1("chr", MAY_BE_NULL | MAY_BE_STRING), - F0("ord", MAY_BE_NULL | MAY_BE_LONG), + F1("soundex", MAY_BE_FALSE | MAY_BE_STRING), + F0("levenshtein", MAY_BE_LONG), + F1("chr", MAY_BE_STRING), + F0("ord", MAY_BE_LONG), F0("parse_str", MAY_BE_NULL), F1("str_getcsv", MAY_BE_NULL | MAY_BE_ARRAY | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_NULL | MAY_BE_ARRAY_OF_STRING), F1("str_pad", MAY_BE_NULL | MAY_BE_STRING), diff --cc ext/standard/basic_functions.c index f17133f7e1,6bbd24f6cc..71c8604d6e --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@@ -2156,14 -2162,12 +2156,12 @@@ ZEND_BEGIN_ARG_INFO(arginfo_nl_langinfo ZEND_END_ARG_INFO() #endif - #ifdef HAVE_STRCOLL -ZEND_BEGIN_ARG_INFO(arginfo_strcoll, 0) +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO(arginfo_strcoll, IS_LONG, 0) ZEND_ARG_INFO(0, str1) ZEND_ARG_INFO(0, str2) ZEND_END_ARG_INFO() - #endif -ZEND_BEGIN_ARG_INFO_EX(arginfo_trim, 0, 0, 1) +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_trim, 0, 1, IS_STRING, 0) ZEND_ARG_INFO(0, str) ZEND_ARG_INFO(0, character_mask) ZEND_END_ARG_INFO()