Handle yield in if

dantleech · ondrejmirtes · commit 2d035a92810b · 2020-07-29T22:18:37.000+02:00
diff --git a/src/Analyser/NodeScopeResolver.php b/src/Analyser/NodeScopeResolver.php
@@ -676,7 +676,7 @@ private function processStmtNode(
 			$exitPoints = [];
 			$finalScope = null;
 			$alwaysTerminating = true;
-			$hasYield = false;
+			$hasYield = $condResult->hasYield();
 
 			$branchScopeStatementResult = $this->processStmtNodes($stmt, $stmt->stmts, $condResult->getTruthyScope(), $nodeCallback);
 
@@ -685,7 +685,7 @@ private function processStmtNode(
 				$branchScope = $branchScopeStatementResult->getScope();
 				$finalScope = $branchScopeStatementResult->isAlwaysTerminating() ? null : $branchScope;
 				$alwaysTerminating = $branchScopeStatementResult->isAlwaysTerminating();
-				$hasYield = $branchScopeStatementResult->hasYield();
+				$hasYield = $branchScopeStatementResult->hasYield() || $hasYield;
 			}
 
 			$scope = $condResult->getFalseyScope();
diff --git a/tests/PHPStan/Rules/Missing/data/missing-return.php b/tests/PHPStan/Rules/Missing/data/missing-return.php
@@ -420,6 +420,12 @@ public function yieldInForeach(): \Generator
 		}
 	}
 
+	public function yieldInIf(): \Generator
+	{
+		if (yield 1) {
+		}
+	}
+
 }
 
 class VoidUnion

Original file line number	Diff line number	Diff line change
`@@ -420,6 +420,12 @@ public function yieldInForeach(): \Generator`
`420`	`420`	`}`
`421`	`421`	`}`
`422`	`422`
	`423`	`+ public function yieldInIf(): \Generator`
	`424`	`+ {`
	`425`	`+ if (yield 1) {`
	`426`	`+ }`
	`427`	`+ }`
	`428`	`+`
`423`	`429`	`}`
`424`	`430`
`425`	`431`	`class VoidUnion`