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

Author: ondrejmirtes

src/Analyser/NodeScopeResolver.php

@@ -517,8 +517,14 @@ private function processStmtNode(
 
 			if ($stmt->stmts !== null) {
 				$gatheredReturnStatements = [];
-				$statementResult = $this->processStmtNodes($stmt, $stmt->stmts, $methodScope, static function (\PhpParser\Node $node, Scope $scope) use ($nodeCallback, &$gatheredReturnStatements): void {
+				$statementResult = $this->processStmtNodes($stmt, $stmt->stmts, $methodScope, static function (\PhpParser\Node $node, Scope $scope) use ($nodeCallback, $methodScope, &$gatheredReturnStatements): void {
 					$nodeCallback($node, $scope);
+					if ($scope->getFunction() !== $methodScope->getFunction()) {
+						return;
+					}
+					if ($scope->isInAnonymousFunction()) {
+						return;
+					}
 					if (!$node instanceof Return_) {
 						return;
 					}

tests/PHPStan/Rules/TooWideTypehints/TooWideMethodReturnTypehintRuleTest.php

@@ -27,6 +27,10 @@ public function testPrivate(): void
 				'Method TooWideMethodReturnType\Foo::baz() never returns null so it can be removed from the return typehint.',
 				18,
 			],
+			[
+				'Method TooWideMethodReturnType\Foo::dolor() never returns null so it can be removed from the return typehint.',
+				34,
+			],
 		]);
 	}
 

tests/PHPStan/Rules/TooWideTypehints/data/tooWideMethodReturnType-private.php

@@ -31,4 +31,18 @@ public function ipsum(): ?string {
 		return null;
 	}
 
+	private function dolor(): ?string {
+		$f = function () {
+			return null;
+		};
+
+		$c = new class () {
+			public function doFoo() {
+				return null;
+			}
+		};
+
+		return 'str';
+	}
+
 }