Improve return type of array map #4068
Merged
Conversation
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
VincentLanglet
force-pushed
the
arrayMapReturnType
branch
from
2e49201 to
1e133b3
Compare
|
This pull request has been marked as ready for review. |
ondrejmirtes
requested changes
Jul 10, 2025
src/Analyser/MutatingScope.php
Outdated
| $node->name instanceof FuncCall | ||
| && $node->name->isFirstClassCallable() | ||
| && $node->name->getAttribute('phpstan_cache_printer') !== null | ||
| && preg_match('/\A(?<name>\\\\?[^()]+)\(...\)\z/', $node->name->getAttribute('phpstan_cache_printer'), $m) === 1 |
There was a problem hiding this comment.
Why the original code with:
return ParametersAcceptorSelector::selectFromArgs(
$this,
$node->getArgs(),
$calledOnType->getCallableParametersAcceptors($this),
null,
)->getReturnType();does not work here? That should be addressed instead.
There was a problem hiding this comment.
I took the code from the previous PR but it might be improved indeed so I re-tried.
I tried to simplify/rewrite the code in order to show what was missing in the original code.
Now it should be more clear with https://github.com/phpstan/phpstan-src/pull/4068/files
There is nothing wrong with
ParametersAcceptorSelector::selectFromArgs(
$this,
$node->getArgs(),
$calledOnType->getCallableParametersAcceptors($this),
null,
)
but the issue was the early getReturnType and the fact the DynamicReturnTypeExtension was not used in this case.
Is it better ?
VincentLanglet
force-pushed
the
arrayMapReturnType
branch
2 times, most recently
from
fbbcdeb to
218705b
Compare
VincentLanglet
force-pushed
the
arrayMapReturnType
branch
from
218705b to
1721508
Compare
VincentLanglet
force-pushed
the
arrayMapReturnType
branch
from
1721508 to
0852680
Compare
|
Nice, thank you! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
From #3156
Closes phpstan/phpstan#11180
Closes #3156