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

Fix #4544 - improve handling of get_class in match

Browse Source
This commit is contained in:
Matt Brown 2020-11-13 11:55:42 -05:00 committed by Daniil Gentili
parent 5219932408
commit 5f01ea788a
Signed by: danog
GPG Key ID: 8C1BE3B34B230CA7
2 changed files with 65 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/Psalm/Internal/Analyzer/Statements/Expression/MatchAnalyzer.php
View File

@ -47,22 +47,54 @@ class MatchAnalyzer
$match_condition = $stmt->cond;
if (!$switch_var_id
&& ($stmt->cond instanceof PhpParser\Node\Expr\FuncCall
if (!$switch_var_id) {
if ($stmt->cond instanceof PhpParser\Node\Expr\FuncCall
&& $stmt->cond->name instanceof PhpParser\Node\Name
&& ($stmt->cond->name->parts === ['get_class']
|| $stmt->cond->name->parts === ['gettype']
|| $stmt->cond->name->parts === ['get_debug_type'])
&& $stmt->cond->args
) {
$first_arg = $stmt->cond->args[0];
if (!$first_arg->value instanceof PhpParser\Node\Expr\Variable) {
$switch_var_id = '$__tmp_switch__' . (int) $first_arg->value->getAttribute('startFilePos');
$condition_type = $statements_analyzer->node_data->getType($first_arg->value) ?: Type::getMixed();
$context->vars_in_scope[$switch_var_id] = $condition_type;
$match_condition = new PhpParser\Node\Expr\FuncCall(
$stmt->cond->name,
[
new PhpParser\Node\Arg(
new PhpParser\Node\Expr\Variable(
substr($switch_var_id, 1),
$first_arg->value->getAttributes()
),
false,
false,
$first_arg->getAttributes()
)
],
$stmt->cond->getAttributes()
);
}
} elseif ($stmt->cond instanceof PhpParser\Node\Expr\FuncCall
|| $stmt->cond instanceof PhpParser\Node\Expr\MethodCall
|| $stmt->cond instanceof PhpParser\Node\Expr\StaticCall
)
) {
$switch_var_id = '$__tmp_switch__' . (int) $stmt->cond->getAttribute('startFilePos');
) {
$switch_var_id = '$__tmp_switch__' . (int) $stmt->cond->getAttribute('startFilePos');
$condition_type = $statements_analyzer->node_data->getType($stmt->cond) ?: Type::getMixed();
$condition_type = $statements_analyzer->node_data->getType($stmt->cond) ?: Type::getMixed();
$context->vars_in_scope[$switch_var_id] = $condition_type;
$context->vars_in_scope[$switch_var_id] = $condition_type;
$match_condition = new PhpParser\Node\Expr\Variable(
substr($switch_var_id, 1),
$stmt->cond->getAttributes()
);
$match_condition = new PhpParser\Node\Expr\Variable(
substr($switch_var_id, 1),
$stmt->cond->getAttributes()
);
}
}
$arms = $stmt->arms;

22
tests/MatchTest.php
View File

@ -56,6 +56,28 @@ class MatchTest extends TestCase
[],
'8.0'
],
'getClassWithMethod' => [
'<?php
interface Foo {}
class Bar implements Foo
{
public function hello(): string
{
return "a";
}
}
function foo(Foo $value): string {
return match (get_class($value)) {
Bar::class => $value->hello(),
default => "b",
};
}',
[],
[],
'8.0'
],
];
}