danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2024-12-04 10:38:49 +01:00
Code Issues Projects Releases Wiki Activity

bugfix: only extend existing logic instead of hijacking it

Browse Source 
Signed-off-by: Maximilian Bösing <2189546+boesing@users.noreply.github.com>
This commit is contained in:
Maximilian Bösing 2022-06-12 01:15:46 +02:00
parent 2d9133b35a
commit 4ee1b3feb4
No known key found for this signature in database
GPG Key ID: 9A8988C93CEC81A3
1 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/Psalm/Internal/Analyzer/Statements/Expression/CallAnalyzer.php
View File

@ -763,16 +763,11 @@ class CallAnalyzer
$codebase
);
$arg_var_type = $context->vars_in_scope[$assertion_var_id];
if (self::isNewTypeNarrowingDownOldType($arg_var_type, $union)) {
foreach ($union->getAtomicTypes() as $atomic_type) {
if ($assertion_type instanceof TTemplateParam
&& $assertion_type->as->getId() === $atomic_type->getId()
) {
continue;
}
if ($union->isSingle()) {
$atomic_type = $union->getSingleAtomic();
if (!$assertion_type instanceof TTemplateParam
|| $assertion_type->as->getId() !== $atomic_type->getId()
) {
$assertion_rule = clone $assertion_rule;
$assertion_rule->setAtomicType($atomic_type);
$orred_rules[] = $assertion_rule;
@ -798,6 +793,21 @@ class CallAnalyzer
);
}
}
} else if (isset($arg_var_id, $context->vars_in_scope[$arg_var_id])) {
$other_type = $context->vars_in_scope[$arg_var_id];
if (self::isNewTypeNarrowingDownOldType($other_type, $union)) {
foreach($union->getAtomicTypes() as $atomic_type) {
if ($assertion_type instanceof TTemplateParam
&& $assertion_type->as->getId() === $atomic_type->getId()
) {
continue;
}
$assertion_rule = clone $assertion_rule;
$assertion_rule->setAtomicType($atomic_type);
$orred_rules[] = $assertion_rule;
}
}
}
} else {
$orred_rules[] = $assertion_rule;
@ -1125,18 +1135,10 @@ class CallAnalyzer
*/
private static function isNewTypeNarrowingDownOldType(Union $old_type, Union $new_type): bool
{
if ($new_type->isSingle()) {
if ($old_type->isMixed() && !$new_type->hasMixed()) {
return true;
}
if ($old_type->hasMixed() && !$new_type->hasMixed()) {
return true;
}
if ($old_type->isSingleAndMaybeNullable() && !$new_type->isNullable()) {
return true;
}
return false;
return $new_type->allLiterals();
}
}