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

Merged
TimWolla merged 6 commits into from
Jul 16, 2026
Merged

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
6 commits
Select commit Hold shift + click to select a range
a5beccf
Add zend_argument_type_error_ex, zend_argument_error_ex
arnaud-lb Apr 22, 2026
e18edf9
Reduce API surface
arnaud-lb May 6, 2026
2422f15
Consistent argument order
arnaud-lb Jul 16, 2026
24fc23f
[ci skip] UPGRADING.INTERNALS
arnaud-lb Jul 16, 2026
ed34c26
Fix build
arnaud-lb Jul 16, 2026
bc4182e
Add zend_argument_value_error_ex
arnaud-lb Jul 16, 2026
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
3 changes: 3 additions & 0 deletions UPGRADING.INTERNALS
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -129,6 +129,9 @@ PHP 8.6 INTERNALS UPGRADE NOTES
zend_reflection_property_set_raw_value() to expose the functionality of
ReflectionProperty::setRawValueWithoutLazyInitialization() and
ReflectionProperty::setRawValue() to C extensions.
. zend_argument_error_variadic() now takes a new 'function' parameters.
. Added zend_argument_error_ex(), zend_argument_type_error_ex(),
zend_argument_value_error_ex().

========================
2. Build system changes
Expand Down
46 changes: 39 additions & 7 deletions Zend/zend_API.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -374,7 +374,8 @@ 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) /* {{{ */
Comment thread
TimWolla marked this conversation as resolved.
ZEND_API ZEND_COLD void ZEND_FASTCALL zend_argument_error_variadic(
zend_class_entry *error_ce, const zend_function *function, uint32_t arg_num, const char *format, va_list va)
{
zend_string *func_name;
const char *arg_name;
Expand All@@ -383,8 +384,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,34 +395,65 @@ 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_argument_error_ex(zend_class_entry *error_ce, const zend_function *function, uint32_t arg_num, const char *format, ...)
{
va_list va;

va_start(va, format);
zend_argument_error_variadic(error_ce, function, arg_num, 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;
const zend_function *function = zend_active_function();

va_start(va, format);
zend_argument_error_variadic(error_ce, arg_num, format, va);
zend_argument_error_variadic(error_ce, function, arg_num, format, va);
va_end(va);
}
/* }}} */

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(zend_ce_type_error, function, arg_num, format, va);
va_end(va);
}

ZEND_API ZEND_COLD void zend_argument_type_error(uint32_t arg_num, const char *format, ...) /* {{{ */
{
va_list va;
const zend_function *function = zend_active_function();

va_start(va, format);
zend_argument_error_variadic(zend_ce_type_error, arg_num, format, va);
zend_argument_error_variadic(zend_ce_type_error, function, arg_num, format, va);
va_end(va);
}
/* }}} */

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

va_start(va, format);
zend_argument_error_variadic(zend_ce_value_error, function, arg_num, format, va);
va_end(va);
}

ZEND_API ZEND_COLD void zend_argument_value_error(uint32_t arg_num, const char *format, ...) /* {{{ */
{
va_list va;
const zend_function *function = zend_active_function();

va_start(va, format);
zend_argument_error_variadic(zend_ce_value_error, arg_num, format, va);
zend_argument_error_variadic(zend_ce_value_error, function, arg_num, format, va);
va_end(va);
}
/* }}} */
Expand Down
5 changes: 4 additions & 1 deletion Zend/zend_API.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1579,10 +1579,13 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_parameter_class_or_string_or_nu
ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_callback_error(uint32_t num, char *error);
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(zend_class_entry *error_ce, const zend_function *function, uint32_t arg_num, 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(zend_class_entry *error_ce, const zend_function *function, uint32_t arg_num, 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, ...);
Comment thread
arnaud-lb marked this conversation as resolved.
ZEND_API ZEND_COLD void zend_argument_value_error_ex(const zend_function *function, 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);
ZEND_API ZEND_COLD void zend_class_redeclaration_error_ex(int type, zend_string *new_name, 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 numberDiff line numberDiff line change
Expand Up@@ -8921,9 +8921,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.

2 changes: 1 addition & 1 deletion ext/openssl/openssl.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -640,7 +640,7 @@ static void php_openssl_check_path_error(uint32_t arg_num, int type, const char
va_start(va, format);

if (type == E_ERROR) {
zend_argument_error_variadic(zend_ce_value_error, arg_num, format, va);
zend_argument_error_variadic(zend_ce_value_error, zend_active_function(), arg_num, format, va);
} else {
arg_name = get_active_function_arg_name(arg_num);
php_verror(NULL, arg_name, type, format, va);
Expand Down
Loading