-
Notifications
You must be signed in to change notification settings - Fork 547
Fix subtype check for identical late-resolvable conditional types (bug #10942) #4579
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
Open
yt-catpaw
wants to merge
3
commits into
phpstan:2.1.x
Choose a base branch
from
yt-catpaw:fix-contravariant-param-10942
base: 2.1.x
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+137
−0
Open
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
d574aa7
Short-circuit identical late-resolvable conditionals in subtype checks
yt-catpaw 0ba6805
Short-circuit identical late-resolvable types in isSuperTypeOf and ad…
yt-catpaw 28bd4ec
Add data-provider tests for late-resolvable isSuperTypeOf/isSubTypeOf
yt-catpaw File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Short-circuit identical late-resolvable types in isSuperTypeOf and ad…
…d coverage
- Loading branch information
commit 0ba680581efd69de144e250733366d5ddb95920c
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| <?php declare(strict_types = 1); | ||
|
|
||
| namespace PHPStan\Type; | ||
|
|
||
| use PHPStan\Type\Constant\ConstantStringType; | ||
| use PHPStan\Type\IntegerType; | ||
| use PHPStan\Type\NeverType; | ||
| use PHPStan\Type\UnionType; | ||
| use PHPUnit\Framework\TestCase; | ||
|
|
||
| class LateResolvableTypeTraitTest extends TestCase | ||
| { | ||
|
|
||
| public function testIsSuperTypeOfForConditional(): void | ||
| { | ||
| $conditional = new ConditionalTypeForParameter( | ||
| '$operator', | ||
| new ConstantStringType('in'), | ||
| new IntegerType(), | ||
| new NeverType(), | ||
| false, | ||
| ); | ||
|
|
||
| $this->assertSame('Yes', $conditional->isSuperTypeOf($conditional)->describe()); | ||
|
|
||
| $unionWithConditional = new UnionType([ | ||
| new StringType(), | ||
| $conditional, | ||
| ]); | ||
|
|
||
| $this->assertSame('Yes', $conditional->isSuperTypeOf($unionWithConditional)->describe()); | ||
| } | ||
|
|
||
| } | ||
Oops, something went wrong.
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.
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.
Please make a test with a data provider as it looks like in the test I linked. Then I'l try to come up with some data points that break your logic 😊
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.
Also write tests for both isSuperTypeOf and isSubtypeOf. Thanks!
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.
28bd4ec
Added data-provider tests for isSuperTypeOf/isSubTypeOf (in tests/PHPStan/Type/LateResolvableTypeTraitTest.php).