Use ZEND_TOSTRING_FUNC_NAME #5736
Closed
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
carusogabriel
suggested changes
Jun 18, 2020
@carusogabriel Nice catch! |
carusogabriel
approved these changes
Jun 18, 2020
I wasn't using it before, I just pushed a new commit addressing your review. Thanks! |
nikic
reviewed
Jun 18, 2020
Zend/zend_compile.c
Outdated
| @@ -6465,7 +6465,7 @@ void zend_compile_func_decl(znode *result, zend_ast *ast, zend_bool toplevel) /* | |||
| } | |||
|
|
|||
| zend_compile_params(params_ast, return_type_ast, | |||
| is_method && zend_string_equals_literal_ci(decl->name, "__toString") ? IS_STRING : 0); | |||
| is_method && zend_string_equals_literal_ci(method_lcname, ZEND_TOSTRING_FUNC_NAME) ? IS_STRING : 0); | |||
There was a problem hiding this comment.
Suggested change
| is_method && zend_string_equals_literal_ci(method_lcname, ZEND_TOSTRING_FUNC_NAME) ? IS_STRING : 0); | |
| is_method && zend_string_equals_literal(method_lcname, ZEND_TOSTRING_FUNC_NAME) ? IS_STRING : 0); |
There was a problem hiding this comment.
Thanks, updated the PR. I'm not sure though what's the difference, I suppose the _ci version is case insensitive?
nikic
approved these changes
Jun 18, 2020
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.
Replaces
"__toString"with a specialized constantZEND_TOSTRING_FUNC_NAME.