resolveType in closures handlers

Author: ondrejmirtes

src/Analyser/DirectInternalScopeFactory.php

@@ -34,7 +34,6 @@ public function __construct(
 		private TypeSpecifier $typeSpecifier,
 		private PropertyReflectionFinder $propertyReflectionFinder,
 		private Parser $parser,
-		private NodeScopeResolver $nodeScopeResolver,
 		private PhpVersion $phpVersion,
 		private AttributeReflectionFactory $attributeReflectionFactory,
 		private int|array|null $configPhpVersion,
@@ -80,7 +79,6 @@ public function create(
 			$this->typeSpecifier,
 			$this->propertyReflectionFinder,
 			$this->parser,
-			$this->nodeScopeResolver,
 			$this->constantResolver,
 			$context,
 			$this->phpVersion,
@@ -117,7 +115,6 @@ public function toFiberFactory(): InternalScopeFactory
 			$this->typeSpecifier,
 			$this->propertyReflectionFinder,
 			$this->parser,
-			$this->nodeScopeResolver,
 			$this->phpVersion,
 			$this->attributeReflectionFactory,
 			$this->configPhpVersion,
@@ -139,7 +136,6 @@ public function toMutatingFactory(): InternalScopeFactory
 			$this->typeSpecifier,
 			$this->propertyReflectionFinder,
 			$this->parser,
-			$this->nodeScopeResolver,
 			$this->phpVersion,
 			$this->attributeReflectionFactory,
 			$this->configPhpVersion,

src/Analyser/DirectInternalScopeFactoryFactory.php

@@ -30,7 +30,6 @@ public function __construct(
 		private TypeSpecifier $typeSpecifier,
 		private PropertyReflectionFinder $propertyReflectionFinder,
 		private Parser $parser,
-		private NodeScopeResolver $nodeScopeResolver,
 		private PhpVersion $phpVersion,
 		private AttributeReflectionFactory $attributeReflectionFactory,
 		private int|array|null $configPhpVersion,
@@ -54,7 +53,6 @@ public function create(?callable $nodeCallback): DirectInternalScopeFactory
 			$this->typeSpecifier,
 			$this->propertyReflectionFinder,
 			$this->parser,
-			$this->nodeScopeResolver,
 			$this->phpVersion,
 			$this->attributeReflectionFactory,
 			$this->configPhpVersion,

src/Analyser/ExprHandler/ArrowFunctionHandler.php

@@ -9,9 +9,11 @@
 use PHPStan\Analyser\ExpressionResult;
 use PHPStan\Analyser\ExpressionResultStorage;
 use PHPStan\Analyser\ExprHandler;
+use PHPStan\Analyser\ExprHandler\Helper\ClosureTypeResolver;
 use PHPStan\Analyser\MutatingScope;
 use PHPStan\Analyser\NodeScopeResolver;
 use PHPStan\DependencyInjection\AutowiredService;
+use PHPStan\Type\Type;
 
 /**
  * @implements ExprHandler<ArrowFunction>
@@ -20,6 +22,12 @@
 final class ArrowFunctionHandler implements ExprHandler
 {
 
+	public function __construct(
+		private ClosureTypeResolver $closureTypeResolver,
+	)
+	{
+	}
+
 	public function supports(Expr $expr): bool
 	{
 		return $expr instanceof ArrowFunction;
@@ -38,4 +46,12 @@ public function processExpr(NodeScopeResolver $nodeScopeResolver, Stmt $stmt, Ex
 		);
 	}
 
+	/**
+	 * @param ArrowFunction $expr
+	 */
+	public function resolveType(MutatingScope $scope, Expr $expr): Type
+	{
+		return $this->closureTypeResolver->getClosureType($scope, $expr);
+	}
+
 }

src/Analyser/ExprHandler/ClosureHandler.php

@@ -9,9 +9,11 @@
 use PHPStan\Analyser\ExpressionResult;
 use PHPStan\Analyser\ExpressionResultStorage;
 use PHPStan\Analyser\ExprHandler;
+use PHPStan\Analyser\ExprHandler\Helper\ClosureTypeResolver;
 use PHPStan\Analyser\MutatingScope;
 use PHPStan\Analyser\NodeScopeResolver;
 use PHPStan\DependencyInjection\AutowiredService;
+use PHPStan\Type\Type;
 
 /**
  * @implements ExprHandler<Closure>
@@ -20,6 +22,12 @@
 final class ClosureHandler implements ExprHandler
 {
 
+	public function __construct(
+		private ClosureTypeResolver $closureTypeResolver,
+	)
+	{
+	}
+
 	public function supports(Expr $expr): bool
 	{
 		return $expr instanceof Closure;
@@ -39,4 +47,12 @@ public function processExpr(NodeScopeResolver $nodeScopeResolver, Stmt $stmt, Ex
 		);
 	}
 
+	/**
+	 * @param Closure $expr
+	 */
+	public function resolveType(MutatingScope $scope, Expr $expr): Type
+	{
+		return $this->closureTypeResolver->getClosureType($scope, $expr);
+	}
+
 }