-
Notifications
You must be signed in to change notification settings - Fork 559
Fix phpstan/phpstan#11619: Parameter #2 $callback of function uasort expects callable(Foo, Foo): int, 'strnatcasecmp' given. #5171
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
phpstan-bot
wants to merge
7
commits into
phpstan:2.1.x
Choose a base branch
from
phpstan-bot:create-pull-request/patch-mzyn37q
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.
Open
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
6938ec5
Fix callable parameter checking for Stringable objects in non-strict …
ondrejmirtes 2913a4c
Add strict_types test for bug-11619 Stringable callable check
phpstan-bot d6bd2af
Use non-strict type checking for built-in function callables
phpstan-bot e1817a5
Change FunctionCallableVariant::isBuiltin() to return TrinaryLogic
phpstan-bot 250133c
Move isBuiltin() method to CallableParametersAcceptor interface
phpstan-bot 82945c6
default to maybe
staabm cd097f9
more tests
staabm 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
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
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
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 Bug11619Error; | ||
|
|
||
| final class Foo implements \Stringable { | ||
|
|
||
| private function __construct(public readonly string $value) { | ||
| } | ||
|
|
||
| public static function fromString(string $string): self { | ||
| return new self($string); | ||
| } | ||
|
|
||
| /** | ||
| * {@inheritdoc} | ||
| */ | ||
| public function __toString(): string { | ||
| return $this->value; | ||
| } | ||
|
|
||
| } | ||
|
|
||
| $options = [ | ||
| Foo::fromString('c'), | ||
| Foo::fromString('b'), | ||
| Foo::fromString('a'), | ||
| Foo::fromString('ccc'), | ||
| Foo::fromString('bcc'), | ||
| ]; | ||
|
|
||
|
|
||
| uasort($options, fn($a, $b) => strnatcasecmp($a, $b)); | ||
|
|
||
| var_export($options); |
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,30 @@ | ||
| <?php declare(strict_types = 1); // lint >= 8.1 | ||
|
|
||
| namespace Bug11619Strict; | ||
|
|
||
| final class Foo implements \Stringable { | ||
|
|
||
| private function __construct(public readonly string $value) { | ||
| } | ||
|
|
||
| public static function fromString(string $string): self { | ||
| return new self($string); | ||
| } | ||
|
|
||
| public function __toString(): string { | ||
| return $this->value; | ||
| } | ||
|
|
||
| } | ||
|
|
||
| function test(): void | ||
| { | ||
| $options = [ | ||
| Foo::fromString('c'), | ||
| Foo::fromString('b'), | ||
| Foo::fromString('a'), | ||
| ]; | ||
|
|
||
| uasort($options, 'strnatcasecmp'); | ||
| usort($options, 'strnatcasecmp'); | ||
| } |
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 Bug11619Typed; | ||
|
|
||
| final class Foo implements \Stringable { | ||
|
|
||
| private function __construct(public readonly string $value) { | ||
| } | ||
|
|
||
| public static function fromString(string $string): self { | ||
| return new self($string); | ||
| } | ||
|
|
||
| /** | ||
| * {@inheritdoc} | ||
| */ | ||
| public function __toString(): string { | ||
| return $this->value; | ||
| } | ||
|
|
||
| } | ||
|
|
||
| $options = [ | ||
| Foo::fromString('c'), | ||
| Foo::fromString('b'), | ||
| Foo::fromString('a'), | ||
| Foo::fromString('ccc'), | ||
| Foo::fromString('bcc'), | ||
| ]; | ||
|
|
||
|
|
||
| uasort($options, fn(string $a, string $b) => strnatcasecmp($a, $b)); | ||
|
|
||
| var_export($options); |
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,30 @@ | ||
| <?php // lint >= 8.1 | ||
staabm marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| namespace Bug11619; | ||
|
|
||
| final class Foo implements \Stringable { | ||
|
|
||
| private function __construct(public readonly string $value) { | ||
| } | ||
|
|
||
| public static function fromString(string $string): self { | ||
| return new self($string); | ||
| } | ||
|
|
||
| public function __toString(): string { | ||
| return $this->value; | ||
| } | ||
|
|
||
| } | ||
|
|
||
| function test(): void | ||
| { | ||
| $options = [ | ||
| Foo::fromString('c'), | ||
| Foo::fromString('b'), | ||
| Foo::fromString('a'), | ||
| ]; | ||
|
|
||
| uasort($options, 'strnatcasecmp'); | ||
| usort($options, 'strnatcasecmp'); | ||
| } | ||
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.
implement this method on
CallableParametersAcceptorinsteadThere 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.
Done. The changes:
isBuiltin(): TrinaryLogicto theCallableParametersAcceptorinterfaceClosureType,CallableType,TrivialParametersAcceptor,InaccessibleMethod(all returnTrinaryLogic::createNo()),ExtendedCallableFunctionVariant,ResolvedFunctionVariantWithCallable(propagate via constructor parameter), andFunctionCallableVariant(existing implementation)GenericParametersAcceptorResolverandParametersAcceptorSelectorto propagateisBuiltinthroughCallableType::isSuperTypeOfInternal()to use$variant->isBuiltin()->yes()instead of$variant instanceof FunctionCallableVariant && $variant->isBuiltin()->yes()