Merge branch 'PHP-7.2'

This commit is contained in:
Nikita Popov 2018-06-13 23:48:37 +02:00
commit bc56bb847d
3 changed files with 10 additions and 16 deletions

View file

@ -53,7 +53,7 @@ static void _breakiter_factory(const char *func_name,
UErrorCode status = UErrorCode();
intl_error_reset(NULL);
if (zend_parse_parameters(ZEND_NUM_ARGS(), "s!",
if (zend_parse_parameters(ZEND_NUM_ARGS(), "|s!",
&locale_str, &dummy) == FAILURE) {
spprintf(&msg, 0, "%s: bad arguments", func_name);
intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, msg, 1);