Skip to content

Improved sprintf() inference #3232

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.

Sign up for GitHub

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
merged 7 commits into from
Jul 14, 2024
Merged

Improved sprintf() inference #3232

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9b5a686
Improved sprintf() inference
staabm Jul 13, 2024
8b93038
fix
staabm Jul 13, 2024
fd5b5c9
Update SprintfFunctionDynamicReturnTypeExtension.php
staabm Jul 13, 2024
b3cfcb3
infer constant types first
staabm Jul 13, 2024
33c415d
simplify
staabm Jul 13, 2024
93ce92a
more int range tests
staabm Jul 13, 2024
83b20de
better int range support
staabm Jul 13, 2024
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
Prev Previous commit
Next Next commit
more int range tests
  • Loading branch information
@staabm
staabm committed Jul 13, 2024
commit 93ce92a50e35d6c5cf45a705753f14464b43523a
6 changes: 5 additions & 1 deletion tests/PHPStan/Analyser/nsrt/bug-7387.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,16 @@ public function specifiers(int $i) {
/**
* @param positive-int $posInt
* @param negative-int $negInt
* @param int<1, 5> $nonZeroIntRange
* @param int<-1, 5> $intRange
*/
public function positionalArgs($mixed, int $i, float $f, string $s, int $posInt, int $negInt) {
public function positionalArgs($mixed, int $i, float $f, string $s, int $posInt, int $negInt, int $nonZeroIntRange, int $intRange) {
// https://3v4l.org/vVL0c
assertType('numeric-string', sprintf('%2$14s', $mixed, $i));
assertType('non-falsy-string&numeric-string', sprintf('%2$14s', $mixed, $posInt));
assertType('non-falsy-string&numeric-string', sprintf('%2$14s', $mixed, $negInt));
assertType('non-falsy-string', sprintf('%2$14s', $mixed, $intRange)); // could be numeric-string
assertType('non-falsy-string', sprintf('%2$14s', $mixed, $nonZeroIntRange)); // could be non-falsy-string&numeric-string

assertType('numeric-string', sprintf('%2$.14F', $mixed, $i));
assertType('numeric-string', sprintf('%2$.14F', $mixed, $f));
Expand Down