Skip to content

Declare ext/mbstring constants in stubs #8798

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 23, 2022
Merged

Declare ext/mbstring constants in stubs #8798

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 2 additions & 9 deletions ext/mbstring/mbstring.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
49 changes: 49 additions & 0 deletions ext/mbstring/mbstring.stub.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {}

Expand Down
17 changes: 16 additions & 1 deletion ext/mbstring/mbstring_arginfo.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions ext/mbstring/php_mbregex.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
/* }}} */
Expand Down
2 changes: 2 additions & 0 deletions ext/mbstring/php_mbregex.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down