Fix inferring template types in ClosureType #921
Merged
Conversation
This file contains 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
ondrejmirtes
requested changes
Jan 13, 2022
| @@ -334,7 +334,7 @@ public function inferTemplateTypes(Type $receivedType): TemplateTypeMap | |||
| return $receivedType->inferTemplateTypesOn($this); | |||
| } | |||
|
|
|||
| if ($receivedType->isCallable()->no()) { | |||
| if ($receivedType->isCallable()->no() || ! $receivedType instanceof self) { | |||
There was a problem hiding this comment.
Hi, what about the same change and test in CallableType.php? :)
There was a problem hiding this comment.
But I thought that can be a valid use case? new Foo which is ObjectType, can be callable, and we should try to infer template types. I did this for ClosureType because nothing else can be Closure other than Closure 馃槃
Or did I understand this wrong?
There was a problem hiding this comment.
I want you to write a test and implementation for this case :)
/**
*
* @template TGetDefault
* @template TKey
*
* @param TKey $key
* @param TGetDefault|(callable(): TGetDefault) $default
* @return TKey|TGetDefault
*/There was a problem hiding this comment.
I added the test cases. But the same change did not work well in CallableType. Handled a bit differently and it works now.
Also added a test case with an invokable class, seems to work as expected 馃憤馃徑
canvural
force-pushed
the
fix-closure-type-infer-template-type
branch
from
f27f0a3
to
b981544
Compare
|
Thank you! |
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 PR fixes an issue that can be seen here and here.
Since there are separate types as
ClosureTypeandCallableTypeI think it makes sense forClosureTypeto only infer template types from it's own kind. Cause nothing else can really be a closure. Whencallableis used instead ofClosurein the playground examples, it'll still be inferred asmixed.I hope this fix makes sense. If you prefer any other way that fixes the issues (both in tests and in playground links) I can adjust to that 馃憤馃徑