yield in foreach

dantleech · ondrejmirtes · commit c2bab8626782 · 2020-07-29T22:18:37.000+02:00
diff --git a/src/Analyser/NodeScopeResolver.php b/src/Analyser/NodeScopeResolver.php
@@ -754,8 +754,10 @@ private function processStmtNode(
 			$hasYield = false;
 			$this->processTraitUse($stmt, $scope, $nodeCallback);
 		} elseif ($stmt instanceof Foreach_) {
-			$scope = $this->processExprNode($stmt->expr, $scope, $nodeCallback, ExpressionContext::createDeep())->getScope();
+			$condResult = $this->processExprNode($stmt->expr, $scope, $nodeCallback, ExpressionContext::createDeep());
+			$scope = $condResult->getScope();
 			$bodyScope = $this->enterForeach($scope, $stmt);
+			$hasYield = false;
 			$count = 0;
 			do {
 				$prevScope = $bodyScope;
@@ -801,7 +803,7 @@ private function processStmtNode(
 
 			return new StatementResult(
 				$finalScope,
-				$finalScopeResult->hasYield(),
+				$finalScopeResult->hasYield() || $condResult->hasYield(),
 				$isIterableAtLeastOnce->yes() && $finalScopeResult->isAlwaysTerminating(),
 				[]
 			);
diff --git a/tests/PHPStan/Rules/Missing/data/missing-return.php b/tests/PHPStan/Rules/Missing/data/missing-return.php
@@ -414,6 +414,12 @@ public function yieldInDoCondition(): \Generator
 		} while(yield 1);
 	}
 
+	public function yieldInForeach(): \Generator
+	{
+		foreach (yield 1 as $bar) {
+		}
+	}
+
 }
 
 class VoidUnion

Original file line number	Diff line number	Diff line change
`@@ -414,6 +414,12 @@ public function yieldInDoCondition(): \Generator`
`414`	`414`	`} while(yield 1);`
`415`	`415`	`}`
`416`	`416`
	`417`	`+ public function yieldInForeach(): \Generator`
	`418`	`+ {`
	`419`	`+ foreach (yield 1 as $bar) {`
	`420`	`+ }`
	`421`	`+ }`
	`422`	`+`
`417`	`423`	`}`
`418`	`424`
`419`	`425`	`class VoidUnion`