-
Notifications
You must be signed in to change notification settings - Fork 574
Fix callable array intersection type offset narrowing #5548
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
Merged
VincentLanglet
merged 5 commits into
phpstan:2.1.x
from
phpstan-bot:create-pull-request/patch-ty6mco0
Apr 28, 2026
+93
−1
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
36b0f46
Fix phpstan/phpstan#3842: Narrow offset types for callable array inte…
VincentLanglet 66d0a68
Use UnionType->isSuperTypeOf for callable array offset checks
phpstan-bot 89aac24
Use UnionType directly instead of TypeCombinator::union for ClassStri…
phpstan-bot 0942e8d
Simplify callable array offset type narrowing with if/elseif/else
phpstan-bot 35a6959
Merge bug-3842 test data into single shared nsrt file
phpstan-bot 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| <?php declare(strict_types = 1); | ||
|
|
||
| namespace Bug3842; | ||
|
|
||
| use function PHPStan\Testing\assertType; | ||
|
|
||
| class ClassA | ||
| { | ||
| public static function callback(): void | ||
| { | ||
| } | ||
| } | ||
|
|
||
| class ClassB | ||
| { | ||
| public function callback(): void | ||
| { | ||
| } | ||
| } | ||
|
|
||
| function testIsArrayOnCallable(callable $value): void { | ||
| if (is_array($value)) { | ||
| assertType('array<mixed, mixed>&callable(): mixed', $value); | ||
| assertType('class-string|object', $value[0]); | ||
| assertType('string', $value[1]); | ||
| } | ||
| } | ||
|
|
||
| /** @param callable-array $value */ | ||
| function testCallableArrayPhpDoc(array $value): void { | ||
| assertType('array&callable(): mixed', $value); | ||
| assertType('class-string|object', $value[0]); | ||
| assertType('string', $value[1]); | ||
| } | ||
|
|
||
| function testIsStringOnCallable(callable $value): void { | ||
| if (is_string($value)) { | ||
| assertType('callable-string', $value); | ||
| } | ||
| } | ||
|
|
||
| /** @param array{string|object, string} $values */ | ||
| function check(array $values): void { | ||
| } | ||
|
|
||
| /** @param array{class-string|object, string} $values */ | ||
| function checkClassString(array $values): void { | ||
| } | ||
|
|
||
| /** @param 0|1 $offset */ | ||
| function testCallableArrayUnionOffset(callable $value, int $offset): void { | ||
| if (is_array($value)) { | ||
| assertType('object|string', $value[$offset]); | ||
| } | ||
| } | ||
|
|
||
| function testPassCallableArray(callable $value): void { | ||
| if (is_array($value)) { | ||
| check($value); | ||
| checkClassString($value); | ||
| } | ||
| } |
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
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.