Skip to content

Fix false positive with Generator when yield is in a "while" condition #286

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Jul 29, 2020
+69 −12
Merged

Fix false positive with Generator when yield is in a "while" condition #286

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5bad458
Consider condition result hasYield ...
dantleech Jul 26, 2020
8bb7a7c
Handle yield in for
dantleech Jul 27, 2020
d95a160
Support yield in do condition
dantleech Jul 27, 2020
fe581f4
yield in foreach
dantleech Jul 27, 2020
14610dd
Rename variable
dantleech Jul 27, 2020
5420692
Handle yield in `if`
dantleech Jul 27, 2020
7a0b696
yield in switch
dantleech Jul 27, 2020
18f68b5
Revert automatic CS fix
dantleech Jul 29, 2020
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Analyser/NodeScopeResolver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -867,7 +867,7 @@ private function processStmtNode(

return new StatementResult(
$finalScope,
$finalScopeResult->hasYield(),
$finalScopeResult->hasYield() || $condResult->hasYield(),
$isAlwaysTerminating,
[]
);
Expand Down
6 changes: 6 additions & 0 deletions tests/PHPStan/Rules/Missing/data/missing-return.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,12 @@ public function bodySpecifiedVoidTReturn3(): \Generator
return 2;
}

public function yieldInExpression(): \Generator
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The issue reported was detected by the MissingReturn rule. Not sure if there is a more suitable way to test (the test is that there is no error).
{
while($foo = yield 'foo') {
}
}

}

class VoidUnion
Expand Down