Skip to content
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

Jump to bottom

Fix Identical type specification of constant types #1493

Merged
merged 2 commits into from
Jul 10, 2022
Merged

Fix Identical type specification of constant types #1493

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
c51b80b
Fix Identical type specification of constant types
herndlm Jul 2, 2022
2c89848
Disambiguate && / || operator priority
herndlm Jul 10, 2022
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
10 changes: 8 additions & 2 deletions src/Analyser/TypeSpecifier.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,10 @@ public function specifyTypesInCondition(
$types = null;
$exprLeftType = $scope->getType($expr->left);
$exprRightType = $scope->getType($expr->right);
if ($exprLeftType instanceof ConstantType || $exprLeftType instanceof EnumCaseObjectType) {
if (
$exprLeftType instanceof ConstantType && !$exprRightType->equals($exprLeftType) && $exprRightType->isSuperTypeOf($exprLeftType)->yes()
|| $exprLeftType instanceof EnumCaseObjectType
herndlm marked this conversation as resolved.
Show resolved Hide resolved
) {
$types = $this->create(
$expr->right,
$exprLeftType,
Expand All @@ -314,7 +317,10 @@ public function specifyTypesInCondition(
$rootExpr,
);
}
if ($exprRightType instanceof ConstantType || $exprRightType instanceof EnumCaseObjectType) {
if (
$exprRightType instanceof ConstantType && !$exprLeftType->equals($exprRightType) && $exprLeftType->isSuperTypeOf($exprRightType)->yes()
|| $exprRightType instanceof EnumCaseObjectType
herndlm marked this conversation as resolved.
Show resolved Hide resolved
) {
$leftType = $this->create(
$expr->left,
$exprRightType,
Expand Down
27 changes: 27 additions & 0 deletions tests/PHPStan/Analyser/data/identical.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,4 +72,31 @@ public static function createStdClass(): \stdClass

}

public function doBar(array $arr1, array $arr2): void
{
/**
* @var array{foo: bool, bar: int} $arr1
* @var array{foo: bool, bar: int} $arr2
*/
if ($arr1 === $arr2) {
assertType('array{foo: bool, bar: int}', $arr1);
assertType('array{foo: bool, bar: int}', $arr2);
} else {
assertType('array{foo: bool, bar: int}', $arr1);
assertType('array{foo: bool, bar: int}', $arr2);
}

/**
* @var array{foo: true, bar: 17} $arr1
* @var array{foo: bool, bar: int} $arr2
*/
if ($arr1 === $arr2) {
assertType('array{foo: true, bar: 17}', $arr1);
assertType('array{foo: true, bar: 17}', $arr2);
} else {
assertType('array{foo: true, bar: 17}', $arr1);
assertType('array{foo: bool, bar: int}', $arr2);
}
}

}
6 changes: 6 additions & 0 deletions tests/PHPStan/Rules/Comparison/StrictComparisonOfDifferentTypesRuleTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -566,4 +566,10 @@ public function testBug7555(): void
]);
}

public function testBug7257(): void
{
$this->checkAlwaysTrueStrictComparison = false;
$this->analyse([__DIR__ . '/data/bug-7257.php'], []);
}

}
31 changes: 31 additions & 0 deletions tests/PHPStan/Rules/Comparison/data/bug-7257.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<?php declare(strict_types = 1);

namespace Bug7257;

function rangesInConflict(): bool
{
$ranges1 = array_filter([
(int) rand(0,10),
(int) rand(0,10),
(int) rand(0,10),
(int) rand(0,10),
]);

$ranges2 = array_filter([
(int) rand(0,10),
(int) rand(0,10),
(int) rand(0,10),
(int) rand(0,10),
]);

$sorted = array_filter([
(int) rand(0,10),
(int) rand(0,10),
(int) rand(0,10),
(int) rand(0,10),
]);

sort($sorted);

return !($sorted === $ranges1 || $sorted === $ranges2);
}