fix arrow-fn and suppress

phpstan · ondrejmirtes · Jul 21, 2025 · Jul 11, 2025 · Jul 11, 2025 · Jul 11, 2025
commit 4e009046aaaca8eb7bdf8bea1b615268c828f54e
diff --git a/src/Analyser/NodeScopeResolver.php b/src/Analyser/NodeScopeResolver.php
@@ -3187,7 +3187,7 @@ static function (): void {
 			return new ExpressionResult(
 				$result->getScope(),
 				$result->hasYield(),
-				false,
+				$result->isAlwaysTerminating(),
 				[],
 				[],
 			);
@@ -3196,7 +3196,7 @@ static function (): void {
 			$hasYield = $result->hasYield();
 			$throwPoints = $result->getThrowPoints();
 			$impurePoints = $result->getImpurePoints();
-			$isAlwaysTerminating = false;
+			$isAlwaysTerminating = $result->isAlwaysTerminating();
 			$scope = $result->getScope();
 		} elseif ($expr instanceof Exit_) {
 			$hasYield = false;
@@ -4794,7 +4794,7 @@ private function processArrowFunctionNode(
 		$nodeCallback(new InArrowFunctionNode($arrowFunctionType, $expr), $arrowFunctionScope);
 		$exprResult = $this->processExprNode($stmt, $expr->expr, $arrowFunctionScope, $nodeCallback, ExpressionContext::createTopLevel());
 
-		return new ExpressionResult($scope, false, false, $exprResult->getThrowPoints(), $exprResult->getImpurePoints());
+		return new ExpressionResult($scope, false, $exprResult->isAlwaysTerminating(), $exprResult->getThrowPoints(), $exprResult->getImpurePoints());
 	}
 
 	/**

diff --git a/tests/PHPStan/Analyser/ExpressionResultTest.php b/tests/PHPStan/Analyser/ExpressionResultTest.php
@@ -74,6 +74,10 @@ public static function dataIsAlwaysTerminating(): array
 				'fn() => yield (exit());',
 				true,
 			],
+			[
+				'@exit();',
+				true,
+			],
 		];
 	}
-Original file line number
+Diff line change
@@ Expand Up / @@ -74,6 +74,10 @@ public static function dataIsAlwaysTerminating(): array @@
     				'fn() => yield (exit());',
     				true,
     			],
+    			[
+    				'@exit();',
+    				true,
+    			],
     		];
     	}
@@ Expand Down @@