Allow generators to have a real return type of mixed
#5626
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
|
The travis build failure was caused by |
nikic
reviewed
May 25, 2020
Zend/zend_compile.c
Outdated
| @@ -1263,7 +1263,8 @@ static void zend_mark_function_as_generator() /* {{{ */ | |||
|
|
|||
| if (CG(active_op_array)->fn_flags & ZEND_ACC_HAS_RETURN_TYPE) { | |||
| zend_type return_type = CG(active_op_array)->arg_info[-1].type; | |||
| zend_bool valid_type = (ZEND_TYPE_FULL_MASK(return_type) & MAY_BE_ITERABLE) != 0; | |||
| zend_bool valid_type = (ZEND_TYPE_FULL_MASK(return_type) & MAY_BE_ITERABLE) != 0 || | |||
| ZEND_TYPE_FULL_MASK(return_type) == MAY_BE_ANY; | |||
There was a problem hiding this comment.
This should actually check for & (MAY_BE_ITERATABLE|MAY_BE_OBJECT) != 0. : object is also a fine type.
There was a problem hiding this comment.
At which point we should really adjust the error message to be generic and not list every single possible type. Something along the lines of...
Cannot use %s as generator return type, because it is not a supertype of Generator
Generator return type must be a supertype of Generator, %s given
Fixes an edge case overlooked in php#5313 Generators are objects, so `object` should have also been allowed in addition to `iterable` and `Traversable`
TysonAndre
force-pushed
the
mixed-generator
branch
from
6a80137 to
e0ee8b2
Compare
|
Thank you, @TysonAndre! |
nikic
approved these changes
May 26, 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.
Fixes an edge case overlooked in
#5313