Skip to content

Improve loose comparison on boolean #3747

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

Closed
wants to merge 1 commit into from
Closed

Improve loose comparison on boolean #3747

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions src/Type/BooleanType.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,10 @@ public function isScalar(): TrinaryLogic

public function looseCompare(Type $type, PhpVersion $phpVersion): BooleanType
{
if ($type->isTrue()->yes() || $type->isFalse()->yes()) {
return $type->toBoolean();
}

return new BooleanType();
}

Expand Down
48 changes: 48 additions & 0 deletions tests/PHPStan/Analyser/nsrt/loose-comparisons.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -601,4 +601,52 @@ public function sayEmptyStr(
assertType('false', $emptyStr == $phpStr);
assertType('true', $emptyStr == $emptyStr);
}

/**
* @param true $true
* @param false $false
* @param 1 $one
* @param 0 $zero
* @param -1 $minusOne
* @param '1' $oneStr
* @param '0' $zeroStr
* @param '-1' $minusOneStr
* @param '+1' $plusOneStr
* @param null $null
* @param array{} $emptyArr
* @param 'php' $phpStr
* @param '' $emptyStr
*/
public function sayBool(
$true,
$false,
$one,
$zero,
$minusOne,
$oneStr,
$zeroStr,
$minusOneStr,
$plusOneStr,
$null,
$emptyArr,
$phpStr,
$emptyStr,
bool $bool
): void
{
assertType('true', $bool == $true);
assertType('false', $bool == $false);
assertType('bool', $bool == $one);
assertType('bool', $bool == $zero);
assertType('bool', $bool == $minusOne);
assertType('bool', $bool == $oneStr);
assertType('bool', $bool == $zeroStr);
assertType('bool', $bool == $minusOneStr);
assertType('bool', $bool == $plusOneStr);
assertType('bool', $bool == $null);
assertType('bool', $bool == $emptyArr);
assertType('bool', $bool == $phpStr);
assertType('bool', $bool == $emptyStr);
}

}
Loading