Skip to content

Fix phpstan/phpstan#13591: False positive: Type narrowing not working with conditional exception validation #5385

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
+57 −10
Open

Fix phpstan/phpstan#13591: False positive: Type narrowing not working with conditional exception validation #5385

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
51 changes: 41 additions & 10 deletions src/Analyser/TypeSpecifier.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1964,11 +1964,15 @@ private function processBooleanSureConditionalTypes(Scope $scope, SpecifiedTypes
continue;
}

$holder = new ConditionalExpressionHolder(
$conditions,
ExpressionTypeHolder::createYes($expr, TypeCombinator::intersect($scope->getType($expr), $type)),
);
$holders[$exprString][$holder->getKey()] = $holder;
$resultTypeHolder = ExpressionTypeHolder::createYes($expr, TypeCombinator::intersect($scope->getType($expr), $type));

foreach ($this->expandUnionConditions($conditions) as $expandedConditions) {
$holder = new ConditionalExpressionHolder(
$expandedConditions,
$resultTypeHolder,
);
$holders[$exprString][$holder->getKey()] = $holder;
}
}

return $holders;
Expand Down Expand Up @@ -2085,11 +2089,15 @@ private function processBooleanNotSureConditionalTypes(Scope $scope, SpecifiedTy
continue;
}

$holder = new ConditionalExpressionHolder(
$conditions,
ExpressionTypeHolder::createYes($expr, TypeCombinator::remove($scope->getType($expr), $type)),
);
$holders[$exprString][$holder->getKey()] = $holder;
$resultTypeHolder = ExpressionTypeHolder::createYes($expr, TypeCombinator::remove($scope->getType($expr), $type));

foreach ($this->expandUnionConditions($conditions) as $expandedConditions) {
$holder = new ConditionalExpressionHolder(
$expandedConditions,
$resultTypeHolder,
);
$holders[$exprString][$holder->getKey()] = $holder;
}
}

return $holders;
Expand All @@ -2098,6 +2106,29 @@ private function processBooleanNotSureConditionalTypes(Scope $scope, SpecifiedTy
return [];
}

/**
* @param array<string, ExpressionTypeHolder> $conditions
* @return list<array<string, ExpressionTypeHolder>>
*/
private function expandUnionConditions(array $conditions): array
{
$result = [$conditions];
foreach ($conditions as $exprString => $typeHolder) {
$type = $typeHolder->getType();
if (!$type instanceof UnionType) {
continue;
}

foreach ($type->getTypes() as $innerType) {
$expanded = $conditions;
$expanded[$exprString] = ExpressionTypeHolder::createYes($typeHolder->getExpr(), $innerType);
$result[] = $expanded;
}
}

return $result;
}

/**
* @return array{Expr, ConstantScalarType, Type}|null
*/
Expand Down
16 changes: 16 additions & 0 deletions tests/PHPStan/Analyser/nsrt/bug-13591.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?php

namespace Bug13591;

use function PHPStan\Testing\assertType;

function processAction(string $action, ?int $hotelId): void
{
if ($hotelId === null && ($action === 'get_rooms' || $action === 'update')) {
throw new \InvalidArgumentException('Hotel ID is required');
}

if ($action === 'get_rooms') {
assertType('int', $hotelId);
}
}
Loading