Skip to content

Add more numeric-string inferences after string concat #4447

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

Open
wants to merge 4 commits into
base: 2.1.x
Choose a base branch
from
Open

Add more numeric-string inferences after string concat #4447

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
23a3a4a
Improve concat result
VincentLanglet Oct 16, 2025
22f5850
Rename
VincentLanglet Oct 17, 2025
6657e32
Fix and add more cases
VincentLanglet Oct 17, 2025
8644045
Rework
VincentLanglet Oct 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/Reflection/InitializerExprTypeResolver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@
use function max;
use function min;
use function sprintf;
use function str_starts_with;
use function strtolower;
use const INF;

Expand Down Expand Up @@ -506,6 +507,10 @@ public function resolveConcatType(Type $left, Type $right): Type

$leftNumericStringNonEmpty = TypeCombinator::remove($leftStringType, new ConstantStringType(''));
if ($leftNumericStringNonEmpty->isNumericString()->yes()) {
$validationCallback = $left->isInteger()->yes()
? static fn (string $value): bool => !str_starts_with($value, '-')
: static fn (string $value): bool => Strings::match($value, '#^\d+$#') !== null;

$allRightConstantsZeroOrMore = false;
foreach ($rightConstantStrings as $rightConstantString) {
if ($rightConstantString->getValue() === '') {
Expand All @@ -514,7 +519,7 @@ public function resolveConcatType(Type $left, Type $right): Type

if (
!is_numeric($rightConstantString->getValue())
|| Strings::match($rightConstantString->getValue(), '#^[0-9]+$#') === null
|| !$validationCallback($rightConstantString->getValue())
) {
$allRightConstantsZeroOrMore = false;
break;
Expand Down
17 changes: 14 additions & 3 deletions tests/PHPStan/Analyser/nsrt/bug-11129.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,20 @@ public function foo(
assertType('lowercase-string&non-falsy-string', $i.$maybeNonNumericConstStrings);
assertType('lowercase-string&non-falsy-string', $maybeNonNumericConstStrings.$i);

assertType('lowercase-string&non-falsy-string&uppercase-string', $i.$maybeFloatConstStrings); // could be 'lowercase-string&non-falsy-string&numeric-string'
assertType('lowercase-string&non-falsy-string&numeric-string&uppercase-string', $i.$maybeFloatConstStrings);
assertType('lowercase-string&non-falsy-string&uppercase-string', $maybeFloatConstStrings.$i);

assertType('lowercase-string&non-falsy-string&numeric-string&uppercase-string', $i.'1');
assertType('lowercase-string&non-falsy-string&numeric-string&uppercase-string', $i.'1.0');
assertType('lowercase-string&non-falsy-string&uppercase-string', $i.'1.1.1');
assertType('lowercase-string&non-falsy-string&uppercase-string', $i.'-1');
assertType('lowercase-string&non-falsy-string&uppercase-string', $i.'-1.0');
assertType('lowercase-string&non-falsy-string&numeric-string', $i.'10e-3');
assertType('lowercase-string&non-falsy-string', $i.'-10e-3');
assertType('non-falsy-string&numeric-string&uppercase-string', $i.'10E3');
assertType('non-falsy-string&uppercase-string', $i.'-10E3');
assertType('non-falsy-string', $i.'10eE3');

assertType('lowercase-string&non-empty-string&numeric-string&uppercase-string', $i.$bool);
assertType('lowercase-string&non-empty-string&uppercase-string', $bool.$i);
assertType('lowercase-string&non-falsy-string&numeric-string&uppercase-string', $positiveInt.$bool);
Expand All @@ -68,14 +79,14 @@ public function foo(
assertType('non-falsy-string&numeric-string&uppercase-string', $float.$positiveInt);
assertType('non-falsy-string&uppercase-string', $float.$negativeInt);
assertType('non-falsy-string&uppercase-string', $float.$i);
assertType('non-falsy-string&uppercase-string', $i.$float); // could be 'non-falsy-string&numeric-string&uppercase-string'
assertType('non-falsy-string&uppercase-string', $i.$float);
assertType('non-falsy-string', $numericString.$float);
assertType('non-falsy-string', $numericString.$maybeFloatConstStrings);

// https://3v4l.org/Ia4r0
$scientificFloatAsString = '3e4';
assertType('non-falsy-string', $numericString.$scientificFloatAsString);
assertType('lowercase-string&non-falsy-string', $i.$scientificFloatAsString);
assertType('lowercase-string&non-falsy-string&numeric-string', $i.$scientificFloatAsString);
assertType('non-falsy-string', $scientificFloatAsString.$numericString);
assertType('lowercase-string&non-falsy-string', $scientificFloatAsString.$i);
}
Expand Down
Loading