Consider condition result hasYield ...

dantleech · ondrejmirtes · commit ef8206b2da9e · 2020-07-29T22:18:37.000+02:00
when determining if scope has yield or not.
diff --git a/src/Analyser/NodeScopeResolver.php b/src/Analyser/NodeScopeResolver.php
@@ -867,7 +867,7 @@ private function processStmtNode(
 
 			return new StatementResult(
 				$finalScope,
-				$finalScopeResult->hasYield(),
+				$finalScopeResult->hasYield() || $condResult->hasYield(),
 				$isAlwaysTerminating,
 				[]
 			);
diff --git a/tests/PHPStan/Rules/Missing/data/missing-return.php b/tests/PHPStan/Rules/Missing/data/missing-return.php
@@ -396,6 +396,12 @@ public function bodySpecifiedVoidTReturn3(): \Generator
 		return 2;
 	}
 
+	public function yieldInExpression(): \Generator
+	{
+		while($foo = yield 'foo') {
+		}
+	}
+
 }
 
 class VoidUnion

Original file line number	Diff line number	Diff line change
`@@ -396,6 +396,12 @@ public function bodySpecifiedVoidTReturn3(): \Generator`
`396`	`396`	`return 2;`
`397`	`397`	`}`
`398`	`398`
	`399`	`+ public function yieldInExpression(): \Generator`
	`400`	`+ {`
	`401`	`+ while($foo = yield 'foo') {`
	`402`	`+ }`
	`403`	`+ }`
	`404`	`+`
`399`	`405`	`}`
`400`	`406`
`401`	`407`	`class VoidUnion`