Skip to content

Improve inference for truethy comparisons #5521

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
staabm wants to merge 3 commits into
base: 2.1.x
Choose a base branch
from
+69 −2
Open

Improve inference for truethy comparisons #5521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
98590b0
Improve inference for truethy comparisons
staabm Apr 23, 2026
647d630
Update non-empty-string-str-containing-fns.php
staabm Apr 23, 2026
4056899
Update non-empty-string-str-containing-fns.php
staabm Apr 23, 2026
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
14 changes: 14 additions & 0 deletions src/Analyser/TypeSpecifier.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1548,6 +1548,20 @@
)->setRootExpr($rootExpr));
}

if (
Copy link
Copy Markdown
Contributor

@VincentLanglet VincentLanglet Apr 23, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. Should the same be done with $context->false() && $constantType->toBoolean()->isFalse()->yes() ?

  2. Why only $exprNode instanceof FuncCall || $exprNode instanceof Expr\MethodCall || $exprNode instanceof Expr\StaticCall ? Shouldn't this be for every $exprNode ? Or at least NullsafeMethodCall (and so) too ?

I wonder if changing the two previous $constantType into $constantType->toBoolean doesnt give the same result...

$context->true()

Check warning on line 1552 in src/Analyser/TypeSpecifier.php

View workflow job for this annotation

GitHub Actions / Mutation Testing (8.3, ubuntu-latest) 

Escaped Mutant for Mutator "PHPStan\Infection\TrueTruthyFalseFalseyTypeSpecifierContextMutator":

@@ @@
 		}
 
 		if (
-			$context->true()
+			$context->truthy()
 			&& $constantType->toBoolean()->isTrue()->yes()
 			&& ($exprNode instanceof FuncCall || $exprNode instanceof Expr\MethodCall || $exprNode instanceof Expr\StaticCall)
 		) {

Check warning on line 1552 in src/Analyser/TypeSpecifier.php

View workflow job for this annotation

GitHub Actions / Mutation Testing (8.4, ubuntu-latest) 

Escaped Mutant for Mutator "PHPStan\Infection\TrueTruthyFalseFalseyTypeSpecifierContextMutator":

@@ @@
 		}
 
 		if (
-			$context->true()
+			$context->truthy()
 			&& $constantType->toBoolean()->isTrue()->yes()
 			&& ($exprNode instanceof FuncCall || $exprNode instanceof Expr\MethodCall || $exprNode instanceof Expr\StaticCall)
 		) {
&& $constantType->toBoolean()->isTrue()->yes()

Check warning on line 1553 in src/Analyser/TypeSpecifier.php

View workflow job for this annotation

GitHub Actions / Mutation Testing (8.3, ubuntu-latest) 

Escaped Mutant for Mutator "PHPStan\Infection\TrinaryLogicMutator":

@@ @@
 
 		if (
 			$context->true()
-			&& $constantType->toBoolean()->isTrue()->yes()
+			&& !$constantType->toBoolean()->isTrue()->no()
 			&& ($exprNode instanceof FuncCall || $exprNode instanceof Expr\MethodCall || $exprNode instanceof Expr\StaticCall)
 		) {
 			$types = $this->create($exprNode, $constantType, $context, $scope)->setRootExpr($rootExpr);

Check warning on line 1553 in src/Analyser/TypeSpecifier.php

View workflow job for this annotation

GitHub Actions / Mutation Testing (8.4, ubuntu-latest) 

Escaped Mutant for Mutator "PHPStan\Infection\TrinaryLogicMutator":

@@ @@
 
 		if (
 			$context->true()
-			&& $constantType->toBoolean()->isTrue()->yes()
+			&& !$constantType->toBoolean()->isTrue()->no()
 			&& ($exprNode instanceof FuncCall || $exprNode instanceof Expr\MethodCall || $exprNode instanceof Expr\StaticCall)
 		) {
 			$types = $this->create($exprNode, $constantType, $context, $scope)->setRootExpr($rootExpr);
&& ($exprNode instanceof FuncCall || $exprNode instanceof Expr\MethodCall || $exprNode instanceof Expr\StaticCall)
) {
$types = $this->create($exprNode, $constantType, $context, $scope)->setRootExpr($rootExpr);

return $types->unionWith($this->specifyTypesInCondition(
$scope,
$exprNode,
TypeSpecifierContext::createTrue(),
)->setRootExpr($rootExpr));
}

return null;
}

Expand Down
57 changes: 55 additions & 2 deletions tests/PHPStan/Analyser/nsrt/non-empty-string-str-containing-fns.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,19 +92,72 @@ public function variants(string $s) {

if (strpos($s, ':') !== false) {
assertType('non-falsy-string', $s);
} else {
assertType('string', $s);
}
assertType('string', $s);
if (strpos($s, ':') === false) {
assertType('string', $s);
} else {
assertType('non-falsy-string', $s);
}
assertType('string', $s);

if (strpos($s, ':') === 5) {
if (strpos($s, '0') == 0) { // 0|false
assertType('string', $s);
} else {
assertType('string', $s);
}
assertType('string', $s);

$oneOrZero = rand(0, 1);
if (strpos($s, '0') == $oneOrZero) { // 0|1|false
assertType('string', $s);
} else {
assertType('string', $s);
}
assertType('string', $s);

$oneOrZero = rand(0, 1);
if (strpos($s, '0') === $oneOrZero) {
assertType('string', $s); // could be non-empty-string
} else {
assertType('string', $s);
}
assertType('string', $s);

if (strpos($s, '0') == 1) {
assertType('string', $s); // could be non-empty-string
} else {
assertType('string', $s);
}
assertType('string', $s);

if (strpos($s, '0') === 0) {
assertType('string', $s); // could be non-empty-string
} else {
assertType('string', $s);
}
assertType('string', $s);

if (strpos($s, '0') === 5) {
assertType('non-empty-string', $s); // could be non-falsy-string
} else {
assertType('string', $s);
}
assertType('string', $s);

if (strpos($s, ':') === 5) {
assertType('non-falsy-string', $s);
} else {
assertType('string', $s);
}
assertType('string', $s);

if (strpos($s, ':') !== 5) {
assertType('string', $s);
} else {
assertType('non-falsy-string', $s);
}
assertType('string', $s);

Expand Down Expand Up @@ -152,7 +205,7 @@ public function variants(string $s) {
assertType('string', $s);

if (mb_strpos($s, ':') === 5) {
assertType('string', $s); // could be non-empty-string
assertType('non-falsy-string', $s);
}
assertType('string', $s);
if (mb_strpos($s, ':') !== 5) {
Expand Down
Loading