Skip to content

Commit 4ed53b7

Browse files
committed
Small bugfix
1 parent df67cd7 commit 4ed53b7

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

src/Psalm/Internal/Analyzer/Statements/Expression/Call/ArgumentsAnalyzer.php

+5-3
Original file line numberDiff line numberDiff line change
@@ -1466,13 +1466,15 @@ private static function handleByRefFunctionArg(
14661466
$statements_analyzer->addSuppressedIssues(['EmptyArrayAccess']);
14671467
}
14681468

1469-
if (ExpressionAnalyzer::analyze($statements_analyzer, $arg->value, $context) === false) {
1470-
return false;
1471-
}
1469+
$v = ExpressionAnalyzer::analyze($statements_analyzer, $arg->value, $context);
14721470

14731471
if (!in_array('EmptyArrayAccess', $suppressed_issues, true)) {
14741472
$statements_analyzer->removeSuppressedIssues(['EmptyArrayAccess']);
14751473
}
1474+
1475+
if ($v === false) {
1476+
return false;
1477+
}
14761478
}
14771479

14781480
return null;

src/Psalm/Internal/Analyzer/Statements/Expression/MatchAnalyzer.php

+5-3
Original file line numberDiff line numberDiff line change
@@ -217,9 +217,7 @@ public static function analyze(
217217
$statements_analyzer->addSuppressedIssues(['RedundantConditionGivenDocblockType']);
218218
}
219219

220-
if (ExpressionAnalyzer::analyze($statements_analyzer, $ternary, $context) === false) {
221-
return false;
222-
}
220+
$v = ExpressionAnalyzer::analyze($statements_analyzer, $ternary, $context);
223221

224222
if (!in_array('RedundantCondition', $suppressed_issues, true)) {
225223
$statements_analyzer->removeSuppressedIssues(['RedundantCondition']);
@@ -229,6 +227,10 @@ public static function analyze(
229227
$statements_analyzer->removeSuppressedIssues(['RedundantConditionGivenDocblockType']);
230228
}
231229

230+
if ($v === false) {
231+
return false;
232+
}
233+
232234
if ($switch_var_id && $last_arm->conds) {
233235
$codebase = $statements_analyzer->getCodebase();
234236

0 commit comments

Comments
 (0)