resolveType in ConstFetchHandler

Author: ondrejmirtes

src/Analyser/ExprHandler/ConstFetchHandler.php

@@ -4,14 +4,21 @@
 
 use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\ConstFetch;
+use PhpParser\Node\Name\FullyQualified;
 use PhpParser\Node\Stmt;
+use PHPStan\Analyser\ConstantResolver;
 use PHPStan\Analyser\ExpressionContext;
 use PHPStan\Analyser\ExpressionResult;
 use PHPStan\Analyser\ExpressionResultStorage;
 use PHPStan\Analyser\ExprHandler;
 use PHPStan\Analyser\MutatingScope;
 use PHPStan\Analyser\NodeScopeResolver;
 use PHPStan\DependencyInjection\AutowiredService;
+use PHPStan\Type\Constant\ConstantBooleanType;
+use PHPStan\Type\ErrorType;
+use PHPStan\Type\NullType;
+use PHPStan\Type\Type;
+use function strtolower;
 
 /**
  * @implements ExprHandler<ConstFetch>
@@ -20,6 +27,12 @@
 final class ConstFetchHandler implements ExprHandler
 {
 
+	public function __construct(
+		private ConstantResolver $constantResolver,
+	)
+	{
+	}
+
 	public function supports(Expr $expr): bool
 	{
 		return $expr instanceof ConstFetch;
@@ -40,4 +53,46 @@ public function processExpr(NodeScopeResolver $nodeScopeResolver, Stmt $stmt, Ex
 		);
 	}
 
+	/**
+	 * @param ConstFetch $expr
+	 */
+	public function resolveType(MutatingScope $scope, Expr $expr): Type
+	{
+		$constName = (string) $expr->name;
+		$loweredConstName = strtolower($constName);
+		if ($loweredConstName === 'true') {
+			return new ConstantBooleanType(true);
+		} elseif ($loweredConstName === 'false') {
+			return new ConstantBooleanType(false);
+		} elseif ($loweredConstName === 'null') {
+			return new NullType();
+		}
+
+		$namespacedName = null;
+		if (!$expr->name->isFullyQualified() && $scope->getNamespace() !== null) {
+			$namespacedName = new FullyQualified([$scope->getNamespace(), $expr->name->toString()]);
+		}
+		$globalName = new FullyQualified($expr->name->toString());
+
+		foreach ([$namespacedName, $globalName] as $name) {
+			if ($name === null) {
+				continue;
+			}
+			$constFetch = new ConstFetch($name);
+			if ($scope->hasExpressionType($constFetch)->yes()) {
+				return $this->constantResolver->resolveConstantType(
+					$name->toString(),
+					$scope->expressionTypes[$scope->getNodeKey($constFetch)]->getType(),
+				);
+			}
+		}
+
+		$constantType = $this->constantResolver->resolveConstant($expr->name, $scope);
+		if ($constantType !== null) {
+			return $constantType;
+		}
+
+		return new ErrorType();
+	}
+
 }

src/Analyser/MutatingScope.php

@@ -220,7 +220,7 @@ public function __construct(
 		private bool $declareStrictTypes = false,
 		private PhpFunctionFromParserNodeReflection|null $function = null,
 		?string $namespace = null,
-		protected array $expressionTypes = [],
+		public array $expressionTypes = [],
 		protected array $nativeExpressionTypes = [],
 		protected array $conditionalExpressions = [],
 		protected array $inClosureBindScopeClasses = [],
@@ -1005,7 +1005,7 @@ public function getScopeNativeType(Expr $expr): Type
 		return $this->getNativeType($expr);
 	}
 
-	private function getNodeKey(Expr $node): string
+	public function getNodeKey(Expr $node): string
 	{
 		// perf optimize for the most common path
 		if ($node instanceof Variable && !$node->name instanceof Expr) {
@@ -1096,44 +1096,6 @@ private function resolveType(string $exprString, Expr $node): Type
 			return new NullType();
 		}
 
-		if ($node instanceof ConstFetch) {
-			$constName = (string) $node->name;
-			$loweredConstName = strtolower($constName);
-			if ($loweredConstName === 'true') {
-				return new ConstantBooleanType(true);
-			} elseif ($loweredConstName === 'false') {
-				return new ConstantBooleanType(false);
-			} elseif ($loweredConstName === 'null') {
-				return new NullType();
-			}
-
-			$namespacedName = null;
-			if (!$node->name->isFullyQualified() && $this->getNamespace() !== null) {
-				$namespacedName = new FullyQualified([$this->getNamespace(), $node->name->toString()]);
-			}
-			$globalName = new FullyQualified($node->name->toString());
-
-			foreach ([$namespacedName, $globalName] as $name) {
-				if ($name === null) {
-					continue;
-				}
-				$constFetch = new ConstFetch($name);
-				if ($this->hasExpressionType($constFetch)->yes()) {
-					return $this->constantResolver->resolveConstantType(
-						$name->toString(),
-						$this->expressionTypes[$this->getNodeKey($constFetch)]->getType(),
-					);
-				}
-			}
-
-			$constantType = $this->constantResolver->resolveConstant($node->name, $this);
-			if ($constantType !== null) {
-				return $constantType;
-			}
-
-			return new ErrorType();
-		}
-
 		if ($node instanceof MethodCall) {
 			$callType = $this->getMethodCallType($node);
 			if ($callType !== null) {