Fix FunctionReturnStatementsNode to not contain statements from nested closures and anonymous functions

ondrejmirtes · ondrejmirtes · commit c70325b4a480 · 2021-01-18T11:30:15.000+01:00
diff --git a/src/Analyser/NodeScopeResolver.php b/src/Analyser/NodeScopeResolver.php
@@ -419,8 +419,14 @@ private function processStmtNode(
 			$nodeCallback(new InFunctionNode($stmt), $functionScope);
 
 			$gatheredReturnStatements = [];
-			$statementResult = $this->processStmtNodes($stmt, $stmt->stmts, $functionScope, static function (\PhpParser\Node $node, Scope $scope) use ($nodeCallback, &$gatheredReturnStatements): void {
+			$statementResult = $this->processStmtNodes($stmt, $stmt->stmts, $functionScope, static function (\PhpParser\Node $node, Scope $scope) use ($nodeCallback, $functionScope, &$gatheredReturnStatements): void {
 				$nodeCallback($node, $scope);
+				if ($scope->getFunction() !== $functionScope->getFunction()) {
+					return;
+				}
+				if ($scope->isInAnonymousFunction()) {
+					return;
+				}
 				if (!$node instanceof Return_) {
 					return;
 				}
diff --git a/tests/PHPStan/Rules/TooWideTypehints/TooWideFunctionReturnTypehintRuleTest.php b/tests/PHPStan/Rules/TooWideTypehints/TooWideFunctionReturnTypehintRuleTest.php
@@ -28,6 +28,10 @@ public function testRule(): void
 				'Function TooWideFunctionReturnType\baz() never returns null so it can be removed from the return typehint.',
 				15,
 			],
+			[
+				'Function TooWideFunctionReturnType\ipsum() never returns null so it can be removed from the return typehint.',
+				27,
+			],
 		]);
 	}
 
diff --git a/tests/PHPStan/Rules/TooWideTypehints/data/tooWideFunctionReturnType.php b/tests/PHPStan/Rules/TooWideTypehints/data/tooWideFunctionReturnType.php
@@ -23,3 +23,17 @@ function lorem(): ?string {
 
 	return null;
 }
+
+function ipsum(): ?string {
+	$f = function () {
+		return null;
+	};
+
+	$c = new class () {
+		public function doFoo() {
+			return null;
+		}
+	};
+
+	return 'str';
+}
