Skip to content

Fix #7858: Redundant type casting drops next expression from condition and switches the context #5080

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
phpstan-bot wants to merge 1 commit into
base: 2.1.x
Choose a base branch
from
+46 −8
Open

Fix #7858: Redundant type casting drops next expression from condition and switches the context #5080

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
33 changes: 25 additions & 8 deletions src/Analyser/TypeSpecifier.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,42 +428,59 @@ public function specifyTypesInCondition(
}
}

$leftExpr = $expr->left;
if ($leftExpr instanceof Expr\Cast) {
$castedType = $scope->getType($leftExpr);
$innerType = $scope->getType($leftExpr->expr);
if ($castedType->equals($innerType)) {
$leftExpr = $leftExpr->expr;
}
}
$rightExpr = $expr->right;
if ($rightExpr instanceof Expr\Cast) {
$castedType = $scope->getType($rightExpr);
$innerType = $scope->getType($rightExpr->expr);
if ($castedType->equals($innerType)) {
$rightExpr = $rightExpr->expr;
}
}

if ($context->true()) {
if (!$expr->left instanceof Node\Scalar) {
if (!$leftExpr instanceof Node\Scalar) {
$result = $result->unionWith(
$this->create(
$expr->left,
$leftExpr,
$orEqual ? $rightType->getSmallerOrEqualType($this->phpVersion) : $rightType->getSmallerType($this->phpVersion),
TypeSpecifierContext::createTruthy(),
$scope,
)->setRootExpr($expr),
);
}
if (!$expr->right instanceof Node\Scalar) {
if (!$rightExpr instanceof Node\Scalar) {
$result = $result->unionWith(
$this->create(
$expr->right,
$rightExpr,
$orEqual ? $leftType->getGreaterOrEqualType($this->phpVersion) : $leftType->getGreaterType($this->phpVersion),
TypeSpecifierContext::createTruthy(),
$scope,
)->setRootExpr($expr),
);
}
} elseif ($context->false()) {
if (!$expr->left instanceof Node\Scalar) {
if (!$leftExpr instanceof Node\Scalar) {
$result = $result->unionWith(
$this->create(
$expr->left,
$leftExpr,
$orEqual ? $rightType->getGreaterType($this->phpVersion) : $rightType->getGreaterOrEqualType($this->phpVersion),
TypeSpecifierContext::createTruthy(),
$scope,
)->setRootExpr($expr),
);
}
if (!$expr->right instanceof Node\Scalar) {
if (!$rightExpr instanceof Node\Scalar) {
$result = $result->unionWith(
$this->create(
$expr->right,
$rightExpr,
$orEqual ? $leftType->getSmallerType($this->phpVersion) : $leftType->getSmallerOrEqualType($this->phpVersion),
TypeSpecifierContext::createTruthy(),
$scope,
Expand Down
21 changes: 21 additions & 0 deletions tests/PHPStan/Analyser/nsrt/bug-7858.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?php declare(strict_types = 1);

namespace Bug7858;

use function PHPStan\Testing\assertType;

function foo(int $year): void
{
if (!ctype_digit($year) || (int) $year < 2022) {
throw new \RuntimeException();
}
assertType('int<2022, max>', $year);
}

function bar(int $year): void
{
if (!ctype_digit($year) || $year < 2022) {
throw new \RuntimeException();
}
assertType('int<2022, max>', $year);
}
Loading