diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-02-05 10:07:07 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-03-11 11:32:20 +0100 |
| commit | 513b76794bfa210edfdc5b478dffbcbb19747ad0 (patch) | |
| tree | 6283beb92e0fd6a9da3e76c0f8ebe9649632f0aa /ext/intl/calendar | |
| parent | 87f8b1b7097ff58c3a535f5ce085f46960b37b78 (diff) | |
| download | php-git-513b76794bfa210edfdc5b478dffbcbb19747ad0.tar.gz | |
Make zpp failures always throw, independent of strict_types
Previously zend_parse_parameters (and FastZPP) would handle invalid
arguments depending on strict_types: With strict_types=1, a TypeError
is thrown, with strict_types=0 a warning is thrown and (usually) NULL
is returned. Additionally, some functions (constructors always and
other methods sometimes) opt-it to throwing regardless of strict_types.
This commit changes zpp to always generate a TypeError exception in
PHP 8.
Diffstat (limited to 'ext/intl/calendar')
| -rw-r--r-- | ext/intl/calendar/gregoriancalendar_methods.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ext/intl/calendar/gregoriancalendar_methods.cpp b/ext/intl/calendar/gregoriancalendar_methods.cpp index d96fffda6f..ce70aaacd7 100644 --- a/ext/intl/calendar/gregoriancalendar_methods.cpp +++ b/ext/intl/calendar/gregoriancalendar_methods.cpp @@ -56,7 +56,6 @@ static void _php_intlgregcal_constructor_body( zend_long largs[6]; UErrorCode status = U_ZERO_ERROR; int variant; - int zpp_flags = is_constructor ? ZEND_PARSE_PARAMS_THROW : 0; intl_error_reset(NULL); // parameter number validation / variant determination @@ -86,7 +85,7 @@ static void _php_intlgregcal_constructor_body( // argument parsing if (variant <= 2) { - if (zend_parse_parameters_ex(zpp_flags, MIN(ZEND_NUM_ARGS(), 2), + if (zend_parse_parameters(MIN(ZEND_NUM_ARGS(), 2), "|z!s!", &tz_object, &locale, &locale_len) == FAILURE) { intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, "intlgregcal_create_instance: bad arguments", 0); @@ -97,7 +96,7 @@ static void _php_intlgregcal_constructor_body( return; } } - if (variant > 2 && zend_parse_parameters_ex(zpp_flags, ZEND_NUM_ARGS(), + if (variant > 2 && zend_parse_parameters(ZEND_NUM_ARGS(), "lll|lll", &largs[0], &largs[1], &largs[2], &largs[3], &largs[4], &largs[5]) == FAILURE) { intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, |