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

Don’t stop scanning loop contents due to possibly-null iterator

Browse Source
This commit is contained in:
Matt Brown 2021-06-28 13:13:12 -04:00
parent 8c137527d4
commit d18a4f4ccc
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Psalm/Internal/Analyzer/Statements/Block/ForeachAnalyzer.php
View File

@ -366,8 +366,9 @@ class ForeachAnalyzer
),
$statements_analyzer->getSuppressedIssues()
)) {
return false;
}
return false;
} elseif ($iterator_type->isNullable() && !$iterator_type->ignore_nullable_issues) {
if (IssueBuffer::accepts(
new PossiblyNullIterator(
@ -376,9 +377,13 @@ class ForeachAnalyzer
),
$statements_analyzer->getSuppressedIssues()
)) {
return false;
// fall through
}
} elseif ($iterator_type->isFalsable() && !$iterator_type->ignore_falsable_issues) {
return null;
}
if ($iterator_type->isFalsable() && !$iterator_type->ignore_falsable_issues) {
if (IssueBuffer::accepts(
new PossiblyFalseIterator(
'Cannot iterate over falsable var ' . $iterator_type,
@ -386,8 +391,10 @@ class ForeachAnalyzer
),
$statements_analyzer->getSuppressedIssues()
)) {
return false;
// fall through
}
return null;
}
$has_valid_iterator = false;