fix: use passed to type to compare return types in ClosureReturnTypeRule

Author: canvural

src/Analyser/NodeScopeResolver.php

@@ -4311,6 +4311,7 @@ private function processClosureNode(
 				$statementResult,
 				$executionEnds,
 				array_merge($statementResult->getImpurePoints(), $closureImpurePoints),
+				$passedToType,
 			), $closureScope);
 
 			return new ProcessClosureResult($scope, $statementResult->getThrowPoints(), $statementResult->getImpurePoints(), $invalidateExpressions);
@@ -4357,6 +4358,7 @@ private function processClosureNode(
 			$statementResult,
 			$executionEnds,
 			array_merge($statementResult->getImpurePoints(), $closureImpurePoints),
+			$passedToType,
 		), $closureScope);
 
 		return new ProcessClosureResult($scope->processClosureScope($closureResultScope, null, $byRefUses), $statementResult->getThrowPoints(), $statementResult->getImpurePoints(), $invalidateExpressions);

src/Node/ClosureReturnStatementsNode.php

@@ -9,6 +9,7 @@
 use PhpParser\NodeAbstract;
 use PHPStan\Analyser\ImpurePoint;
 use PHPStan\Analyser\StatementResult;
+use PHPStan\Type\Type;
 use function count;
 
 /**
@@ -33,6 +34,7 @@ public function __construct(
 		private StatementResult $statementResult,
 		private array $executionEnds,
 		private array $impurePoints,
+		private ?Type $passedToType,
 	)
 	{
 		parent::__construct($closureExpr->getAttributes());
@@ -84,6 +86,11 @@ public function returnsByRef(): bool
 		return $this->closureExpr->byRef;
 	}
 
+	public function getPassedToType(): ?Type
+	{
+		return $this->passedToType;
+	}
+
 	public function getType(): string
 	{
 		return 'PHPStan_Node_ClosureReturnStatementsNode';

src/Rules/Functions/ClosureReturnTypeRule.php

@@ -7,6 +7,7 @@
 use PHPStan\Node\ClosureReturnStatementsNode;
 use PHPStan\Rules\FunctionReturnTypeCheck;
 use PHPStan\Rules\Rule;
+use PHPStan\Type\CallableType;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeCombinator;
 
@@ -31,8 +32,13 @@ public function processNode(Node $node, Scope $scope): array
 			return [];
 		}
 
-		/** @var Type $returnType */
-		$returnType = $scope->getAnonymousFunctionReturnType();
+		if ($node->getPassedToType() instanceof CallableType) {
+			$returnType = $node->getPassedToType()->getReturnType();
+		} else {
+			/** @var Type $returnType */
+			$returnType = $scope->getAnonymousFunctionReturnType();
+		}
+
 		$containsNull = TypeCombinator::containsNull($returnType);
 		$hasNativeTypehint = $node->getClosureExpr()->returnType !== null;
 

tests/PHPStan/Rules/Functions/WeirdBugTest.php

@@ -6,6 +6,7 @@
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleLevelHelper;
 use PHPStan\Testing\RuleTestCase;
+use const PHP_VERSION_ID;
 
 /**
  * @extends RuleTestCase<ClosureReturnTypeRule>