From a2aeea1654146a8ea711b8996ad3b9d7916ae005 Mon Sep 17 00:00:00 2001
From: Markus Staab <maggus.staab@googlemail.com>
Date: Mon, 25 Nov 2024 14:20:56 +0100
Subject: [PATCH] fix

---
 src/Analyser/MutatingScope.php | 40 +++++++++++++++++++++++-----------
 1 file changed, 27 insertions(+), 13 deletions(-)

diff --git a/src/Analyser/MutatingScope.php b/src/Analyser/MutatingScope.php
index b7a2bacd9..cadd4761f 100644
--- a/src/Analyser/MutatingScope.php
+++ b/src/Analyser/MutatingScope.php
@@ -610,12 +610,7 @@ public function hasConstant(Name $name): bool
 			return $this->fileHasCompilerHaltStatementCalls();
 		}
 
-		if (!$name->isFullyQualified() && $this->getNamespace() !== null) {
-			if ($this->hasExpressionType(new ConstFetch(new FullyQualified([$this->getNamespace(), $name->toString()])))->yes()) {
-				return true;
-			}
-		}
-		if ($this->hasExpressionType(new ConstFetch(new FullyQualified($name->toString())))->yes()) {
+		if ($this->getGlobalConstantType($name) !== null) {
 			return true;
 		}
 
@@ -5686,6 +5681,25 @@ private function getConstantTypes(): array
 		return $constantTypes;
 	}
 
+	private function getGlobalConstantType(Name $name): ?Type
+	{
+		$fetches = [];
+		if (!$name->isFullyQualified() && $this->getNamespace() !== null) {
+			$fetches[] = new ConstFetch(new FullyQualified([$this->getNamespace(), $name->toString()]));
+		}
+
+		$fetches[] = new ConstFetch(new FullyQualified($name->toString()));
+		$fetches[] = new ConstFetch($name);
+
+		foreach($fetches as $constFetch) {
+			if ($this->hasExpressionType($constFetch)->yes()) {
+				return $this->getType($constFetch);
+			}
+		}
+
+		return null;
+	}
+
 	/**
 	 * @return array<string, ExpressionTypeHolder>
 	 */
@@ -5728,15 +5742,15 @@ public function getIterableValueType(Type $iteratee): Type
 
 	public function getPhpVersion(): PhpVersions
 	{
-		$name = new Name('PHP_VERSION_ID');
-		if (!$this->hasConstant($name)) {
-			if (is_array($this->configPhpVersion)) {
-				return new PhpVersions(IntegerRangeType::fromInterval($this->configPhpVersion['min'], $this->configPhpVersion['max']));
-			}
-			return new PhpVersions(new ConstantIntegerType($this->phpVersion->getVersionId()));
+		$constType = $this->getGlobalConstantType(new Name('PHP_VERSION_ID'));
+		if ($constType !== null) {
+			return new PhpVersions($constType);
 		}
 
-		return new PhpVersions($this->getType(new ConstFetch($name)));
+		if (is_array($this->configPhpVersion)) {
+			return new PhpVersions(IntegerRangeType::fromInterval($this->configPhpVersion['min'], $this->configPhpVersion['max']));
+		}
+		return new PhpVersions(new ConstantIntegerType($this->phpVersion->getVersionId()));
 	}
 
 }