Handle yield in for

dantleech · ondrejmirtes · commit 8a0dec1abfb3 · 2020-07-29T22:18:37.000+02:00
diff --git a/src/Analyser/NodeScopeResolver.php b/src/Analyser/NodeScopeResolver.php
@@ -929,6 +929,7 @@ private function processStmtNode(
 			return new StatementResult($finalScope, $bodyScopeResult->hasYield(), $alwaysTerminating, []);
 		} elseif ($stmt instanceof For_) {
 			$initScope = $scope;
+			$hasYield = false;
 			foreach ($stmt->init as $initExpr) {
 				$initScope = $this->processExprNode($initExpr, $initScope, $nodeCallback, ExpressionContext::createTopLevel())->getScope();
 			}
@@ -955,8 +956,10 @@ private function processStmtNode(
 					$bodyScope = $bodyScope->mergeWith($continueExitPoint->getScope());
 				}
 				foreach ($stmt->loop as $loopExpr) {
-					$bodyScope = $this->processExprNode($loopExpr, $bodyScope, static function (): void {
-					}, ExpressionContext::createTopLevel())->getScope();
+					$exprResult = $this->processExprNode($loopExpr, $bodyScope, static function (): void {
+					}, ExpressionContext::createTopLevel());
+					$bodyScope = $exprResult->getScope();
+					$hasYield = $hasYield || $exprResult->hasYield();
 				}
 
 				if ($bodyScope->equals($prevScope)) {
@@ -992,7 +995,12 @@ private function processStmtNode(
 
 			$finalScope = $finalScope->mergeWith($scope);
 
-			return new StatementResult($finalScope, $finalScopeResult->hasYield(), false/* $finalScopeResult->isAlwaysTerminating() && $isAlwaysIterable*/, []);
+			return new StatementResult(
+				$finalScope,
+				$finalScopeResult->hasYield() || $hasYield,
+				false/* $finalScopeResult->isAlwaysTerminating() && $isAlwaysIterable*/,
+				[]
+			);
 		} elseif ($stmt instanceof Switch_) {
 			$scope = $this->processExprNode($stmt->cond, $scope, $nodeCallback, ExpressionContext::createDeep())->getScope();
 			$scopeForBranches = $scope;
diff --git a/tests/PHPStan/Rules/Missing/data/missing-return.php b/tests/PHPStan/Rules/Missing/data/missing-return.php
@@ -396,12 +396,18 @@ public function bodySpecifiedVoidTReturn3(): \Generator
 		return 2;
 	}
 
-	public function yieldInExpression(): \Generator
+	public function yieldInWhileCondition(): \Generator
 	{
 		while($foo = yield 'foo') {
 		}
 	}
 
+	public function yieldInForCondition(): \Generator
+	{
+		for($foo = 0; $foo > 0; $foo = yield range(3, 0)) {
+		}
+	}
+
 }
 
 class VoidUnion
diff --git a/tests/e2e/magic-setter/test.php b/tests/e2e/magic-setter/test.php
@@ -1,4 +1,6 @@
-<?php // lint >= 7.4
+<?php declare(strict_types = 1);
+
+// lint >= 7.4
 
 namespace MagicSetter;
 

Original file line number	Diff line number	Diff line change
`@@ -396,12 +396,18 @@ public function bodySpecifiedVoidTReturn3(): \Generator`
`396`	`396`	`return 2;`
`397`	`397`	`}`
`398`	`398`
`399`		`- public function yieldInExpression(): \Generator`
	`399`	`+ public function yieldInWhileCondition(): \Generator`
`400`	`400`	`{`
`401`	`401`	`while($foo = yield 'foo') {`
`402`	`402`	`}`
`403`	`403`	`}`
`404`	`404`
	`405`	`+ public function yieldInForCondition(): \Generator`
	`406`	`+ {`
	`407`	`+ for($foo = 0; $foo > 0; $foo = yield range(3, 0)) {`
	`408`	`+ }`
	`409`	`+ }`
	`410`	`+`
`405`	`411`	`}`
`406`	`412`
`407`	`413`	`class VoidUnion`