Skip to content

Fix phpstan/phpstan#10055: Conditional argument type not properly narrowing type (for constant string unions?) #5386

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
+38 −9
Open

Fix phpstan/phpstan#10055: Conditional argument type not properly narrowing type (for constant string unions?) #5386

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
27 changes: 18 additions & 9 deletions src/Analyser/MutatingScope.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1758,15 +1758,24 @@ private function enterFunctionLike(
$ifType = $parameterType->isNegated() ? $parameterType->getElse() : $parameterType->getIf();
$elseType = $parameterType->isNegated() ? $parameterType->getIf() : $parameterType->getElse();

$holder = new ConditionalExpressionHolder([
$parameterType->getParameterName() => ExpressionTypeHolder::createYes(new Variable($targetParameterName), TypeCombinator::intersect($targetParameter->getType(), $parameterType->getTarget())),
], ExpressionTypeHolder::createYes(new Variable($parameter->getName()), $ifType));
$conditionalTypes['$' . $parameter->getName()][$holder->getKey()] = $holder;

$holder = new ConditionalExpressionHolder([
$parameterType->getParameterName() => ExpressionTypeHolder::createYes(new Variable($targetParameterName), TypeCombinator::remove($targetParameter->getType(), $parameterType->getTarget())),
], ExpressionTypeHolder::createYes(new Variable($parameter->getName()), $elseType));
$conditionalTypes['$' . $parameter->getName()][$holder->getKey()] = $holder;
$ifConditionType = TypeCombinator::intersect($targetParameter->getType(), $parameterType->getTarget());
$elseConditionType = TypeCombinator::remove($targetParameter->getType(), $parameterType->getTarget());

$ifConditionTypes = $ifConditionType instanceof UnionType ? $ifConditionType->getTypes() : [$ifConditionType];
foreach ($ifConditionTypes as $conditionType) {
$holder = new ConditionalExpressionHolder([
$parameterType->getParameterName() => ExpressionTypeHolder::createYes(new Variable($targetParameterName), $conditionType),
], ExpressionTypeHolder::createYes(new Variable($parameter->getName()), $ifType));
$conditionalTypes['$' . $parameter->getName()][$holder->getKey()] = $holder;
}

$elseConditionTypes = $elseConditionType instanceof UnionType ? $elseConditionType->getTypes() : [$elseConditionType];
foreach ($elseConditionTypes as $conditionType) {
$holder = new ConditionalExpressionHolder([
$parameterType->getParameterName() => ExpressionTypeHolder::createYes(new Variable($targetParameterName), $conditionType),
], ExpressionTypeHolder::createYes(new Variable($parameter->getName()), $elseType));
$conditionalTypes['$' . $parameter->getName()][$holder->getKey()] = $holder;
}
}
}

Expand Down
20 changes: 20 additions & 0 deletions tests/PHPStan/Analyser/nsrt/bug-10055.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?php // lint >= 8.0

declare(strict_types = 1);

namespace Bug10055;

use function PHPStan\Testing\assertType;

/**
* @param 'value1'|'value2'|'value3' $param1
* @param ($param1 is 'value3' ? bool : int) $param2
*/
function test(string $param1, int|bool $param2): void
{
match ($param1) {
'value1' => assertType('int', $param2),
'value2' => assertType('int', $param2),
'value3' => assertType('bool', $param2),
};
}
Loading