yield in switch

dantleech · ondrejmirtes · commit 412cc043128d · 2020-07-29T22:18:37.000+02:00
diff --git a/src/Analyser/NodeScopeResolver.php b/src/Analyser/NodeScopeResolver.php
@@ -1013,13 +1013,14 @@ private function processStmtNode(
 				[]
 			);
 		} elseif ($stmt instanceof Switch_) {
-			$scope = $this->processExprNode($stmt->cond, $scope, $nodeCallback, ExpressionContext::createDeep())->getScope();
+			$condResult = $this->processExprNode($stmt->cond, $scope, $nodeCallback, ExpressionContext::createDeep());
+			$scope = $condResult->getScope();
 			$scopeForBranches = $scope;
 			$finalScope = null;
 			$prevScope = null;
 			$hasDefaultCase = false;
 			$alwaysTerminating = true;
-			$hasYield = false;
+			$hasYield = $condResult->hasYield();
 			foreach ($stmt->cases as $caseNode) {
 				if ($caseNode->cond !== null) {
 					$condExpr = new BinaryOp\Equal($stmt->cond, $caseNode->cond);
diff --git a/tests/PHPStan/Rules/Missing/data/missing-return.php b/tests/PHPStan/Rules/Missing/data/missing-return.php
@@ -426,6 +426,13 @@ public function yieldInIf(): \Generator
 		}
 	}
 
+	public function yieldInSwitch(): \Generator
+	{
+		switch (yield 1) {
+			default:
+		}
+	}
+
 }
 
 class VoidUnion

Original file line number	Diff line number	Diff line change
`@@ -426,6 +426,13 @@ public function yieldInIf(): \Generator`
`426`	`426`	`}`
`427`	`427`	`}`
`428`	`428`
	`429`	`+ public function yieldInSwitch(): \Generator`
	`430`	`+ {`
	`431`	`+ switch (yield 1) {`
	`432`	`+ default:`
	`433`	`+ }`
	`434`	`+ }`
	`435`	`+`
`429`	`436`	`}`
`430`	`437`
`431`	`438`	`class VoidUnion`