Repository navigation
tree: use ZSTR_VAL()/ZSTR_LEN() instead of direct zend_string member access - #25375
Merged
Merged
Conversation
adapik
requested review from
TimWolla,
bukka,
dstogov and
zeriyoshi
as code owners
November 10, 2026 18:44
TimWolla
approved these changes
Nov 10, 2026
Girgias
reviewed
Nov 11, 2026
| if (!type_matches) { | ||
| zend_string *ty = zend_type_to_string(arginfo_zend_test_internal_dnf_arguments[1].type); | ||
| zend_argument_type_error(1, "must be of type %s, %s given", ty->val, obj->ce->name->val); | ||
| zend_argument_type_error(1, "must be of type %s, %s given", ZSTR_VAL(ty), ZSTR_VAL(obj->ce->name)); |
Member
There was a problem hiding this comment.
Suggested change
| zend_argument_type_error(1, "must be of type %s, %s given", ZSTR_VAL(ty), ZSTR_VAL(obj->ce->name)); | |
| zend_argument_type_error(1, "must be of type %pS, %pS given", ty, obj->ce->name); |
| if (!type_matches) { | ||
| zend_string *ty = zend_type_to_string(execute_data->func->internal_function.arg_info->type); | ||
| zend_argument_type_error(1, "must be of type %s, %s given", ty->val, obj->ce->name->val); | ||
| zend_argument_type_error(1, "must be of type %s, %s given", ZSTR_VAL(ty), ZSTR_VAL(obj->ce->name)); |
Member
There was a problem hiding this comment.
Suggested change
| zend_argument_type_error(1, "must be of type %s, %s given", ZSTR_VAL(ty), ZSTR_VAL(obj->ce->name)); | |
| zend_argument_type_error(1, "must be of type %pS, %pS given", ty, obj->ce->name); |
| time(&curtime); | ||
| date_str = php_format_date("d-M-Y H:i:s e", 13, curtime, 1); | ||
| len = spprintf(&tmp, 0, "[%s] %s%s", date_str->val, logline, PHP_EOL); | ||
| len = spprintf(&tmp, 0, "[%s] %s%s", ZSTR_VAL(date_str), logline, PHP_EOL); |
Member
There was a problem hiding this comment.
Suggested change
| len = spprintf(&tmp, 0, "[%s] %s%s", ZSTR_VAL(date_str), logline, PHP_EOL); | |
| len = spprintf(&tmp, 0, "[%pS] %s%s", date_str, logline, PHP_EOL); |
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
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.
Replace direct ->val / ->len accesses on zend_string with the ZSTR_VAL() / ZSTR_LEN() macros in the few places that still bypass them.
No functional change. I built master and the resulting binary are byte-for-byte identical.
Each file is a separate commit so they can be dropped or reviewed individually.
Similar to #24330 and 35e96f6. Going through the macros means these places don't break if the layout of
zend_stringchanges, and most of the tree already does it.