resolveType in ClassConstFetchHandler

Author: ondrejmirtes

src/Analyser/ExprHandler/ClassConstFetchHandler.php

@@ -4,6 +4,7 @@
 
 use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\ClassConstFetch;
+use PhpParser\Node\Identifier;
 use PhpParser\Node\Stmt;
 use PHPStan\Analyser\ExpressionContext;
 use PHPStan\Analyser\ExpressionResult;
@@ -12,6 +13,9 @@
 use PHPStan\Analyser\MutatingScope;
 use PHPStan\Analyser\NodeScopeResolver;
 use PHPStan\DependencyInjection\AutowiredService;
+use PHPStan\Reflection\InitializerExprTypeResolver;
+use PHPStan\Type\MixedType;
+use PHPStan\Type\Type;
 use function array_merge;
 
 /**
@@ -21,11 +25,34 @@
 final class ClassConstFetchHandler implements ExprHandler
 {
 
+	public function __construct(
+		private InitializerExprTypeResolver $initializerExprTypeResolver,
+	)
+	{
+	}
+
 	public function supports(Expr $expr): bool
 	{
 		return $expr instanceof ClassConstFetch;
 	}
 
+	/**
+	 * @param ClassConstFetch $expr
+	 */
+	public function resolveType(MutatingScope $scope, Expr $expr): Type
+	{
+		if (!$expr->name instanceof Identifier) {
+			return new MixedType();
+		}
+
+		return $this->initializerExprTypeResolver->getClassConstFetchTypeByReflection(
+			$expr->class,
+			$expr->name->name,
+			$scope->isInClass() ? $scope->getClassReflection() : null,
+			static fn (Expr $e): Type => $scope->getType($e),
+		);
+	}
+
 	public function processExpr(NodeScopeResolver $nodeScopeResolver, Stmt $stmt, Expr $expr, MutatingScope $scope, ExpressionResultStorage $storage, callable $nodeCallback, ExpressionContext $context): ExpressionResult
 	{
 		$hasYield = false;

src/Analyser/MutatingScope.php

@@ -1154,16 +1154,6 @@ private function resolveType(string $exprString, Expr $node): Type
 			}
 
 			return new ErrorType();
-		} elseif ($node instanceof Node\Expr\ClassConstFetch && $node->name instanceof Node\Identifier) {
-			if ($this->hasExpressionType($node)->yes()) {
-				return $this->expressionTypes[$exprString]->getType();
-			}
-			return $this->initializerExprTypeResolver->getClassConstFetchTypeByReflection(
-				$node->class,
-				$node->name->name,
-				$this->isInClass() ? $this->getClassReflection() : null,
-				fn (Expr $expr): Type => $this->getType($expr),
-			);
 		}
 
 		if ($node instanceof MethodCall) {