danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2025-01-21 21:31:13 +01:00
Code Issues Projects Releases Wiki Activity

Fix Psalm errors

Browse Source
This commit is contained in:
Brown 2020-08-30 16:30:43 -04:00
parent 5c043b0d41
commit 2cbe89d55a
2 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,8 +39,6 @@ class MatchAnalyzer
$match_condition = $stmt->cond;
$fake_match_condition = false;
if (!$switch_var_id
&& ($stmt->cond instanceof PhpParser\Node\Expr\FuncCall
|| $stmt->cond instanceof PhpParser\Node\Expr\MethodCall
@ -53,14 +51,10 @@ class MatchAnalyzer
$context->vars_in_scope[$switch_var_id] = $condition_type;
if ($switch_var_id && substr($switch_var_id, 0, 15) === '$__tmp_switch__') {
$match_condition = new PhpParser\Node\Expr\Variable(
substr($switch_var_id, 1),
$stmt->cond->getAttributes()
);
$fake_match_condition = true;
}
$match_condition = new PhpParser\Node\Expr\Variable(
substr($switch_var_id, 1),
$stmt->cond->getAttributes()
);
}
$arms = $stmt->arms;
@ -81,7 +75,7 @@ class MatchAnalyzer
$statements_analyzer->node_data = clone $statements_analyzer->node_data;
if ($last_arm->conds === null) {
if (!$last_arm->conds) {
$ternary = $last_arm->body;
} else {
$ternary = new PhpParser\Node\Expr\Ternary(
@ -132,9 +126,9 @@ class MatchAnalyzer
$statements_analyzer->removeSuppressedIssues(['RedundantConditionGivenDocblockType']);
}
if ($stmt_expr_type = $statements_analyzer->node_data->getType($ternary)) {
$old_node_data->setType($stmt, $stmt_expr_type ?: Type::getMixed());
}
$stmt_expr_type = $statements_analyzer->node_data->getType($ternary);
$old_node_data->setType($stmt, $stmt_expr_type ?: Type::getMixed());
$statements_analyzer->node_data = $old_node_data;

3
src/Psalm/Internal/PropertyMap.php
View File

@ -508,6 +508,9 @@ return [
'phpparser\\node\\stmt\\interface_' => [
'stmts' => 'array<int, PhpParser\Node\Stmt>',
],
'phpparser\\node\\matcharm' => [
'conds' => 'null|non-empty-list<PhpParser\Node\Expr>',
],
'rdkafka\\message' => [
'err' => 'int',
'topic_name' => 'string',