Skip to content

Add zend_argument_type_error_ex, zend_argument_error_ex #21829

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

Open
arnaud-lb wants to merge 1 commit into
base: master
Choose a base branch
from
+53 −9
Open

Add zend_argument_type_error_ex, zend_argument_error_ex #21829

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
39 changes: 36 additions & 3 deletions Zend/zend_API.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,9 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_unexpected_extra_named_error(void)
);
}

ZEND_API ZEND_COLD void ZEND_FASTCALL zend_argument_error_variadic(zend_class_entry *error_ce, uint32_t arg_num, const char *format, va_list va) /* {{{ */
Copy link
Copy Markdown
Member

@TimWolla TimWolla Apr 22, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It might be okay to just change the signature of this function and ask the (very few) callers of it to pass in zend_active_function() explicitly - in php-src there's only one outside of Zend/* - to avoid increasing the API surface too much.

ZEND_API ZEND_COLD void ZEND_FASTCALL zend_argument_error_variadic_ex(
const zend_function *function, uint32_t arg_num,
zend_class_entry *error_ce, const char *format, va_list va)
{
zend_string *func_name;
const char *arg_name;
Expand All @@ -383,8 +385,8 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_argument_error_variadic(zend_class_en
return;
}

func_name = get_active_function_or_method_name();
arg_name = get_active_function_arg_name(arg_num);
func_name = get_function_or_method_name(function);
arg_name = get_function_arg_name(function, arg_num);

zend_vspprintf(&message, 0, format, va);
zend_throw_error(error_ce, "%s(): Argument #%d%s%s%s %s",
Expand All @@ -394,8 +396,27 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_argument_error_variadic(zend_class_en
efree(message);
zend_string_release(func_name);
}

ZEND_API ZEND_COLD void ZEND_FASTCALL zend_argument_error_variadic(zend_class_entry *error_ce, uint32_t arg_num, const char *format, va_list va) /* {{{ */
{
ZEND_ASSERT(zend_is_executing());

const zend_function *function = zend_active_function();

zend_argument_error_variadic_ex(function, arg_num, error_ce, format, va);
}
/* }}} */

ZEND_API ZEND_COLD void zend_argument_error_ex(const zend_function *function,
uint32_t arg_num, zend_class_entry *error_ce, const char *format, ...)
{
va_list va;

va_start(va, format);
zend_argument_error_variadic_ex(function, arg_num, error_ce, format, va);
va_end(va);
}

ZEND_API ZEND_COLD void zend_argument_error(zend_class_entry *error_ce, uint32_t arg_num, const char *format, ...) /* {{{ */
{
va_list va;
Expand All @@ -406,6 +427,18 @@ ZEND_API ZEND_COLD void zend_argument_error(zend_class_entry *error_ce, uint32_t
}
/* }}} */

ZEND_API ZEND_COLD void zend_argument_type_error_ex(
const zend_function *function, uint32_t arg_num,
const char *format, ...)
{
va_list va;

va_start(va, format);
zend_argument_error_variadic_ex(function, arg_num,
zend_ce_type_error, format, va);
va_end(va);
}

ZEND_API ZEND_COLD void zend_argument_type_error(uint32_t arg_num, const char *format, ...) /* {{{ */
{
va_list va;
Expand Down
8 changes: 8 additions & 0 deletions Zend/zend_API.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1563,8 +1563,16 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_callback_error(uint32_t num, ch
ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_callback_or_null_error(uint32_t num, char *error);
ZEND_API ZEND_COLD void ZEND_FASTCALL zend_unexpected_extra_named_error(void);
ZEND_API ZEND_COLD void ZEND_FASTCALL zend_argument_error_variadic(zend_class_entry *error_ce, uint32_t arg_num, const char *format, va_list va);
ZEND_API ZEND_COLD void ZEND_FASTCALL zend_argument_error_variadic_ex(
const zend_function *function, uint32_t arg_num,
zend_class_entry *error_ce, const char *format, va_list va);
ZEND_API ZEND_COLD void zend_argument_error(zend_class_entry *error_ce, uint32_t arg_num, const char *format, ...);
ZEND_API ZEND_COLD void zend_argument_error_ex(const zend_function *function,
uint32_t arg_num, zend_class_entry *error_ce, const char *format, ...);
ZEND_API ZEND_COLD void zend_argument_type_error(uint32_t arg_num, const char *format, ...);
ZEND_API ZEND_COLD void zend_argument_type_error_ex(
const zend_function *function, uint32_t arg_num,
const char *format, ...);
ZEND_API ZEND_COLD void zend_argument_value_error(uint32_t arg_num, const char *format, ...);
ZEND_API ZEND_COLD void zend_argument_must_not_be_empty_error(uint32_t arg_num);
ZEND_API ZEND_COLD void zend_class_redeclaration_error(int type, const zend_class_entry *old_ce);
Expand Down
5 changes: 3 additions & 2 deletions Zend/zend_vm_def.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8918,9 +8918,10 @@ ZEND_VM_HOT_HANDLER(211, ZEND_TYPE_ASSERT, CONST, ANY, NUM)
zend_arg_info *arginfo = &fbc->common.arg_info[argno - 1];

if (!zend_check_type(&arginfo->type, value, /* is_return_type */ false, /* is_internal */ true)) {
const char *param_name = get_function_arg_name(fbc, argno);
zend_string *expected = zend_type_to_string(arginfo->type);
zend_type_error("%s(): Argument #%d%s%s%s must be of type %s, %s given", ZSTR_VAL(fbc->common.function_name), argno, param_name ? " ($" : "", param_name ? param_name : "", param_name ? ")" : "", ZSTR_VAL(expected), zend_zval_value_name(value));
zend_argument_type_error_ex(fbc, argno,
"must be of type %s, %s given",
ZSTR_VAL(expected), zend_zval_value_name(value));
zend_string_release(expected);
}
}
Expand Down
10 changes: 6 additions & 4 deletions Zend/zend_vm_execute.h
View file
Open in desktop

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

Loading