diff options
| author | George Peter Banyard <girgias@php.net> | 2021-03-25 02:12:06 +0000 |
|---|---|---|
| committer | George Peter Banyard <girgias@php.net> | 2021-03-25 02:12:06 +0000 |
| commit | 56c18c4038e3b9033c3e9cd48d053065898a6b2f (patch) | |
| tree | f7022130985e4916fb31d0a5b7f221b8b80aa07d /Zend/zend_execute.c | |
| parent | 6c89359124e7d8d49ef8a4b61ad93118555bb280 (diff) | |
| download | php-git-56c18c4038e3b9033c3e9cd48d053065898a6b2f.tar.gz | |
Drop unneessary if branch and adjust arg_num type
This if branch seems to be a remain of when certain type errors where E_WARNINGs, something which isn't the case since PHP 8.0.
Diffstat (limited to 'Zend/zend_execute.c')
| -rw-r--r-- | Zend/zend_execute.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index f34e1930e2..6d3c32d9b2 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -685,19 +685,13 @@ static ZEND_COLD void zend_verify_type_error_common( } ZEND_API ZEND_COLD void zend_verify_arg_error( - const zend_function *zf, const zend_arg_info *arg_info, int arg_num, zval *value) + const zend_function *zf, const zend_arg_info *arg_info, uint32_t arg_num, zval *value) { zend_execute_data *ptr = EG(current_execute_data)->prev_execute_data; const char *fname, *fsep, *fclass; zend_string *need_msg; const char *given_msg; - if (EG(exception)) { - /* The type verification itself might have already thrown an exception - * through a promoted warning. */ - return; - } - zend_verify_type_error_common( zf, arg_info, value, &fname, &fsep, &fclass, &need_msg, &given_msg); |