Improve sprintf support #3310
Merged
Improve sprintf support #3310
+86
−15
Conversation
This file contains 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
|
You've opened the pull request against the latest branch 1.12.x. If your code is relevant on 1.11.x and you want it to be released sooner, please rebase your pull request and change its target to 1.11.x. |
VincentLanglet
commented
Aug 9, 2024
| @@ -125,32 +125,45 @@ public function getTypeFromFunctionCall( | |||
| return $singlePlaceholderEarlyReturn; | |||
| } | |||
|
|
|||
| if ($allPatternsNonFalsy) { | |||
There was a problem hiding this comment.
Early return to avoid the following computation.
| $isNonEmpty = $allPatternsNonEmpty; | ||
| if ( | ||
| count($formatStrings) === 0 | ||
| !$isNonEmpty |
There was a problem hiding this comment.
If it's already known as non empty, we don't have to compute this.
| && $functionReflection->getName() === 'sprintf' | ||
| && count($args) === 2 | ||
| && count($args) >= 2 |
There was a problem hiding this comment.
There was a special case for sprintf($nonEmpty, $nonEmpty, $nonEmpty) but this can be extended to sprintf($nonEmpty, $nonEmpty, $nonEmpty) and so on.
| continue; | ||
| } | ||
|
|
||
| if (!$scope->getType($arg->value)->toString()->isNonEmptyString()->yes()) { |
There was a problem hiding this comment.
The toString was added for things like IntegerRange which need to be casted before the isNonEmptyString check.
|
Thank you! |
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#11491