Add zend_argument_type_error_ex, zend_argument_error_ex#21829
Open
arnaud-lb wants to merge 2 commits intophp:masterfrom
Open
Add zend_argument_type_error_ex, zend_argument_error_ex#21829arnaud-lb wants to merge 2 commits intophp:masterfrom
arnaud-lb wants to merge 2 commits intophp:masterfrom
Conversation
Girgias
approved these changes
Apr 22, 2026
Member
Girgias
left a comment
Girgias
left a comment
There was a problem hiding this comment.
I think this makes a lot of sense :)
TimWolla
approved these changes
Apr 22, 2026
Member
TimWolla
left a comment
TimWolla
left a comment
There was a problem hiding this comment.
Either way LGTM, consider adding the new functions to UPGRADING.INTERNALS with a short note.
These variants take the function as parameter instead of infering it from the call stack. This is useful in ZEND_TYPE_ASSERT, and will be used in PFA impl.
TimWolla
reviewed
May 6, 2026
Comment on lines
+400
to
+401
| 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, ...) |
Member
There was a problem hiding this comment.
I'm only noticing now that error_ce and arg_num are flipped compared to the existing zend_argument_error(). That should be adjusted.
Suggested change
| 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_error_ex(const zend_function *function, | |
| zend_class_entry *error_ce, uint32_t arg_num, const char *format, ...) |
Member
Author
There was a problem hiding this comment.
Could you explain why? Is it to match the order of the non-_ex function?
function and arg_num are related, so grouping them would make sense.
Looking at other format-and-throw functions, extra args tend to be grouped in between ce and format:
zend_object *zend_throw_exception(zend_class_entry *exception_ce, const char *message, zend_long code);
zend_object *zend_throw_exception_ex(zend_class_entry *exception_ce, zend_long code, const char *format, ...);void ZEND_FASTCALL zend_argument_error_variadic(zend_class_entry *error_ce, uint32_t arg_num, const char *format, va_list va);
void zend_argument_error(zend_class_entry *error_ce, uint32_t arg_num, const char *format, ...);What do you think of this?
Suggested change
| 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_error_ex(zend_class_entry *error_ce, | |
| const zend_function *function, uint32_t arg_num, const char *format, ...) |
Member
There was a problem hiding this comment.
Is it to match the order of the non-
_exfunction?
Yes, my motivation was making this consistent with the existing non-_ex zend_argument_error(). Changing the argument order of that one would would be too impactful, I feel. That's why I suggested adjusting the new functions for consistency with their direct sibling, rather than zend_throw_exception.
|
|
||
| if (type == E_ERROR) { | ||
| zend_argument_error_variadic(zend_ce_value_error, arg_num, format, va); | ||
| zend_argument_error_variadic(zend_active_function(), arg_num, zend_ce_value_error, format, va); |
Member
There was a problem hiding this comment.
Suggested change
| zend_argument_error_variadic(zend_active_function(), arg_num, zend_ce_value_error, format, va); | |
| zend_argument_error_variadic(zend_active_function(), zend_ce_value_error, arg_num, format, va); |
Comment on lines
+377
to
+379
| ZEND_API ZEND_COLD void ZEND_FASTCALL zend_argument_error_variadic( | ||
| const zend_function *function, uint32_t arg_num, | ||
| zend_class_entry *error_ce, const char *format, va_list va) |
Member
There was a problem hiding this comment.
Suggested change
| ZEND_API ZEND_COLD void ZEND_FASTCALL zend_argument_error_variadic( | |
| 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_FASTCALL zend_argument_error_variadic( | |
| const zend_function *function, zend_class_entry *error_ce, | |
| uint32_t arg_num, const char *format, va_list va) |
| va_list va; | ||
|
|
||
| va_start(va, format); | ||
| zend_argument_error_variadic(function, arg_num, error_ce, format, va); |
Member
There was a problem hiding this comment.
Suggested change
| zend_argument_error_variadic(function, arg_num, error_ce, format, va); | |
| zend_argument_error_variadic(function, error_ce, arg_num, format, va); |
|
|
||
| va_start(va, format); | ||
| zend_argument_error_variadic(error_ce, arg_num, format, va); | ||
| zend_argument_error_variadic(function, arg_num, error_ce, format, va); |
Member
There was a problem hiding this comment.
Suggested change
| zend_argument_error_variadic(function, arg_num, error_ce, format, va); | |
| zend_argument_error_variadic(function, error_ce, arg_num, format, va); |
| va_list va; | ||
|
|
||
| va_start(va, format); | ||
| zend_argument_error_variadic(function, arg_num, zend_ce_type_error, format, va); |
Member
There was a problem hiding this comment.
Suggested change
| zend_argument_error_variadic(function, arg_num, zend_ce_type_error, format, va); | |
| zend_argument_error_variadic(function, zend_ce_type_error, arg_num, format, va); |
|
|
||
| va_start(va, format); | ||
| zend_argument_error_variadic(zend_ce_type_error, arg_num, format, va); | ||
| zend_argument_error_variadic(function, arg_num, zend_ce_type_error, format, va); |
Member
There was a problem hiding this comment.
Suggested change
| zend_argument_error_variadic(function, arg_num, zend_ce_type_error, format, va); | |
| zend_argument_error_variadic(function, zend_ce_type_error, arg_num, format, va); |
|
|
||
| va_start(va, format); | ||
| zend_argument_error_variadic(zend_ce_value_error, arg_num, format, va); | ||
| zend_argument_error_variadic(function, arg_num, zend_ce_value_error, format, va); |
Member
There was a problem hiding this comment.
Suggested change
| zend_argument_error_variadic(function, arg_num, zend_ce_value_error, format, va); | |
| zend_argument_error_variadic(function, zend_ce_value_error, arg_num, format, va); |
Comment on lines
+1567
to
+1576
| ZEND_API ZEND_COLD void ZEND_FASTCALL zend_argument_error_variadic( | ||
| 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, ...); |
Member
There was a problem hiding this comment.
Suggested change
| ZEND_API ZEND_COLD void ZEND_FASTCALL zend_argument_error_variadic( | |
| 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_FASTCALL zend_argument_error_variadic( | |
| const zend_function *function, zend_class_entry *error_ce, | |
| 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(const zend_function *function, | |
| zend_class_entry *error_ce, 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, ...); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
These variants take the function as parameter instead of inferring it from the call stack. This is useful in ZEND_TYPE_ASSERT, and will be used in PFA impl.
UPGRADING.INTERNALS: