Fix closure inferred return type with nested closures and anonymous classes

ondrejmirtes · ondrejmirtes · commit 85d67ac2bdca · 2021-01-18T13:00:52.000+01:00
diff --git a/src/Analyser/MutatingScope.php b/src/Analyser/MutatingScope.php
@@ -40,6 +40,7 @@
 use PHPStan\Reflection\Php\PhpMethodFromParserNodeReflection;
 use PHPStan\Reflection\PropertyReflection;
 use PHPStan\Reflection\ReflectionProvider;
+use PHPStan\Reflection\TrivialParametersAcceptor;
 use PHPStan\Rules\Properties\PropertyReflectionFinder;
 use PHPStan\TrinaryLogic;
 use PHPStan\Type\ArrayType;
@@ -1326,7 +1327,11 @@ private function resolveType(Expr $node): Type
 				$closureScope = $this->enterAnonymousFunctionWithoutReflection($node);
 				$closureReturnStatements = [];
 				$closureYieldStatements = [];
-				$this->nodeScopeResolver->processStmtNodes($node, $node->stmts, $closureScope, static function (Node $node, Scope $scope) use (&$closureReturnStatements, &$closureYieldStatements): void {
+				$this->nodeScopeResolver->processStmtNodes($node, $node->stmts, $closureScope, static function (Node $node, Scope $scope) use ($closureScope, &$closureReturnStatements, &$closureYieldStatements): void {
+					if ($scope->getAnonymousFunctionReflection() !== $closureScope->getAnonymousFunctionReflection()) {
+						return;
+					}
+
 					if ($node instanceof Node\Stmt\Return_) {
 						$closureReturnStatements[] = [$node, $scope];
 					}
@@ -2895,7 +2900,7 @@ private function enterAnonymousFunctionWithoutReflection(
 			$moreSpecificTypes,
 			[],
 			$this->inClosureBindScopeClass,
-			null,
+			new TrivialParametersAcceptor(),
 			true,
 			[],
 			$nativeTypes,
diff --git a/tests/PHPStan/Analyser/data/closure-return-type.php b/tests/PHPStan/Analyser/data/closure-return-type.php
@@ -75,4 +75,27 @@ public function doFoo(int $i): void
 		assertType('Generator<int, 1, mixed, 2>', $h());
 	}
 
+	public function doBar(): void
+	{
+		$f = function () {
+			if (rand(0, 1)) {
+				return 1;
+			}
+
+			function () {
+				return 'foo';
+			};
+
+			$c = new class() {
+				public function doFoo() {
+					return 2.0;
+				}
+			};
+
+			return 2;
+		};
+
+		assertType('1|2', $f());
+	}
+
 }
