Skip to content

Fix false positive when type casting in IF statement #3431

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 2 commits into from
Sep 11, 2024
+92 −14
Merged

Fix false positive when type casting in IF statement #3431

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6330818
Tests
ondrejmirtes Sep 11, 2024
a89399d
Systematic fix taking advantage of `==` / `!=` narrowing
ondrejmirtes Sep 11, 2024
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
30 changes: 23 additions & 7 deletions src/Analyser/TypeSpecifier.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,15 +197,31 @@ public function specifyTypesInCondition(
$context,
$rootExpr,
);
} elseif (
$expr instanceof Expr\Cast\String_
|| $expr instanceof Expr\Cast\Double
|| $expr instanceof Expr\Cast\Int_
|| $expr instanceof Expr\Cast\Bool_
) {
} elseif ($expr instanceof Expr\Cast\Bool_) {
return $this->specifyTypesInCondition(
$scope,
new Node\Expr\BinaryOp\Equal($expr->expr, new ConstFetch(new Name\FullyQualified('true'))),
$context,
$rootExpr,
);
} elseif ($expr instanceof Expr\Cast\String_) {
return $this->specifyTypesInCondition(
$scope,
new Node\Expr\BinaryOp\NotEqual($expr->expr, new Node\Scalar\String_('')),
$context,
$rootExpr,
);
} elseif ($expr instanceof Expr\Cast\Int_) {
return $this->specifyTypesInCondition(
$scope,
new Node\Expr\BinaryOp\NotEqual($expr->expr, new Node\Scalar\LNumber(0)),
$context,
$rootExpr,
);
} elseif ($expr instanceof Expr\Cast\Double) {
return $this->specifyTypesInCondition(
$scope,
new Node\Expr\BinaryOp\NotEqual($expr->expr, new ConstFetch(new Name\FullyQualified('false'))),
new Node\Expr\BinaryOp\NotEqual($expr->expr, new Node\Scalar\DNumber(0.0)),
$context,
$rootExpr,
);
Expand Down
10 changes: 5 additions & 5 deletions tests/PHPStan/Analyser/nsrt/narrow-cast.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ function doFoo(string $x, array $arr): void {
/** @param int<-5, 5> $x */
function castString($x, string $s, bool $b) {
if ((string) $x) {
assertType('int<-5, -1>|int<1, 5>', $x);
assertType('int<-5, 5>', $x);
} else {
assertType('0', $x);
assertType('int<-5, 5>', $x);
}

if ((string) $b) {
Expand Down Expand Up @@ -70,7 +70,7 @@ function castInt($x, string $s, bool $b) {
}

if ((int) strpos($s, 'xy')) {
assertType('non-falsy-string', $s);
assertType('string', $s);
} else {
assertType('string', $s);
}
Expand All @@ -79,9 +79,9 @@ function castInt($x, string $s, bool $b) {
/** @param int<-5, 5> $x */
function castFloat($x, string $s, bool $b) {
if ((float) $x) {
assertType('int<-5, -1>|int<1, 5>', $x);
assertType('int<-5, 5>', $x);
} else {
assertType('0', $x);
assertType('int<-5, 5>', $x);
}

if ((float) $b) {
Expand Down
4 changes: 0 additions & 4 deletions tests/PHPStan/Rules/Comparison/ElseIfConstantConditionRuleTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,10 +134,6 @@ public function testBug11674(): void
'Elseif condition is always false.',
28,
],
[
'Elseif condition is always false.',
36,
Copy link
Member

Choose a reason for hiding this comment

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

Took me a while but I found the bad boy for which the elseif can be false: https://3v4l.org/p1sON

],
]);
}

Expand Down
Loading