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 /Zend/zend.c | |
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 'Zend/zend.c')
-rw-r--r-- | Zend/zend.c | 25 |
1 files changed, 2 insertions, 23 deletions
diff --git a/Zend/zend.c b/Zend/zend.c index 22c9db203a..1ad1e8cfc6 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -1528,35 +1528,14 @@ ZEND_API ZEND_COLD void zend_type_error(const char *format, ...) /* {{{ */ va_end(va); } /* }}} */ -ZEND_API ZEND_COLD void zend_internal_type_error(zend_bool throw_exception, const char *format, ...) /* {{{ */ +ZEND_API ZEND_COLD void zend_argument_count_error(const char *format, ...) /* {{{ */ { va_list va; char *message = NULL; va_start(va, format); zend_vspprintf(&message, 0, format, va); - if (throw_exception) { - zend_throw_exception(zend_ce_type_error, message, 0); - } else { - zend_error(E_WARNING, "%s", message); - } - efree(message); - - va_end(va); -} /* }}} */ - -ZEND_API ZEND_COLD void zend_internal_argument_count_error(zend_bool throw_exception, const char *format, ...) /* {{{ */ -{ - va_list va; - char *message = NULL; - - va_start(va, format); - zend_vspprintf(&message, 0, format, va); - if (throw_exception) { - zend_throw_exception(zend_ce_argument_count_error, message, 0); - } else { - zend_error(E_WARNING, "%s", message); - } + zend_throw_exception(zend_ce_argument_count_error, message, 0); efree(message); va_end(va); |