-
Notifications
You must be signed in to change notification settings - Fork 563
Fix #14108: @phpstan-assert isn't working with Union - part 2
#4916
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
Closed
Closed
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
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
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
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,22 @@ | ||
| <?php declare(strict_types = 1); | ||
|
|
||
| namespace Bug14107; | ||
|
|
||
| use function PHPStan\Testing\assertType; | ||
|
|
||
| class HelloWorld | ||
| { | ||
| /** @param array{0: '1.2'|'a'} $arr */ | ||
| public function constantArrayCountValues(array $arr): void | ||
| { | ||
| // '1.2' is a numeric string but not an integer string, so it should stay as string key | ||
| assertType("non-empty-array<'1.2'|'a', int<1, max>>", array_count_values($arr)); | ||
| } | ||
|
|
||
| /** @param array{0: '1'|'a'} $arr */ | ||
| public function intStringArrayCountValues(array $arr): void | ||
| { | ||
| // '1' is an integer string, so it gets cast to int key | ||
| assertType("non-empty-array<1|'a', int<1, max>>", array_count_values($arr)); | ||
| } | ||
| } |
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,52 @@ | ||
| <?php // lint >= 8.0 | ||
|
|
||
| namespace Bug14108; | ||
|
|
||
| use function PHPStan\Testing\assertType; | ||
|
|
||
| class Foo | ||
| { | ||
| public function __construct(private ?string $param) | ||
| { | ||
| } | ||
|
|
||
| public function getParam(): ?string | ||
| { | ||
| return $this->param; | ||
| } | ||
|
|
||
| /** | ||
| * @phpstan-assert string $this->getParam() | ||
| */ | ||
| public function narrowGetParam(): void | ||
| { | ||
| } | ||
| } | ||
|
|
||
| class Bar | ||
| { | ||
| public function __construct(private ?int $param) | ||
| { | ||
| } | ||
|
|
||
| public function getParam(): ?int | ||
| { | ||
| return $this->param; | ||
| } | ||
|
|
||
| /** | ||
| * @phpstan-assert int $this->getParam() | ||
| */ | ||
| public function narrowGetParam(): void | ||
| { | ||
| } | ||
| } | ||
|
|
||
| function test(Foo|Bar $fooOrBar): void | ||
| { | ||
| assertType('int|string|null', $fooOrBar->getParam()); | ||
|
|
||
| $fooOrBar->narrowGetParam(); | ||
|
|
||
| assertType('int|string', $fooOrBar->getParam()); | ||
| } |
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.
Uh oh!
There was an error while loading. Please reload this page.
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.
I feel what is implented here is actual the
intersectWithand theintersectWithwe had before this PR is more aunionWith.. (so names are inverted - not sure we can fix this because of BC though)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.
I have the same impression.
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.
can we fix it? or should we stay with it as is because BC?