Implement conditional parameter types #1264
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
Apr 28, 2022
| } | ||
|
|
||
| $errors = $this->runAnalyse(__DIR__ . '/data/discussion-7124.php'); | ||
| $this->assertCount(4, $errors); |
There was a problem hiding this comment.
Please assert which errors are happening here.
| $this->assertSame('Parameter #2 $callback of function Discussion7124\filter expects callable(int): bool, Closure(bool): bool given', $errors[0]->getMessage()); | ||
| $this->assertSame(52, $errors[0]->getMessage()); | ||
| $this->assertSame('Parameter #2 $callback of function Discussion7124\filter expects callable(bool): bool, Closure(int): bool given', $errors[0]->getMessage()); | ||
| $this->assertSame(59, $errors[0]->getMessage()); |
There was a problem hiding this comment.
What? :) You're asserting the same thing to different values.
There was a problem hiding this comment.
I think I was day dreaming a bit when moving some code around 😅
rvanvelzen
force-pushed
the
conditional-parameter
branch
from
81b7b66
to
be17f0a
Compare
|
I've refactored "late resolvable types" a bit to make it more future-proof. Stuff like offset access types can reuse much of the logic. |
staabm
reviewed
Apr 29, 2022
build/composer-require-checker.json
Outdated
| @@ -19,6 +19,7 @@ | |||
| "Reflection", | |||
| "SPL", | |||
| "standard", | |||
| "pcntl", | |||
There was a problem hiding this comment.
Did you re-add this stuff intentionally or was it a bad merge/rebase?
There was a problem hiding this comment.
Definitely a bad merge
rvanvelzen
force-pushed
the
conditional-parameter
branch
from
1b7da5f
to
465867b
Compare
|
Nice cleanup, I really like it :) Thank you! |
ondrejmirtes
force-pushed
the
conditional-parameter
branch
from
8c62388
to
76a48db
Compare
ondrejmirtes
approved these changes
May 3, 2022
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.
Resolves phpstan/phpstan#7124. Parameter types could in fact already be conditional when using template types, this just implements the same logic as used for return types.
To improve error messages for conditional types in general they're resolved immediately now (when possible)