Improve ReplaceFunctionsDynamicReturnTypeExtension #4023
+138
−64
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
str_replace
branch
from
d93ccc7 to
ae6ebcd
Compare
VincentLanglet
commented
May 25, 2025
Comment on lines
111
to
114
| $stringArgumentType = TypeCombinator::intersect(new StringType(), $subjectArgumentType); | ||
| if (!$stringArgumentType instanceof NeverType) { | ||
| $result[] = $this->getReplaceType($stringArgumentType, $replaceArgumentType); | ||
|
|
||
| if ($subjectArgumentType->isUppercaseString()->yes() && $replaceArgumentType->isUppercaseString()->yes()) { | ||
| $accessories[] = new AccessoryUppercaseStringType(); | ||
| } | ||
| $subjectArgumentType = $subjectArgumentType->tryRemove($stringArgumentType); | ||
| } | ||
|
|
||
| if (count($accessories) > 0) { | ||
| $accessories[] = new StringType(); | ||
| return new IntersectionType($accessories); | ||
| if ($subjectArgumentType->isArray()->yes()) { |
There was a problem hiding this comment.
When we get string|array<string>
I didn't find a better way:
- First, to work with the
stringpart first (in order to know if it's non-empty, lowercase, etc) - Secondly to work only with the
arraypart (in order to know the shape, if it's a list, non empty, the values, etc)
To access the string part, the best I found was
$stringArgumentType = TypeCombinator::intersect(new StringType(), $subjectArgumentType);
Same idea for array because
- $subjectArgumentType->getArrays() does not return array on union
- TypeUtiles::toBenevolent($subjectArgumentType)->getArrays() is returning arrays but is loosing the non-empty and the list accessory.
VincentLanglet
force-pushed
the
str_replace
branch
2 times, most recently
from
b762936 to
f438281
Compare
VincentLanglet
force-pushed
the
str_replace
branch
from
f438281 to
716aefa
Compare
|
This pull request has been marked as ready for review. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Closes phpstan/phpstan#9870