-
Notifications
You must be signed in to change notification settings - Fork 7.9k
Refactor SplFixedArray #7168
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.
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
Merged
Refactor SplFixedArray #7168
Conversation
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
nikic
reviewed
Jun 18, 2021
It is only used there, which explains its weird offset semantics
- Implement warning for resource type - Relax restictions on a string offset to better match the normal conversion to int semantics as the offset is always an integer (similar to string offsets) - NULL is still not support as an offset - Throw a proper TypeError instead of a RuntimeException
df278a5
to
cedc415
Compare
nikic
approved these changes
Jun 18, 2021
TysonAndre
reviewed
Jun 20, 2021
return Z_RES_HANDLE_P(offset); | ||
} | ||
|
||
zend_type_error("Illegal offset type"); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Would including the offset type make sense here - it may make this error easier to debug
zend_type_error("Illegal offset type %s", zend_zval_type_name(offset);
It's used in a few places
php-src/ext/session/session.c
2515: zend_type_error("%s(): Option \"%s\" must be of type string|int|bool, %s given",
2516- get_active_function_name(), ZSTR_VAL(str_idx), zend_zval_type_name(value)
2517- );
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.
This bundles a couple of things but it fixes the weird offset semantics/exceptions emitted depending on context and makes the audit for #6106 a tad easier.