From f1f2e3e336f1070c52d2b40e0175bc43b7fecb69 Mon Sep 17 00:00:00 2001
From: Markus Staab <maggus.staab@googlemail.com>
Date: Sun, 28 Dec 2025 11:03:10 +0100
Subject: [PATCH 1/3] Don't store scalar values in resolvedTypes

---
 src/Analyser/MutatingScope.php | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/Analyser/MutatingScope.php b/src/Analyser/MutatingScope.php
index 721f483ece..ad95b34af3 100644
--- a/src/Analyser/MutatingScope.php
+++ b/src/Analyser/MutatingScope.php
@@ -797,6 +797,19 @@ public function getAnonymousFunctionReturnType(): ?Type
 	/** @api */
 	public function getType(Expr $node): Type
 	{
+		if ($node instanceof Node\Scalar\Int_) {
+			return $this->initializerExprTypeResolver->getType($node, InitializerExprContext::fromScope($this));
+		} elseif ($node instanceof String_) {
+			return $this->initializerExprTypeResolver->getType($node, InitializerExprContext::fromScope($this));
+		} elseif ($node instanceof Node\Scalar\Float_) {
+			return $this->initializerExprTypeResolver->getType($node, InitializerExprContext::fromScope($this));
+		} elseif ($node instanceof ConstFetch) {
+			$loweredConstName = strtolower($node->name->toString());
+			if (in_array($loweredConstName, ['true', 'false', 'null'], true)) {
+				return $this->initializerExprTypeResolver->getType($node, InitializerExprContext::fromScope($this));
+			}
+		}
+
 		if ($node instanceof GetIterableKeyTypeExpr) {
 			return $this->getIterableKeyType($this->getType($node->getExpr()));
 		}
@@ -1295,11 +1308,7 @@ private function resolveType(string $exprString, Expr $node): Type
 			});
 		}
 
-		if ($node instanceof Node\Scalar\Int_) {
-			return $this->initializerExprTypeResolver->getType($node, InitializerExprContext::fromScope($this));
-		} elseif ($node instanceof String_) {
-			return $this->initializerExprTypeResolver->getType($node, InitializerExprContext::fromScope($this));
-		} elseif ($node instanceof Node\Scalar\InterpolatedString) {
+		if ($node instanceof Node\Scalar\InterpolatedString) {
 			$resultType = null;
 			foreach ($node->parts as $part) {
 				if ($part instanceof InterpolatedStringPart) {
@@ -1316,8 +1325,6 @@ private function resolveType(string $exprString, Expr $node): Type
 			}
 
 			return $resultType ?? new ConstantStringType('');
-		} elseif ($node instanceof Node\Scalar\Float_) {
-			return $this->initializerExprTypeResolver->getType($node, InitializerExprContext::fromScope($this));
 		} elseif ($node instanceof Expr\CallLike && $node->isFirstClassCallable()) {
 			if ($node instanceof FuncCall && $node->name instanceof Expr) {
 				$callableType = $this->getType($node->name);

From a1a8c1c2ba9baea1a5bc9de99baff0c9a524fed6 Mon Sep 17 00:00:00 2001
From: Markus Staab <maggus.staab@googlemail.com>
Date: Sun, 28 Dec 2025 11:23:47 +0100
Subject: [PATCH 2/3] Update MutatingScope.php

---
 src/Analyser/MutatingScope.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Analyser/MutatingScope.php b/src/Analyser/MutatingScope.php
index ad95b34af3..79d36541af 100644
--- a/src/Analyser/MutatingScope.php
+++ b/src/Analyser/MutatingScope.php
@@ -803,6 +803,8 @@ public function getType(Expr $node): Type
 			return $this->initializerExprTypeResolver->getType($node, InitializerExprContext::fromScope($this));
 		} elseif ($node instanceof Node\Scalar\Float_) {
 			return $this->initializerExprTypeResolver->getType($node, InitializerExprContext::fromScope($this));
+		} elseif ($node instanceof Expr\UnaryMinus && $node->expr instanceof Node\Scalar) {
+			return $this->initializerExprTypeResolver->getType($node, InitializerExprContext::fromScope($this));
 		} elseif ($node instanceof ConstFetch) {
 			$loweredConstName = strtolower($node->name->toString());
 			if (in_array($loweredConstName, ['true', 'false', 'null'], true)) {

From 0c1bb0ffa84944233e4efb4a909d53233ddaee3e Mon Sep 17 00:00:00 2001
From: Markus Staab <maggus.staab@googlemail.com>
Date: Sun, 28 Dec 2025 11:26:03 +0100
Subject: [PATCH 3/3] Update MutatingScope.php

---
 src/Analyser/MutatingScope.php | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/Analyser/MutatingScope.php b/src/Analyser/MutatingScope.php
index 79d36541af..d1162ce2f3 100644
--- a/src/Analyser/MutatingScope.php
+++ b/src/Analyser/MutatingScope.php
@@ -2048,16 +2048,6 @@ static function (Node $node, Scope $scope) use ($arrowScope, &$arrowFunctionImpu
 		}
 
 		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()]);