danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2024-11-30 04:39:00 +01:00
Code Issues Projects Releases Wiki Activity

Fix BinaryOp analysis

Browse Source
This commit is contained in:
Brown 2020-05-18 23:00:53 -04:00
parent 8e5b330c5a
commit 666cc3b4c9
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/Psalm/Internal/Analyzer/Statements/Expression/BinaryOpAnalyzer.php
View File

@ -31,23 +31,31 @@ class BinaryOpAnalyzer
if ($stmt instanceof PhpParser\Node\Expr\BinaryOp\BooleanAnd ||
$stmt instanceof PhpParser\Node\Expr\BinaryOp\LogicalAnd
) {
return BinaryOp\AndAnalyzer::analyze(
$expr_result = BinaryOp\AndAnalyzer::analyze(
$statements_analyzer,
$stmt,
$context,
$from_stmt
);
$statements_analyzer->node_data->setType($stmt, Type::getBool());
return $expr_result;
}
if ($stmt instanceof PhpParser\Node\Expr\BinaryOp\BooleanOr ||
$stmt instanceof PhpParser\Node\Expr\BinaryOp\LogicalOr
) {
return BinaryOp\OrAnalyzer::analyze(
$expr_result = BinaryOp\OrAnalyzer::analyze(
$statements_analyzer,
$stmt,
$context,
$from_stmt
);
$statements_analyzer->node_data->setType($stmt, Type::getBool());
return $expr_result;
}
if ($stmt instanceof PhpParser\Node\Expr\BinaryOp\Coalesce) {
@ -79,13 +87,22 @@ class BinaryOpAnalyzer
}
if ($stmt instanceof PhpParser\Node\Expr\BinaryOp\Concat) {
$stmt_type = Type::getString();
BinaryOp\ConcatAnalyzer::analyze(
$statements_analyzer,
$stmt->left,
$stmt->right,
$context
$context,
$result_type
);
if ($result_type) {
$stmt_type = $result_type;
}
$statements_analyzer->node_data->setType($stmt, $stmt_type);
return true;
}