From da0f075d6de2db739834bf3667e29f78d0f436cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1t=C3=A9=20Kocsis?= Date: Thu, 16 Jun 2022 09:09:11 +0200 Subject: [PATCH] Declare ext/mbstring constants in stubs --- ext/mbstring/mbstring.c | 11 ++------ ext/mbstring/mbstring.stub.php | 49 +++++++++++++++++++++++++++++++++ ext/mbstring/mbstring_arginfo.h | 17 +++++++++++- ext/mbstring/php_mbregex.c | 8 +++--- ext/mbstring/php_mbregex.h | 2 ++ 5 files changed, 73 insertions(+), 14 deletions(-) diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c index 9736d1f193694..74f582da970a5 100644 --- a/ext/mbstring/mbstring.c +++ b/ext/mbstring/mbstring.c @@ -1070,19 +1070,12 @@ ZEND_TSRMLS_CACHE_UPDATE(); sapi_register_post_entries(mbstr_post_entries); } - REGISTER_LONG_CONSTANT("MB_CASE_UPPER", PHP_UNICODE_CASE_UPPER, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("MB_CASE_LOWER", PHP_UNICODE_CASE_LOWER, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("MB_CASE_TITLE", PHP_UNICODE_CASE_TITLE, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("MB_CASE_FOLD", PHP_UNICODE_CASE_FOLD, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("MB_CASE_UPPER_SIMPLE", PHP_UNICODE_CASE_UPPER_SIMPLE, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("MB_CASE_LOWER_SIMPLE", PHP_UNICODE_CASE_LOWER_SIMPLE, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("MB_CASE_TITLE_SIMPLE", PHP_UNICODE_CASE_TITLE_SIMPLE, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("MB_CASE_FOLD_SIMPLE", PHP_UNICODE_CASE_FOLD_SIMPLE, CONST_CS | CONST_PERSISTENT); - #ifdef HAVE_MBREGEX PHP_MINIT(mb_regex) (INIT_FUNC_ARGS_PASSTHRU); #endif + register_mbstring_symbols(module_number); + if (FAILURE == zend_multibyte_set_functions(&php_mb_zend_multibyte_functions)) { return FAILURE; } diff --git a/ext/mbstring/mbstring.stub.php b/ext/mbstring/mbstring.stub.php index 0c4c5db9082c3..9163ac0b7090c 100644 --- a/ext/mbstring/mbstring.stub.php +++ b/ext/mbstring/mbstring.stub.php @@ -2,6 +2,55 @@ /** @generate-class-entries */ +#ifdef HAVE_MBREGEX +/** + * @var string + * @cname php_mb_oniguruma_version + */ +const MB_ONIGURUMA_VERSION = UNKNOWN; +#endif + +/** + * @var int + * @cname PHP_UNICODE_CASE_UPPER + */ +const MB_CASE_UPPER = UNKNOWN; +/** + * @var int + * @cname PHP_UNICODE_CASE_LOWER + */ +const MB_CASE_LOWER = UNKNOWN; +/** + * @var int + * @cname PHP_UNICODE_CASE_TITLE + */ +const MB_CASE_TITLE = UNKNOWN; +/** + * @var int + * @cname PHP_UNICODE_CASE_FOLD + */ +const MB_CASE_FOLD = UNKNOWN; +/** + * @var int + * @cname PHP_UNICODE_CASE_UPPER_SIMPLE + */ +const MB_CASE_UPPER_SIMPLE = UNKNOWN; +/** + * @var int + * @cname PHP_UNICODE_CASE_LOWER_SIMPLE + */ +const MB_CASE_LOWER_SIMPLE = UNKNOWN; +/** + * @var int + * @cname PHP_UNICODE_CASE_TITLE_SIMPLE + */ +const MB_CASE_TITLE_SIMPLE = UNKNOWN; +/** + * @var int + * @cname PHP_UNICODE_CASE_FOLD_SIMPLE + */ +const MB_CASE_FOLD_SIMPLE = UNKNOWN; + /** @refcount 1 */ function mb_language(?string $language = null): string|bool {} diff --git a/ext/mbstring/mbstring_arginfo.h b/ext/mbstring/mbstring_arginfo.h index 9fe44cc316d82..17e49c118f61c 100644 --- a/ext/mbstring/mbstring_arginfo.h +++ b/ext/mbstring/mbstring_arginfo.h @@ -1,5 +1,5 @@ /* This is a generated file, edit the .stub.php file instead. - * Stub hash: e553c28d2afd54f1ffcdbb0363aaa2079fabe07d */ + * Stub hash: be25a22e4e90b0a7e7cbcb0b8684c5e691aee0cd */ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_mb_language, 0, 0, MAY_BE_STRING|MAY_BE_BOOL) ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, language, IS_STRING, 1, "null") @@ -490,3 +490,18 @@ static const zend_function_entry ext_functions[] = { #endif ZEND_FE_END }; + +static void register_mbstring_symbols(int module_number) +{ +#if defined(HAVE_MBREGEX) + REGISTER_STRING_CONSTANT("MB_ONIGURUMA_VERSION", php_mb_oniguruma_version, CONST_CS | CONST_PERSISTENT); +#endif + REGISTER_LONG_CONSTANT("MB_CASE_UPPER", PHP_UNICODE_CASE_UPPER, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("MB_CASE_LOWER", PHP_UNICODE_CASE_LOWER, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("MB_CASE_TITLE", PHP_UNICODE_CASE_TITLE, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("MB_CASE_FOLD", PHP_UNICODE_CASE_FOLD, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("MB_CASE_UPPER_SIMPLE", PHP_UNICODE_CASE_UPPER_SIMPLE, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("MB_CASE_LOWER_SIMPLE", PHP_UNICODE_CASE_LOWER_SIMPLE, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("MB_CASE_TITLE_SIMPLE", PHP_UNICODE_CASE_TITLE_SIMPLE, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("MB_CASE_FOLD_SIMPLE", PHP_UNICODE_CASE_FOLD_SIMPLE, CONST_CS | CONST_PERSISTENT); +} diff --git a/ext/mbstring/php_mbregex.c b/ext/mbstring/php_mbregex.c index 1cedee5d79e40..5865268804402 100644 --- a/ext/mbstring/php_mbregex.c +++ b/ext/mbstring/php_mbregex.c @@ -46,6 +46,8 @@ typedef void OnigMatchParam; ZEND_EXTERN_MODULE_GLOBALS(mbstring) +char php_mb_oniguruma_version[256]; + struct _zend_mb_regex_globals { OnigEncoding default_mbctype; OnigEncoding current_mbctype; @@ -110,13 +112,11 @@ void php_mb_regex_globals_free(zend_mb_regex_globals *pglobals) /* {{{ PHP_MINIT_FUNCTION(mb_regex) */ PHP_MINIT_FUNCTION(mb_regex) { - char version[256]; - onig_init(); - snprintf(version, sizeof(version), "%d.%d.%d", + snprintf(php_mb_oniguruma_version, sizeof(php_mb_oniguruma_version), "%d.%d.%d", ONIGURUMA_VERSION_MAJOR, ONIGURUMA_VERSION_MINOR, ONIGURUMA_VERSION_TEENY); - REGISTER_STRING_CONSTANT("MB_ONIGURUMA_VERSION", version, CONST_CS | CONST_PERSISTENT); + return SUCCESS; } /* }}} */ diff --git a/ext/mbstring/php_mbregex.h b/ext/mbstring/php_mbregex.h index b4748582e9144..18a762d5a6142 100644 --- a/ext/mbstring/php_mbregex.h +++ b/ext/mbstring/php_mbregex.h @@ -30,6 +30,8 @@ PHP_RINIT_FUNCTION(mb_regex); PHP_RSHUTDOWN_FUNCTION(mb_regex); PHP_MINFO_FUNCTION(mb_regex); +extern char php_mb_oniguruma_version[256]; + typedef struct _zend_mb_regex_globals zend_mb_regex_globals; zend_mb_regex_globals *php_mb_regex_globals_alloc(void);