From eab37889d83b1d304826c0ec2cdc5b675ab56a11 Mon Sep 17 00:00:00 2001
From: Vincent Langlet <vincentlanglet@hotmail.fr>
Date: Wed, 25 Sep 2024 00:22:53 +0200
Subject: [PATCH 1/7] Add PhpVersion param

---
 src/Analyser/MutatingScope.php                       |  4 ++--
 src/Reflection/InitializerExprTypeResolver.php       |  4 ++--
 src/Type/CompoundType.php                            |  3 ++-
 src/Type/Enum/EnumCaseObjectType.php                 |  3 ++-
 src/Type/IntegerRangeType.php                        | 12 ++++++------
 src/Type/IntersectionType.php                        |  8 ++++----
 src/Type/NullType.php                                |  4 ++--
 src/Type/Traits/ConstantScalarTypeTrait.php          |  4 ++--
 src/Type/Traits/LateResolvableTypeTrait.php          | 10 +++++-----
 .../Traits/UndecidedComparisonCompoundTypeTrait.php  |  3 ++-
 src/Type/Traits/UndecidedComparisonTypeTrait.php     |  3 ++-
 src/Type/Type.php                                    |  2 +-
 src/Type/UnionType.php                               |  8 ++++----
 .../Api/data/class-implements-out-of-phpstan.php     |  3 ++-
 14 files changed, 38 insertions(+), 33 deletions(-)

diff --git a/src/Analyser/MutatingScope.php b/src/Analyser/MutatingScope.php
index 0e2ead8dde..a9d4802036 100644
--- a/src/Analyser/MutatingScope.php
+++ b/src/Analyser/MutatingScope.php
@@ -751,7 +751,7 @@ private function resolveType(string $exprString, Expr $node): Type
 		}
 
 		if ($node instanceof Expr\BinaryOp\SmallerOrEqual) {
-			return $this->getType($node->left)->isSmallerThanOrEqual($this->getType($node->right))->toBooleanType();
+			return $this->getType($node->left)->isSmallerThanOrEqual($this->getType($node->right), $this->phpVersion)->toBooleanType();
 		}
 
 		if ($node instanceof Expr\BinaryOp\Greater) {
@@ -759,7 +759,7 @@ private function resolveType(string $exprString, Expr $node): Type
 		}
 
 		if ($node instanceof Expr\BinaryOp\GreaterOrEqual) {
-			return $this->getType($node->right)->isSmallerThanOrEqual($this->getType($node->left))->toBooleanType();
+			return $this->getType($node->right)->isSmallerThanOrEqual($this->getType($node->left), $this->phpVersion)->toBooleanType();
 		}
 
 		if ($node instanceof Expr\BinaryOp\Equal) {
diff --git a/src/Reflection/InitializerExprTypeResolver.php b/src/Reflection/InitializerExprTypeResolver.php
index b4beb587bf..709210276c 100644
--- a/src/Reflection/InitializerExprTypeResolver.php
+++ b/src/Reflection/InitializerExprTypeResolver.php
@@ -320,7 +320,7 @@ public function getType(Expr $expr, InitializerExprContext $context): Type
 		}
 
 		if ($expr instanceof Expr\BinaryOp\SmallerOrEqual) {
-			return $this->getType($expr->left, $context)->isSmallerThanOrEqual($this->getType($expr->right, $context))->toBooleanType();
+			return $this->getType($expr->left, $context)->isSmallerThanOrEqual($this->getType($expr->right, $context), $this->phpVersion)->toBooleanType();
 		}
 
 		if ($expr instanceof Expr\BinaryOp\Greater) {
@@ -328,7 +328,7 @@ public function getType(Expr $expr, InitializerExprContext $context): Type
 		}
 
 		if ($expr instanceof Expr\BinaryOp\GreaterOrEqual) {
-			return $this->getType($expr->right, $context)->isSmallerThanOrEqual($this->getType($expr->left, $context))->toBooleanType();
+			return $this->getType($expr->right, $context)->isSmallerThanOrEqual($this->getType($expr->left, $context), $this->phpVersion)->toBooleanType();
 		}
 
 		if ($expr instanceof Expr\BinaryOp\LogicalXor) {
diff --git a/src/Type/CompoundType.php b/src/Type/CompoundType.php
index ea9b2f4660..1c8f66e288 100644
--- a/src/Type/CompoundType.php
+++ b/src/Type/CompoundType.php
@@ -2,6 +2,7 @@
 
 namespace PHPStan\Type;
 
+use PHPStan\Php\PhpVersion;
 use PHPStan\TrinaryLogic;
 
 /** @api */
@@ -16,6 +17,6 @@ public function isAcceptedWithReasonBy(Type $acceptingType, bool $strictTypes):
 
 	public function isGreaterThan(Type $otherType): TrinaryLogic;
 
-	public function isGreaterThanOrEqual(Type $otherType): TrinaryLogic;
+	public function isGreaterThanOrEqual(Type $otherType, PhpVersion $phpVersion): TrinaryLogic;
 
 }
diff --git a/src/Type/Enum/EnumCaseObjectType.php b/src/Type/Enum/EnumCaseObjectType.php
index 42d8f4afc2..ef25ef3756 100644
--- a/src/Type/Enum/EnumCaseObjectType.php
+++ b/src/Type/Enum/EnumCaseObjectType.php
@@ -2,6 +2,7 @@
 
 namespace PHPStan\Type\Enum;
 
+use PHPStan\Php\PhpVersion;
 use PHPStan\PhpDocParser\Ast\ConstExpr\ConstFetchNode;
 use PHPStan\PhpDocParser\Ast\Type\ConstTypeNode;
 use PHPStan\PhpDocParser\Ast\Type\TypeNode;
@@ -184,7 +185,7 @@ public function isSmallerThan(Type $otherType): TrinaryLogic
 		return TrinaryLogic::createNo();
 	}
 
-	public function isSmallerThanOrEqual(Type $otherType): TrinaryLogic
+	public function isSmallerThanOrEqual(Type $otherType, PhpVersion $phpVersion): TrinaryLogic
 	{
 		return TrinaryLogic::createNo();
 	}
diff --git a/src/Type/IntegerRangeType.php b/src/Type/IntegerRangeType.php
index 534be0ebbb..bd99be045b 100644
--- a/src/Type/IntegerRangeType.php
+++ b/src/Type/IntegerRangeType.php
@@ -325,18 +325,18 @@ public function isSmallerThan(Type $otherType): TrinaryLogic
 		return TrinaryLogic::extremeIdentity($minIsSmaller, $maxIsSmaller);
 	}
 
-	public function isSmallerThanOrEqual(Type $otherType): TrinaryLogic
+	public function isSmallerThanOrEqual(Type $otherType, PhpVersion $phpVersion): TrinaryLogic
 	{
 		if ($this->min === null) {
 			$minIsSmaller = TrinaryLogic::createYes();
 		} else {
-			$minIsSmaller = (new ConstantIntegerType($this->min))->isSmallerThanOrEqual($otherType);
+			$minIsSmaller = (new ConstantIntegerType($this->min))->isSmallerThanOrEqual($otherType, $phpVersion);
 		}
 
 		if ($this->max === null) {
 			$maxIsSmaller = TrinaryLogic::createNo();
 		} else {
-			$maxIsSmaller = (new ConstantIntegerType($this->max))->isSmallerThanOrEqual($otherType);
+			$maxIsSmaller = (new ConstantIntegerType($this->max))->isSmallerThanOrEqual($otherType, $phpVersion);
 		}
 
 		return TrinaryLogic::extremeIdentity($minIsSmaller, $maxIsSmaller);
@@ -359,18 +359,18 @@ public function isGreaterThan(Type $otherType): TrinaryLogic
 		return TrinaryLogic::extremeIdentity($minIsSmaller, $maxIsSmaller);
 	}
 
-	public function isGreaterThanOrEqual(Type $otherType): TrinaryLogic
+	public function isGreaterThanOrEqual(Type $otherType, PhpVersion $phpVersion): TrinaryLogic
 	{
 		if ($this->min === null) {
 			$minIsSmaller = TrinaryLogic::createNo();
 		} else {
-			$minIsSmaller = $otherType->isSmallerThanOrEqual((new ConstantIntegerType($this->min)));
+			$minIsSmaller = $otherType->isSmallerThanOrEqual((new ConstantIntegerType($this->min)), $phpVersion);
 		}
 
 		if ($this->max === null) {
 			$maxIsSmaller = TrinaryLogic::createYes();
 		} else {
-			$maxIsSmaller = $otherType->isSmallerThanOrEqual((new ConstantIntegerType($this->max)));
+			$maxIsSmaller = $otherType->isSmallerThanOrEqual((new ConstantIntegerType($this->max)), $phpVersion);
 		}
 
 		return TrinaryLogic::extremeIdentity($minIsSmaller, $maxIsSmaller);
diff --git a/src/Type/IntersectionType.php b/src/Type/IntersectionType.php
index 8bf38bddda..2f9b18a20f 100644
--- a/src/Type/IntersectionType.php
+++ b/src/Type/IntersectionType.php
@@ -807,9 +807,9 @@ public function isSmallerThan(Type $otherType): TrinaryLogic
 		return $this->intersectResults(static fn (Type $type): TrinaryLogic => $type->isSmallerThan($otherType));
 	}
 
-	public function isSmallerThanOrEqual(Type $otherType): TrinaryLogic
+	public function isSmallerThanOrEqual(Type $otherType, PhpVersion $phpVersion): TrinaryLogic
 	{
-		return $this->intersectResults(static fn (Type $type): TrinaryLogic => $type->isSmallerThanOrEqual($otherType));
+		return $this->intersectResults(static fn (Type $type): TrinaryLogic => $type->isSmallerThanOrEqual($otherType, $phpVersion));
 	}
 
 	public function isNull(): TrinaryLogic
@@ -881,9 +881,9 @@ public function isGreaterThan(Type $otherType): TrinaryLogic
 		return $this->intersectResults(static fn (Type $type): TrinaryLogic => $otherType->isSmallerThan($type));
 	}
 
-	public function isGreaterThanOrEqual(Type $otherType): TrinaryLogic
+	public function isGreaterThanOrEqual(Type $otherType, PhpVersion $phpVersion): TrinaryLogic
 	{
-		return $this->intersectResults(static fn (Type $type): TrinaryLogic => $otherType->isSmallerThanOrEqual($type));
+		return $this->intersectResults(static fn (Type $type): TrinaryLogic => $otherType->isSmallerThanOrEqual($type, $phpVersion));
 	}
 
 	public function getSmallerType(): Type
diff --git a/src/Type/NullType.php b/src/Type/NullType.php
index a59f86e868..87388fa444 100644
--- a/src/Type/NullType.php
+++ b/src/Type/NullType.php
@@ -121,14 +121,14 @@ public function isSmallerThan(Type $otherType): TrinaryLogic
 		return TrinaryLogic::createMaybe();
 	}
 
-	public function isSmallerThanOrEqual(Type $otherType): TrinaryLogic
+	public function isSmallerThanOrEqual(Type $otherType, PhpVersion $phpVersion): TrinaryLogic
 	{
 		if ($otherType instanceof ConstantScalarType) {
 			return TrinaryLogic::createFromBoolean(null <= $otherType->getValue());
 		}
 
 		if ($otherType instanceof CompoundType) {
-			return $otherType->isGreaterThanOrEqual($this);
+			return $otherType->isGreaterThanOrEqual($this, $phpVersion);
 		}
 
 		return TrinaryLogic::createMaybe();
diff --git a/src/Type/Traits/ConstantScalarTypeTrait.php b/src/Type/Traits/ConstantScalarTypeTrait.php
index 527d10b68a..315192c373 100644
--- a/src/Type/Traits/ConstantScalarTypeTrait.php
+++ b/src/Type/Traits/ConstantScalarTypeTrait.php
@@ -91,14 +91,14 @@ public function isSmallerThan(Type $otherType): TrinaryLogic
 		return TrinaryLogic::createMaybe();
 	}
 
-	public function isSmallerThanOrEqual(Type $otherType): TrinaryLogic
+	public function isSmallerThanOrEqual(Type $otherType, PhpVersion $phpVersion): TrinaryLogic
 	{
 		if ($otherType instanceof ConstantScalarType) {
 			return TrinaryLogic::createFromBoolean($this->value <= $otherType->getValue());
 		}
 
 		if ($otherType instanceof CompoundType) {
-			return $otherType->isGreaterThanOrEqual($this);
+			return $otherType->isGreaterThanOrEqual($this, $phpVersion);
 		}
 
 		return TrinaryLogic::createMaybe();
diff --git a/src/Type/Traits/LateResolvableTypeTrait.php b/src/Type/Traits/LateResolvableTypeTrait.php
index bff88f730e..96c06e29f9 100644
--- a/src/Type/Traits/LateResolvableTypeTrait.php
+++ b/src/Type/Traits/LateResolvableTypeTrait.php
@@ -372,9 +372,9 @@ public function isSmallerThan(Type $otherType): TrinaryLogic
 		return $this->resolve()->isSmallerThan($otherType);
 	}
 
-	public function isSmallerThanOrEqual(Type $otherType): TrinaryLogic
+	public function isSmallerThanOrEqual(Type $otherType, PhpVersion $phpVersion): TrinaryLogic
 	{
-		return $this->resolve()->isSmallerThanOrEqual($otherType);
+		return $this->resolve()->isSmallerThanOrEqual($otherType, $phpVersion);
 	}
 
 	public function isNull(): TrinaryLogic
@@ -550,15 +550,15 @@ public function isGreaterThan(Type $otherType): TrinaryLogic
 		return $otherType->isSmallerThan($result);
 	}
 
-	public function isGreaterThanOrEqual(Type $otherType): TrinaryLogic
+	public function isGreaterThanOrEqual(Type $otherType, PhpVersion $phpVersion): TrinaryLogic
 	{
 		$result = $this->resolve();
 
 		if ($result instanceof CompoundType) {
-			return $result->isGreaterThanOrEqual($otherType);
+			return $result->isGreaterThanOrEqual($otherType, $phpVersion);
 		}
 
-		return $otherType->isSmallerThanOrEqual($result);
+		return $otherType->isSmallerThanOrEqual($result, $phpVersion);
 	}
 
 	public function exponentiate(Type $exponent): Type
diff --git a/src/Type/Traits/UndecidedComparisonCompoundTypeTrait.php b/src/Type/Traits/UndecidedComparisonCompoundTypeTrait.php
index e40b72fad4..38a8a57c92 100644
--- a/src/Type/Traits/UndecidedComparisonCompoundTypeTrait.php
+++ b/src/Type/Traits/UndecidedComparisonCompoundTypeTrait.php
@@ -2,6 +2,7 @@
 
 namespace PHPStan\Type\Traits;
 
+use PHPStan\Php\PhpVersion;
 use PHPStan\TrinaryLogic;
 use PHPStan\Type\Type;
 
@@ -15,7 +16,7 @@ public function isGreaterThan(Type $otherType): TrinaryLogic
 		return TrinaryLogic::createMaybe();
 	}
 
-	public function isGreaterThanOrEqual(Type $otherType): TrinaryLogic
+	public function isGreaterThanOrEqual(Type $otherType, PhpVersion $phpVersion): TrinaryLogic
 	{
 		return TrinaryLogic::createMaybe();
 	}
diff --git a/src/Type/Traits/UndecidedComparisonTypeTrait.php b/src/Type/Traits/UndecidedComparisonTypeTrait.php
index e5c6d2c891..339eef60fd 100644
--- a/src/Type/Traits/UndecidedComparisonTypeTrait.php
+++ b/src/Type/Traits/UndecidedComparisonTypeTrait.php
@@ -2,6 +2,7 @@
 
 namespace PHPStan\Type\Traits;
 
+use PHPStan\Php\PhpVersion;
 use PHPStan\TrinaryLogic;
 use PHPStan\Type\MixedType;
 use PHPStan\Type\Type;
@@ -14,7 +15,7 @@ public function isSmallerThan(Type $otherType): TrinaryLogic
 		return TrinaryLogic::createMaybe();
 	}
 
-	public function isSmallerThanOrEqual(Type $otherType): TrinaryLogic
+	public function isSmallerThanOrEqual(Type $otherType, PhpVersion $phpVersion): TrinaryLogic
 	{
 		return TrinaryLogic::createMaybe();
 	}
diff --git a/src/Type/Type.php b/src/Type/Type.php
index 727e2f8a31..9d09f1a30f 100644
--- a/src/Type/Type.php
+++ b/src/Type/Type.php
@@ -217,7 +217,7 @@ public function toArrayKey(): Type;
 
 	public function isSmallerThan(Type $otherType): TrinaryLogic;
 
-	public function isSmallerThanOrEqual(Type $otherType): TrinaryLogic;
+	public function isSmallerThanOrEqual(Type $otherType, PhpVersion $phpVersion): TrinaryLogic;
 
 	/**
 	 * Is Type of a known constant value? Includes literal strings, integers, floats, true, false, null, and array shapes.
diff --git a/src/Type/UnionType.php b/src/Type/UnionType.php
index af4ede1b40..70da0cec06 100644
--- a/src/Type/UnionType.php
+++ b/src/Type/UnionType.php
@@ -788,9 +788,9 @@ public function isSmallerThan(Type $otherType): TrinaryLogic
 		return $this->notBenevolentUnionResults(static fn (Type $type): TrinaryLogic => $type->isSmallerThan($otherType));
 	}
 
-	public function isSmallerThanOrEqual(Type $otherType): TrinaryLogic
+	public function isSmallerThanOrEqual(Type $otherType, PhpVersion $phpVersion): TrinaryLogic
 	{
-		return $this->notBenevolentUnionResults(static fn (Type $type): TrinaryLogic => $type->isSmallerThanOrEqual($otherType));
+		return $this->notBenevolentUnionResults(static fn (Type $type): TrinaryLogic => $type->isSmallerThanOrEqual($otherType, $phpVersion));
 	}
 
 	public function isNull(): TrinaryLogic
@@ -868,9 +868,9 @@ public function isGreaterThan(Type $otherType): TrinaryLogic
 		return $this->notBenevolentUnionResults(static fn (Type $type): TrinaryLogic => $otherType->isSmallerThan($type));
 	}
 
-	public function isGreaterThanOrEqual(Type $otherType): TrinaryLogic
+	public function isGreaterThanOrEqual(Type $otherType, PhpVersion $phpVersion): TrinaryLogic
 	{
-		return $this->notBenevolentUnionResults(static fn (Type $type): TrinaryLogic => $otherType->isSmallerThanOrEqual($type));
+		return $this->notBenevolentUnionResults(static fn (Type $type): TrinaryLogic => $otherType->isSmallerThanOrEqual($type, $phpVersion));
 	}
 
 	public function toBoolean(): BooleanType
diff --git a/tests/PHPStan/Rules/Api/data/class-implements-out-of-phpstan.php b/tests/PHPStan/Rules/Api/data/class-implements-out-of-phpstan.php
index c7b42d7e6e..4334ca15fc 100644
--- a/tests/PHPStan/Rules/Api/data/class-implements-out-of-phpstan.php
+++ b/tests/PHPStan/Rules/Api/data/class-implements-out-of-phpstan.php
@@ -5,6 +5,7 @@
 use PhpParser\Node\Expr\FuncCall;
 use PHPStan\Analyser\Scope;
 use PHPStan\DependencyInjection\Type\DynamicThrowTypeExtensionProvider;
+use PHPStan\Php\PhpVersion;
 use PHPStan\Reflection\ClassMemberAccessAnswerer;
 use PHPStan\Reflection\ExtendedMethodReflection;
 use PHPStan\Reflection\FunctionReflection;
@@ -252,7 +253,7 @@ public function isSmallerThan(Type $otherType): \PHPStan\TrinaryLogic
 		// TODO: Implement isSmallerThan() method.
 	}
 
-	public function isSmallerThanOrEqual(Type $otherType): \PHPStan\TrinaryLogic
+	public function isSmallerThanOrEqual(Type $otherType, PhpVersion $phpVersion): \PHPStan\TrinaryLogic
 	{
 		// TODO: Implement isSmallerThanOrEqual() method.
 	}

From 29f701dfca3a512d0cb63af39696e0b2e36fcc64 Mon Sep 17 00:00:00 2001
From: Vincent Langlet <vincentlanglet@hotmail.fr>
Date: Wed, 25 Sep 2024 00:28:28 +0200
Subject: [PATCH 2/7] Update test

---
 .../PHPStan/Rules/Api/ApiClassImplementsRuleTest.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/PHPStan/Rules/Api/ApiClassImplementsRuleTest.php b/tests/PHPStan/Rules/Api/ApiClassImplementsRuleTest.php
index a6a68a9b5e..f2b13d25c2 100644
--- a/tests/PHPStan/Rules/Api/ApiClassImplementsRuleTest.php
+++ b/tests/PHPStan/Rules/Api/ApiClassImplementsRuleTest.php
@@ -32,32 +32,32 @@ public function testRuleOutOfPhpStan(): void
 		$this->analyse([__DIR__ . '/data/class-implements-out-of-phpstan.php'], [
 			[
 				'Implementing PHPStan\DependencyInjection\Type\DynamicThrowTypeExtensionProvider is not covered by backward compatibility promise. The interface might change in a minor PHPStan version.',
-				19,
+				20,
 				$tip,
 			],
 			[
 				'Implementing PHPStan\Type\Type is not covered by backward compatibility promise. The interface might change in a minor PHPStan version.',
-				53,
+				54,
 				$tip,
 			],
 			[
 				'Implementing PHPStan\Reflection\ReflectionProvider is not covered by backward compatibility promise. The interface might change in a minor PHPStan version.',
-				338,
+				339,
 				$tip,
 			],
 			[
 				'Implementing PHPStan\Analyser\Scope is not covered by backward compatibility promise. The interface might change in a minor PHPStan version.',
-				343,
+				344,
 				$tip,
 			],
 			[
 				'Implementing PHPStan\Reflection\FunctionReflection is not covered by backward compatibility promise. The interface might change in a minor PHPStan version.',
-				348,
+				349,
 				$tip,
 			],
 			[
 				'Implementing PHPStan\Reflection\ExtendedMethodReflection is not covered by backward compatibility promise. The interface might change in a minor PHPStan version.',
-				352,
+				353,
 				$tip,
 			],
 		]);

From d893ba04eb044e7a071be2dfa283416c41bcbc71 Mon Sep 17 00:00:00 2001
From: Vincent Langlet <vincentlanglet@hotmail.fr>
Date: Wed, 25 Sep 2024 10:57:27 +0200
Subject: [PATCH 3/7] More

---
 src/Analyser/MutatingScope.php                     |  4 ++--
 src/Reflection/InitializerExprTypeResolver.php     |  4 ++--
 src/Rules/Functions/RandomIntParametersRule.php    | 10 +++++++---
 src/Type/CompoundType.php                          |  2 +-
 src/Type/Enum/EnumCaseObjectType.php               |  2 +-
 src/Type/IntegerRangeType.php                      | 14 +++++++-------
 src/Type/IntersectionType.php                      |  8 ++++----
 src/Type/NullType.php                              |  4 ++--
 src/Type/Traits/ConstantScalarTypeTrait.php        |  4 ++--
 src/Type/Traits/LateResolvableTypeTrait.php        | 10 +++++-----
 .../UndecidedComparisonCompoundTypeTrait.php       |  2 +-
 src/Type/Traits/UndecidedComparisonTypeTrait.php   |  2 +-
 src/Type/Type.php                                  |  2 +-
 src/Type/UnionType.php                             |  8 ++++----
 .../Api/data/class-implements-out-of-phpstan.php   |  2 +-
 15 files changed, 41 insertions(+), 37 deletions(-)

diff --git a/src/Analyser/MutatingScope.php b/src/Analyser/MutatingScope.php
index a9d4802036..2c9ef02f75 100644
--- a/src/Analyser/MutatingScope.php
+++ b/src/Analyser/MutatingScope.php
@@ -747,7 +747,7 @@ private function resolveType(string $exprString, Expr $node): Type
 		}
 
 		if ($node instanceof Expr\BinaryOp\Smaller) {
-			return $this->getType($node->left)->isSmallerThan($this->getType($node->right))->toBooleanType();
+			return $this->getType($node->left)->isSmallerThan($this->getType($node->right), $this->phpVersion)->toBooleanType();
 		}
 
 		if ($node instanceof Expr\BinaryOp\SmallerOrEqual) {
@@ -755,7 +755,7 @@ private function resolveType(string $exprString, Expr $node): Type
 		}
 
 		if ($node instanceof Expr\BinaryOp\Greater) {
-			return $this->getType($node->right)->isSmallerThan($this->getType($node->left))->toBooleanType();
+			return $this->getType($node->right)->isSmallerThan($this->getType($node->left), $this->phpVersion)->toBooleanType();
 		}
 
 		if ($node instanceof Expr\BinaryOp\GreaterOrEqual) {
diff --git a/src/Reflection/InitializerExprTypeResolver.php b/src/Reflection/InitializerExprTypeResolver.php
index 709210276c..fdb3344d69 100644
--- a/src/Reflection/InitializerExprTypeResolver.php
+++ b/src/Reflection/InitializerExprTypeResolver.php
@@ -316,7 +316,7 @@ public function getType(Expr $expr, InitializerExprContext $context): Type
 		}
 
 		if ($expr instanceof Expr\BinaryOp\Smaller) {
-			return $this->getType($expr->left, $context)->isSmallerThan($this->getType($expr->right, $context))->toBooleanType();
+			return $this->getType($expr->left, $context)->isSmallerThan($this->getType($expr->right, $context), $this->phpVersion)->toBooleanType();
 		}
 
 		if ($expr instanceof Expr\BinaryOp\SmallerOrEqual) {
@@ -324,7 +324,7 @@ public function getType(Expr $expr, InitializerExprContext $context): Type
 		}
 
 		if ($expr instanceof Expr\BinaryOp\Greater) {
-			return $this->getType($expr->right, $context)->isSmallerThan($this->getType($expr->left, $context))->toBooleanType();
+			return $this->getType($expr->right, $context)->isSmallerThan($this->getType($expr->left, $context), $this->phpVersion)->toBooleanType();
 		}
 
 		if ($expr instanceof Expr\BinaryOp\GreaterOrEqual) {
diff --git a/src/Rules/Functions/RandomIntParametersRule.php b/src/Rules/Functions/RandomIntParametersRule.php
index ecca6e7d09..fba4327729 100644
--- a/src/Rules/Functions/RandomIntParametersRule.php
+++ b/src/Rules/Functions/RandomIntParametersRule.php
@@ -5,6 +5,7 @@
 use PhpParser\Node;
 use PhpParser\Node\Expr\FuncCall;
 use PHPStan\Analyser\Scope;
+use PHPStan\Php\PhpVersion;
 use PHPStan\Reflection\ReflectionProvider;
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleErrorBuilder;
@@ -21,8 +22,11 @@
 final class RandomIntParametersRule implements Rule
 {
 
-	public function __construct(private ReflectionProvider $reflectionProvider, private bool $reportMaybes)
-	{
+	public function __construct(
+		private ReflectionProvider $reflectionProvider,
+		private PhpVersion $phpVersion,
+		private bool $reportMaybes
+	) {
 	}
 
 	public function getNodeType(): string
@@ -55,7 +59,7 @@ public function processNode(Node $node, Scope $scope): array
 			return [];
 		}
 
-		$isSmaller = $maxType->isSmallerThan($minType);
+		$isSmaller = $maxType->isSmallerThan($minType, $this->phpVersion);
 
 		if ($isSmaller->yes() || $isSmaller->maybe() && $this->reportMaybes) {
 			$message = 'Parameter #1 $min (%s) of function random_int expects lower number than parameter #2 $max (%s).';
diff --git a/src/Type/CompoundType.php b/src/Type/CompoundType.php
index 1c8f66e288..775a4eb50f 100644
--- a/src/Type/CompoundType.php
+++ b/src/Type/CompoundType.php
@@ -15,7 +15,7 @@ public function isAcceptedBy(Type $acceptingType, bool $strictTypes): TrinaryLog
 
 	public function isAcceptedWithReasonBy(Type $acceptingType, bool $strictTypes): AcceptsResult;
 
-	public function isGreaterThan(Type $otherType): TrinaryLogic;
+	public function isGreaterThan(Type $otherType, PhpVersion $phpVersion): TrinaryLogic;
 
 	public function isGreaterThanOrEqual(Type $otherType, PhpVersion $phpVersion): TrinaryLogic;
 
diff --git a/src/Type/Enum/EnumCaseObjectType.php b/src/Type/Enum/EnumCaseObjectType.php
index ef25ef3756..e0bc8c3340 100644
--- a/src/Type/Enum/EnumCaseObjectType.php
+++ b/src/Type/Enum/EnumCaseObjectType.php
@@ -180,7 +180,7 @@ public function generalize(GeneralizePrecision $precision): Type
 		return new parent($this->getClassName(), null, $this->getClassReflection());
 	}
 
-	public function isSmallerThan(Type $otherType): TrinaryLogic
+	public function isSmallerThan(Type $otherType, PhpVersion $phpVersion): TrinaryLogic
 	{
 		return TrinaryLogic::createNo();
 	}
diff --git a/src/Type/IntegerRangeType.php b/src/Type/IntegerRangeType.php
index bd99be045b..430b42f01c 100644
--- a/src/Type/IntegerRangeType.php
+++ b/src/Type/IntegerRangeType.php
@@ -308,18 +308,18 @@ public function generalize(GeneralizePrecision $precision): Type
 		return new IntegerType();
 	}
 
-	public function isSmallerThan(Type $otherType): TrinaryLogic
+	public function isSmallerThan(Type $otherType, PhpVersion $phpVersion): TrinaryLogic
 	{
 		if ($this->min === null) {
 			$minIsSmaller = TrinaryLogic::createYes();
 		} else {
-			$minIsSmaller = (new ConstantIntegerType($this->min))->isSmallerThan($otherType);
+			$minIsSmaller = (new ConstantIntegerType($this->min))->isSmallerThan($otherType, $phpVersion);
 		}
 
 		if ($this->max === null) {
 			$maxIsSmaller = TrinaryLogic::createNo();
 		} else {
-			$maxIsSmaller = (new ConstantIntegerType($this->max))->isSmallerThan($otherType);
+			$maxIsSmaller = (new ConstantIntegerType($this->max))->isSmallerThan($otherType, $phpVersion);
 		}
 
 		return TrinaryLogic::extremeIdentity($minIsSmaller, $maxIsSmaller);
@@ -342,18 +342,18 @@ public function isSmallerThanOrEqual(Type $otherType, PhpVersion $phpVersion): T
 		return TrinaryLogic::extremeIdentity($minIsSmaller, $maxIsSmaller);
 	}
 
-	public function isGreaterThan(Type $otherType): TrinaryLogic
+	public function isGreaterThan(Type $otherType, PhpVersion $phpVersion): TrinaryLogic
 	{
 		if ($this->min === null) {
 			$minIsSmaller = TrinaryLogic::createNo();
 		} else {
-			$minIsSmaller = $otherType->isSmallerThan((new ConstantIntegerType($this->min)));
+			$minIsSmaller = $otherType->isSmallerThan((new ConstantIntegerType($this->min)), $phpVersion);
 		}
 
 		if ($this->max === null) {
 			$maxIsSmaller = TrinaryLogic::createYes();
 		} else {
-			$maxIsSmaller = $otherType->isSmallerThan((new ConstantIntegerType($this->max)));
+			$maxIsSmaller = $otherType->isSmallerThan((new ConstantIntegerType($this->max)), $phpVersion);
 		}
 
 		return TrinaryLogic::extremeIdentity($minIsSmaller, $maxIsSmaller);
@@ -692,7 +692,7 @@ public function toPhpDocNode(): TypeNode
 
 	public function looseCompare(Type $type, PhpVersion $phpVersion): BooleanType
 	{
-		if ($this->isSmallerThan($type)->yes() || $this->isGreaterThan($type)->yes()) {
+		if ($this->isSmallerThan($type, $phpVersion)->yes() || $this->isGreaterThan($type, $phpVersion)->yes()) {
 			return new ConstantBooleanType(false);
 		}
 
diff --git a/src/Type/IntersectionType.php b/src/Type/IntersectionType.php
index 2f9b18a20f..49d76ab5c2 100644
--- a/src/Type/IntersectionType.php
+++ b/src/Type/IntersectionType.php
@@ -802,9 +802,9 @@ public function isCloneable(): TrinaryLogic
 		return $this->intersectResults(static fn (Type $type): TrinaryLogic => $type->isCloneable());
 	}
 
-	public function isSmallerThan(Type $otherType): TrinaryLogic
+	public function isSmallerThan(Type $otherType, PhpVersion $phpVersion): TrinaryLogic
 	{
-		return $this->intersectResults(static fn (Type $type): TrinaryLogic => $type->isSmallerThan($otherType));
+		return $this->intersectResults(static fn (Type $type): TrinaryLogic => $type->isSmallerThan($otherType, $phpVersion));
 	}
 
 	public function isSmallerThanOrEqual(Type $otherType, PhpVersion $phpVersion): TrinaryLogic
@@ -876,9 +876,9 @@ public function isInteger(): TrinaryLogic
 		return $this->intersectResults(static fn (Type $type): TrinaryLogic => $type->isInteger());
 	}
 
-	public function isGreaterThan(Type $otherType): TrinaryLogic
+	public function isGreaterThan(Type $otherType, PhpVersion $phpVersion): TrinaryLogic
 	{
-		return $this->intersectResults(static fn (Type $type): TrinaryLogic => $otherType->isSmallerThan($type));
+		return $this->intersectResults(static fn (Type $type): TrinaryLogic => $otherType->isSmallerThan($type, $phpVersion));
 	}
 
 	public function isGreaterThanOrEqual(Type $otherType, PhpVersion $phpVersion): TrinaryLogic
diff --git a/src/Type/NullType.php b/src/Type/NullType.php
index 87388fa444..fe03417a7e 100644
--- a/src/Type/NullType.php
+++ b/src/Type/NullType.php
@@ -108,14 +108,14 @@ public function equals(Type $type): bool
 		return $type instanceof self;
 	}
 
-	public function isSmallerThan(Type $otherType): TrinaryLogic
+	public function isSmallerThan(Type $otherType, PhpVersion $phpVersion): TrinaryLogic
 	{
 		if ($otherType instanceof ConstantScalarType) {
 			return TrinaryLogic::createFromBoolean(null < $otherType->getValue());
 		}
 
 		if ($otherType instanceof CompoundType) {
-			return $otherType->isGreaterThan($this);
+			return $otherType->isGreaterThan($this, $phpVersion);
 		}
 
 		return TrinaryLogic::createMaybe();
diff --git a/src/Type/Traits/ConstantScalarTypeTrait.php b/src/Type/Traits/ConstantScalarTypeTrait.php
index 315192c373..7452cd3c83 100644
--- a/src/Type/Traits/ConstantScalarTypeTrait.php
+++ b/src/Type/Traits/ConstantScalarTypeTrait.php
@@ -78,14 +78,14 @@ public function equals(Type $type): bool
 		return $type instanceof self && $this->value === $type->value;
 	}
 
-	public function isSmallerThan(Type $otherType): TrinaryLogic
+	public function isSmallerThan(Type $otherType, PhpVersion $phpVersion): TrinaryLogic
 	{
 		if ($otherType instanceof ConstantScalarType) {
 			return TrinaryLogic::createFromBoolean($this->value < $otherType->getValue());
 		}
 
 		if ($otherType instanceof CompoundType) {
-			return $otherType->isGreaterThan($this);
+			return $otherType->isGreaterThan($this, $phpVersion);
 		}
 
 		return TrinaryLogic::createMaybe();
diff --git a/src/Type/Traits/LateResolvableTypeTrait.php b/src/Type/Traits/LateResolvableTypeTrait.php
index 96c06e29f9..47fa648a12 100644
--- a/src/Type/Traits/LateResolvableTypeTrait.php
+++ b/src/Type/Traits/LateResolvableTypeTrait.php
@@ -367,9 +367,9 @@ public function toArrayKey(): Type
 		return $this->resolve()->toArrayKey();
 	}
 
-	public function isSmallerThan(Type $otherType): TrinaryLogic
+	public function isSmallerThan(Type $otherType, PhpVersion $phpVersion): TrinaryLogic
 	{
-		return $this->resolve()->isSmallerThan($otherType);
+		return $this->resolve()->isSmallerThan($otherType, $phpVersion);
 	}
 
 	public function isSmallerThanOrEqual(Type $otherType, PhpVersion $phpVersion): TrinaryLogic
@@ -539,15 +539,15 @@ public function isAcceptedWithReasonBy(Type $acceptingType, bool $strictTypes):
 		return $acceptingType->acceptsWithReason($result, $strictTypes);
 	}
 
-	public function isGreaterThan(Type $otherType): TrinaryLogic
+	public function isGreaterThan(Type $otherType, PhpVersion $phpVersion): TrinaryLogic
 	{
 		$result = $this->resolve();
 
 		if ($result instanceof CompoundType) {
-			return $result->isGreaterThan($otherType);
+			return $result->isGreaterThan($otherType, $phpVersion);
 		}
 
-		return $otherType->isSmallerThan($result);
+		return $otherType->isSmallerThan($result, $phpVersion);
 	}
 
 	public function isGreaterThanOrEqual(Type $otherType, PhpVersion $phpVersion): TrinaryLogic
diff --git a/src/Type/Traits/UndecidedComparisonCompoundTypeTrait.php b/src/Type/Traits/UndecidedComparisonCompoundTypeTrait.php
index 38a8a57c92..6adf571d54 100644
--- a/src/Type/Traits/UndecidedComparisonCompoundTypeTrait.php
+++ b/src/Type/Traits/UndecidedComparisonCompoundTypeTrait.php
@@ -11,7 +11,7 @@ trait UndecidedComparisonCompoundTypeTrait
 
 	use UndecidedComparisonTypeTrait;
 
-	public function isGreaterThan(Type $otherType): TrinaryLogic
+	public function isGreaterThan(Type $otherType, PhpVersion $phpVersion): TrinaryLogic
 	{
 		return TrinaryLogic::createMaybe();
 	}
diff --git a/src/Type/Traits/UndecidedComparisonTypeTrait.php b/src/Type/Traits/UndecidedComparisonTypeTrait.php
index 339eef60fd..85ae1bbd17 100644
--- a/src/Type/Traits/UndecidedComparisonTypeTrait.php
+++ b/src/Type/Traits/UndecidedComparisonTypeTrait.php
@@ -10,7 +10,7 @@
 trait UndecidedComparisonTypeTrait
 {
 
-	public function isSmallerThan(Type $otherType): TrinaryLogic
+	public function isSmallerThan(Type $otherType, PhpVersion $phpVersion): TrinaryLogic
 	{
 		return TrinaryLogic::createMaybe();
 	}
diff --git a/src/Type/Type.php b/src/Type/Type.php
index 9d09f1a30f..2e6df51baa 100644
--- a/src/Type/Type.php
+++ b/src/Type/Type.php
@@ -215,7 +215,7 @@ public function toArray(): Type;
 
 	public function toArrayKey(): Type;
 
-	public function isSmallerThan(Type $otherType): TrinaryLogic;
+	public function isSmallerThan(Type $otherType, PhpVersion $phpVersion): TrinaryLogic;
 
 	public function isSmallerThanOrEqual(Type $otherType, PhpVersion $phpVersion): TrinaryLogic;
 
diff --git a/src/Type/UnionType.php b/src/Type/UnionType.php
index 70da0cec06..92c966e6d9 100644
--- a/src/Type/UnionType.php
+++ b/src/Type/UnionType.php
@@ -783,9 +783,9 @@ public function isCloneable(): TrinaryLogic
 		return $this->unionResults(static fn (Type $type): TrinaryLogic => $type->isCloneable());
 	}
 
-	public function isSmallerThan(Type $otherType): TrinaryLogic
+	public function isSmallerThan(Type $otherType, PhpVersion $phpVersion): TrinaryLogic
 	{
-		return $this->notBenevolentUnionResults(static fn (Type $type): TrinaryLogic => $type->isSmallerThan($otherType));
+		return $this->notBenevolentUnionResults(static fn (Type $type): TrinaryLogic => $type->isSmallerThan($otherType, $phpVersion));
 	}
 
 	public function isSmallerThanOrEqual(Type $otherType, PhpVersion $phpVersion): TrinaryLogic
@@ -863,9 +863,9 @@ public function getGreaterOrEqualType(): Type
 		return $this->unionTypes(static fn (Type $type): Type => $type->getGreaterOrEqualType());
 	}
 
-	public function isGreaterThan(Type $otherType): TrinaryLogic
+	public function isGreaterThan(Type $otherType, PhpVersion $phpVersion): TrinaryLogic
 	{
-		return $this->notBenevolentUnionResults(static fn (Type $type): TrinaryLogic => $otherType->isSmallerThan($type));
+		return $this->notBenevolentUnionResults(static fn (Type $type): TrinaryLogic => $otherType->isSmallerThan($type, $phpVersion));
 	}
 
 	public function isGreaterThanOrEqual(Type $otherType, PhpVersion $phpVersion): TrinaryLogic
diff --git a/tests/PHPStan/Rules/Api/data/class-implements-out-of-phpstan.php b/tests/PHPStan/Rules/Api/data/class-implements-out-of-phpstan.php
index 4334ca15fc..9899e4aad8 100644
--- a/tests/PHPStan/Rules/Api/data/class-implements-out-of-phpstan.php
+++ b/tests/PHPStan/Rules/Api/data/class-implements-out-of-phpstan.php
@@ -248,7 +248,7 @@ public function toArrayKey(): \PHPStan\Type\Type
 		// TODO: Implement toArrayKey() method.
 	}
 
-	public function isSmallerThan(Type $otherType): \PHPStan\TrinaryLogic
+	public function isSmallerThan(Type $otherType, PhpVersion $phpVersion): \PHPStan\TrinaryLogic
 	{
 		// TODO: Implement isSmallerThan() method.
 	}

From 8ba587e66b4ec714737e33b60997094f664cb9c4 Mon Sep 17 00:00:00 2001
From: Vincent Langlet <vincentlanglet@hotmail.fr>
Date: Wed, 25 Sep 2024 11:06:22 +0200
Subject: [PATCH 4/7] More

---
 src/Analyser/TypeSpecifier.php                   | 10 ++++++----
 src/Type/Constant/ConstantBooleanType.php        |  8 ++++----
 src/Type/Constant/ConstantStringType.php         |  9 +++++----
 src/Type/IntegerRangeType.php                    |  8 ++++----
 src/Type/IntersectionType.php                    | 16 ++++++++--------
 src/Type/NullType.php                            |  8 ++++----
 .../ConstantNumericComparisonTypeTrait.php       |  9 +++++----
 src/Type/Traits/LateResolvableTypeTrait.php      | 16 ++++++++--------
 src/Type/Traits/UndecidedComparisonTypeTrait.php |  8 ++++----
 src/Type/Type.php                                |  8 ++++----
 src/Type/UnionType.php                           | 16 ++++++++--------
 .../Api/data/class-implements-out-of-phpstan.php |  8 ++++----
 12 files changed, 64 insertions(+), 60 deletions(-)

diff --git a/src/Analyser/TypeSpecifier.php b/src/Analyser/TypeSpecifier.php
index 8c40e83826..9484fc52a7 100644
--- a/src/Analyser/TypeSpecifier.php
+++ b/src/Analyser/TypeSpecifier.php
@@ -22,6 +22,7 @@
 use PHPStan\Node\Expr\AlwaysRememberedExpr;
 use PHPStan\Node\IssetExpr;
 use PHPStan\Node\Printer\ExprPrinter;
+use PHPStan\Php\PhpVersion;
 use PHPStan\Reflection\Assertions;
 use PHPStan\Reflection\ParametersAcceptor;
 use PHPStan\Reflection\ParametersAcceptorSelector;
@@ -100,6 +101,7 @@ final class TypeSpecifier
 	public function __construct(
 		private ExprPrinter $exprPrinter,
 		private ReflectionProvider $reflectionProvider,
+		private PhpVersion $phpVersion,
 		private array $functionTypeSpecifyingExtensions,
 		private array $methodTypeSpecifyingExtensions,
 		private array $staticMethodTypeSpecifyingExtensions,
@@ -406,7 +408,7 @@ public function specifyTypesInCondition(
 					$result = $result->unionWith(
 						$this->create(
 							$expr->left,
-							$orEqual ? $rightType->getSmallerOrEqualType() : $rightType->getSmallerType(),
+							$orEqual ? $rightType->getSmallerOrEqualType($this->phpVersion) : $rightType->getSmallerType($this->phpVersion),
 							TypeSpecifierContext::createTruthy(),
 							$scope,
 						)->setRootExpr($expr),
@@ -416,7 +418,7 @@ public function specifyTypesInCondition(
 					$result = $result->unionWith(
 						$this->create(
 							$expr->right,
-							$orEqual ? $leftType->getGreaterOrEqualType() : $leftType->getGreaterType(),
+							$orEqual ? $leftType->getGreaterOrEqualType($this->phpVersion) : $leftType->getGreaterType($this->phpVersion),
 							TypeSpecifierContext::createTruthy(),
 							$scope,
 						)->setRootExpr($expr),
@@ -427,7 +429,7 @@ public function specifyTypesInCondition(
 					$result = $result->unionWith(
 						$this->create(
 							$expr->left,
-							$orEqual ? $rightType->getGreaterType() : $rightType->getGreaterOrEqualType(),
+							$orEqual ? $rightType->getGreaterType($this->phpVersion) : $rightType->getGreaterOrEqualType($this->phpVersion),
 							TypeSpecifierContext::createTruthy(),
 							$scope,
 						)->setRootExpr($expr),
@@ -437,7 +439,7 @@ public function specifyTypesInCondition(
 					$result = $result->unionWith(
 						$this->create(
 							$expr->right,
-							$orEqual ? $leftType->getSmallerType() : $leftType->getSmallerOrEqualType(),
+							$orEqual ? $leftType->getSmallerType($this->phpVersion) : $leftType->getSmallerOrEqualType($this->phpVersion),
 							TypeSpecifierContext::createTruthy(),
 							$scope,
 						)->setRootExpr($expr),
diff --git a/src/Type/Constant/ConstantBooleanType.php b/src/Type/Constant/ConstantBooleanType.php
index db5328d0d2..cbebe5b48b 100644
--- a/src/Type/Constant/ConstantBooleanType.php
+++ b/src/Type/Constant/ConstantBooleanType.php
@@ -40,7 +40,7 @@ public function describe(VerbosityLevel $level): string
 		return $this->value ? 'true' : 'false';
 	}
 
-	public function getSmallerType(): Type
+	public function getSmallerType(PhpVersion $phpVersion): Type
 	{
 		if ($this->value) {
 			return StaticTypeFactory::falsey();
@@ -48,7 +48,7 @@ public function getSmallerType(): Type
 		return new NeverType();
 	}
 
-	public function getSmallerOrEqualType(): Type
+	public function getSmallerOrEqualType(PhpVersion $phpVersion): Type
 	{
 		if ($this->value) {
 			return new MixedType();
@@ -56,7 +56,7 @@ public function getSmallerOrEqualType(): Type
 		return StaticTypeFactory::falsey();
 	}
 
-	public function getGreaterType(): Type
+	public function getGreaterType(PhpVersion $phpVersion): Type
 	{
 		if ($this->value) {
 			return new NeverType();
@@ -64,7 +64,7 @@ public function getGreaterType(): Type
 		return StaticTypeFactory::truthy();
 	}
 
-	public function getGreaterOrEqualType(): Type
+	public function getGreaterOrEqualType(PhpVersion $phpVersion): Type
 	{
 		if ($this->value) {
 			return StaticTypeFactory::truthy();
diff --git a/src/Type/Constant/ConstantStringType.php b/src/Type/Constant/ConstantStringType.php
index 39b259ee37..09ddd2741e 100644
--- a/src/Type/Constant/ConstantStringType.php
+++ b/src/Type/Constant/ConstantStringType.php
@@ -6,6 +6,7 @@
 use Nette\Utils\Strings;
 use PhpParser\Node\Name;
 use PHPStan\Analyser\OutOfClassScope;
+use PHPStan\Php\PhpVersion;
 use PHPStan\PhpDocParser\Ast\ConstExpr\ConstExprStringNode;
 use PHPStan\PhpDocParser\Ast\Type\ConstTypeNode;
 use PHPStan\PhpDocParser\Ast\Type\TypeNode;
@@ -461,7 +462,7 @@ public function generalize(GeneralizePrecision $precision): Type
 		return new StringType();
 	}
 
-	public function getSmallerType(): Type
+	public function getSmallerType(PhpVersion $phpVersion): Type
 	{
 		$subtractedTypes = [
 			new ConstantBooleanType(true),
@@ -480,7 +481,7 @@ public function getSmallerType(): Type
 		return TypeCombinator::remove(new MixedType(), TypeCombinator::union(...$subtractedTypes));
 	}
 
-	public function getSmallerOrEqualType(): Type
+	public function getSmallerOrEqualType(PhpVersion $phpVersion): Type
 	{
 		$subtractedTypes = [
 			IntegerRangeType::createAllGreaterThan((float) $this->value),
@@ -493,7 +494,7 @@ public function getSmallerOrEqualType(): Type
 		return TypeCombinator::remove(new MixedType(), TypeCombinator::union(...$subtractedTypes));
 	}
 
-	public function getGreaterType(): Type
+	public function getGreaterType(PhpVersion $phpVersion): Type
 	{
 		$subtractedTypes = [
 			new ConstantBooleanType(false),
@@ -507,7 +508,7 @@ public function getGreaterType(): Type
 		return TypeCombinator::remove(new MixedType(), TypeCombinator::union(...$subtractedTypes));
 	}
 
-	public function getGreaterOrEqualType(): Type
+	public function getGreaterOrEqualType(PhpVersion $phpVersion): Type
 	{
 		$subtractedTypes = [
 			IntegerRangeType::createAllSmallerThan((float) $this->value),
diff --git a/src/Type/IntegerRangeType.php b/src/Type/IntegerRangeType.php
index 430b42f01c..d5680a59ac 100644
--- a/src/Type/IntegerRangeType.php
+++ b/src/Type/IntegerRangeType.php
@@ -376,7 +376,7 @@ public function isGreaterThanOrEqual(Type $otherType, PhpVersion $phpVersion): T
 		return TrinaryLogic::extremeIdentity($minIsSmaller, $maxIsSmaller);
 	}
 
-	public function getSmallerType(): Type
+	public function getSmallerType(PhpVersion $phpVersion): Type
 	{
 		$subtractedTypes = [
 			new ConstantBooleanType(true),
@@ -389,7 +389,7 @@ public function getSmallerType(): Type
 		return TypeCombinator::remove(new MixedType(), TypeCombinator::union(...$subtractedTypes));
 	}
 
-	public function getSmallerOrEqualType(): Type
+	public function getSmallerOrEqualType(PhpVersion $phpVersion): Type
 	{
 		$subtractedTypes = [];
 
@@ -400,7 +400,7 @@ public function getSmallerOrEqualType(): Type
 		return TypeCombinator::remove(new MixedType(), TypeCombinator::union(...$subtractedTypes));
 	}
 
-	public function getGreaterType(): Type
+	public function getGreaterType(PhpVersion $phpVersion): Type
 	{
 		$subtractedTypes = [
 			new NullType(),
@@ -418,7 +418,7 @@ public function getGreaterType(): Type
 		return TypeCombinator::remove(new MixedType(), TypeCombinator::union(...$subtractedTypes));
 	}
 
-	public function getGreaterOrEqualType(): Type
+	public function getGreaterOrEqualType(PhpVersion $phpVersion): Type
 	{
 		$subtractedTypes = [];
 
diff --git a/src/Type/IntersectionType.php b/src/Type/IntersectionType.php
index 49d76ab5c2..13704c9a5d 100644
--- a/src/Type/IntersectionType.php
+++ b/src/Type/IntersectionType.php
@@ -886,24 +886,24 @@ public function isGreaterThanOrEqual(Type $otherType, PhpVersion $phpVersion): T
 		return $this->intersectResults(static fn (Type $type): TrinaryLogic => $otherType->isSmallerThanOrEqual($type, $phpVersion));
 	}
 
-	public function getSmallerType(): Type
+	public function getSmallerType(PhpVersion $phpVersion): Type
 	{
-		return $this->intersectTypes(static fn (Type $type): Type => $type->getSmallerType());
+		return $this->intersectTypes(static fn (Type $type): Type => $type->getSmallerType($phpVersion));
 	}
 
-	public function getSmallerOrEqualType(): Type
+	public function getSmallerOrEqualType(PhpVersion $phpVersion): Type
 	{
-		return $this->intersectTypes(static fn (Type $type): Type => $type->getSmallerOrEqualType());
+		return $this->intersectTypes(static fn (Type $type): Type => $type->getSmallerOrEqualType($phpVersion));
 	}
 
-	public function getGreaterType(): Type
+	public function getGreaterType(PhpVersion $phpVersion): Type
 	{
-		return $this->intersectTypes(static fn (Type $type): Type => $type->getGreaterType());
+		return $this->intersectTypes(static fn (Type $type): Type => $type->getGreaterType($phpVersion));
 	}
 
-	public function getGreaterOrEqualType(): Type
+	public function getGreaterOrEqualType(PhpVersion $phpVersion): Type
 	{
-		return $this->intersectTypes(static fn (Type $type): Type => $type->getGreaterOrEqualType());
+		return $this->intersectTypes(static fn (Type $type): Type => $type->getGreaterOrEqualType($phpVersion));
 	}
 
 	public function toBoolean(): BooleanType
diff --git a/src/Type/NullType.php b/src/Type/NullType.php
index fe03417a7e..01870ed2da 100644
--- a/src/Type/NullType.php
+++ b/src/Type/NullType.php
@@ -338,12 +338,12 @@ public function looseCompare(Type $type, PhpVersion $phpVersion): BooleanType
 		return new BooleanType();
 	}
 
-	public function getSmallerType(): Type
+	public function getSmallerType(PhpVersion $phpVersion): Type
 	{
 		return new NeverType();
 	}
 
-	public function getSmallerOrEqualType(): Type
+	public function getSmallerOrEqualType(PhpVersion $phpVersion): Type
 	{
 		// All falsey types except '0'
 		return new UnionType([
@@ -356,7 +356,7 @@ public function getSmallerOrEqualType(): Type
 		]);
 	}
 
-	public function getGreaterType(): Type
+	public function getGreaterType(PhpVersion $phpVersion): Type
 	{
 		// All truthy types, but also '0'
 		return new MixedType(false, new UnionType([
@@ -369,7 +369,7 @@ public function getGreaterType(): Type
 		]));
 	}
 
-	public function getGreaterOrEqualType(): Type
+	public function getGreaterOrEqualType(PhpVersion $phpVersion): Type
 	{
 		return new MixedType();
 	}
diff --git a/src/Type/Traits/ConstantNumericComparisonTypeTrait.php b/src/Type/Traits/ConstantNumericComparisonTypeTrait.php
index 2b3b4a45c5..c6efe96950 100644
--- a/src/Type/Traits/ConstantNumericComparisonTypeTrait.php
+++ b/src/Type/Traits/ConstantNumericComparisonTypeTrait.php
@@ -2,6 +2,7 @@
 
 namespace PHPStan\Type\Traits;
 
+use PHPStan\Php\PhpVersion;
 use PHPStan\Type\Constant\ConstantBooleanType;
 use PHPStan\Type\Constant\ConstantFloatType;
 use PHPStan\Type\IntegerRangeType;
@@ -13,7 +14,7 @@
 trait ConstantNumericComparisonTypeTrait
 {
 
-	public function getSmallerType(): Type
+	public function getSmallerType(PhpVersion $phpVersion): Type
 	{
 		$subtractedTypes = [
 			new ConstantBooleanType(true),
@@ -29,7 +30,7 @@ public function getSmallerType(): Type
 		return TypeCombinator::remove(new MixedType(), TypeCombinator::union(...$subtractedTypes));
 	}
 
-	public function getSmallerOrEqualType(): Type
+	public function getSmallerOrEqualType(PhpVersion $phpVersion): Type
 	{
 		$subtractedTypes = [
 			IntegerRangeType::createAllGreaterThan($this->value),
@@ -43,7 +44,7 @@ public function getSmallerOrEqualType(): Type
 		return TypeCombinator::remove(new MixedType(), TypeCombinator::union(...$subtractedTypes));
 	}
 
-	public function getGreaterType(): Type
+	public function getGreaterType(PhpVersion $phpVersion): Type
 	{
 		$subtractedTypes = [
 			new NullType(),
@@ -59,7 +60,7 @@ public function getGreaterType(): Type
 		return TypeCombinator::remove(new MixedType(), TypeCombinator::union(...$subtractedTypes));
 	}
 
-	public function getGreaterOrEqualType(): Type
+	public function getGreaterOrEqualType(PhpVersion $phpVersion): Type
 	{
 		$subtractedTypes = [
 			IntegerRangeType::createAllSmallerThan($this->value),
diff --git a/src/Type/Traits/LateResolvableTypeTrait.php b/src/Type/Traits/LateResolvableTypeTrait.php
index 47fa648a12..ff3d015f36 100644
--- a/src/Type/Traits/LateResolvableTypeTrait.php
+++ b/src/Type/Traits/LateResolvableTypeTrait.php
@@ -482,24 +482,24 @@ public function looseCompare(Type $type, PhpVersion $phpVersion): BooleanType
 		return new BooleanType();
 	}
 
-	public function getSmallerType(): Type
+	public function getSmallerType(PhpVersion $phpVersion): Type
 	{
-		return $this->resolve()->getSmallerType();
+		return $this->resolve()->getSmallerType($phpVersion);
 	}
 
-	public function getSmallerOrEqualType(): Type
+	public function getSmallerOrEqualType(PhpVersion $phpVersion): Type
 	{
-		return $this->resolve()->getSmallerOrEqualType();
+		return $this->resolve()->getSmallerOrEqualType($phpVersion);
 	}
 
-	public function getGreaterType(): Type
+	public function getGreaterType(PhpVersion $phpVersion): Type
 	{
-		return $this->resolve()->getGreaterType();
+		return $this->resolve()->getGreaterType($phpVersion);
 	}
 
-	public function getGreaterOrEqualType(): Type
+	public function getGreaterOrEqualType(PhpVersion $phpVersion): Type
 	{
-		return $this->resolve()->getGreaterOrEqualType();
+		return $this->resolve()->getGreaterOrEqualType($phpVersion);
 	}
 
 	public function inferTemplateTypes(Type $receivedType): TemplateTypeMap
diff --git a/src/Type/Traits/UndecidedComparisonTypeTrait.php b/src/Type/Traits/UndecidedComparisonTypeTrait.php
index 85ae1bbd17..6761274cf1 100644
--- a/src/Type/Traits/UndecidedComparisonTypeTrait.php
+++ b/src/Type/Traits/UndecidedComparisonTypeTrait.php
@@ -20,22 +20,22 @@ public function isSmallerThanOrEqual(Type $otherType, PhpVersion $phpVersion): T
 		return TrinaryLogic::createMaybe();
 	}
 
-	public function getSmallerType(): Type
+	public function getSmallerType(PhpVersion $phpVersion): Type
 	{
 		return new MixedType();
 	}
 
-	public function getSmallerOrEqualType(): Type
+	public function getSmallerOrEqualType(PhpVersion $phpVersion): Type
 	{
 		return new MixedType();
 	}
 
-	public function getGreaterType(): Type
+	public function getGreaterType(PhpVersion $phpVersion): Type
 	{
 		return new MixedType();
 	}
 
-	public function getGreaterOrEqualType(): Type
+	public function getGreaterOrEqualType(PhpVersion $phpVersion): Type
 	{
 		return new MixedType();
 	}
diff --git a/src/Type/Type.php b/src/Type/Type.php
index 2e6df51baa..47446d0dad 100644
--- a/src/Type/Type.php
+++ b/src/Type/Type.php
@@ -269,13 +269,13 @@ public function isScalar(): TrinaryLogic;
 
 	public function looseCompare(Type $type, PhpVersion $phpVersion): BooleanType;
 
-	public function getSmallerType(): Type;
+	public function getSmallerType(PhpVersion $phpVersion): Type;
 
-	public function getSmallerOrEqualType(): Type;
+	public function getSmallerOrEqualType(PhpVersion $phpVersion): Type;
 
-	public function getGreaterType(): Type;
+	public function getGreaterType(PhpVersion $phpVersion): Type;
 
-	public function getGreaterOrEqualType(): Type;
+	public function getGreaterOrEqualType(PhpVersion $phpVersion): Type;
 
 	/**
 	 * Returns actual template type for a given object.
diff --git a/src/Type/UnionType.php b/src/Type/UnionType.php
index 92c966e6d9..839bad3817 100644
--- a/src/Type/UnionType.php
+++ b/src/Type/UnionType.php
@@ -843,24 +843,24 @@ public function isInteger(): TrinaryLogic
 		return $this->notBenevolentUnionResults(static fn (Type $type): TrinaryLogic => $type->isInteger());
 	}
 
-	public function getSmallerType(): Type
+	public function getSmallerType(PhpVersion $phpVersion): Type
 	{
-		return $this->unionTypes(static fn (Type $type): Type => $type->getSmallerType());
+		return $this->unionTypes(static fn (Type $type): Type => $type->getSmallerType($phpVersion));
 	}
 
-	public function getSmallerOrEqualType(): Type
+	public function getSmallerOrEqualType(PhpVersion $phpVersion): Type
 	{
-		return $this->unionTypes(static fn (Type $type): Type => $type->getSmallerOrEqualType());
+		return $this->unionTypes(static fn (Type $type): Type => $type->getSmallerOrEqualType($phpVersion));
 	}
 
-	public function getGreaterType(): Type
+	public function getGreaterType(PhpVersion $phpVersion): Type
 	{
-		return $this->unionTypes(static fn (Type $type): Type => $type->getGreaterType());
+		return $this->unionTypes(static fn (Type $type): Type => $type->getGreaterType($phpVersion));
 	}
 
-	public function getGreaterOrEqualType(): Type
+	public function getGreaterOrEqualType(PhpVersion $phpVersion): Type
 	{
-		return $this->unionTypes(static fn (Type $type): Type => $type->getGreaterOrEqualType());
+		return $this->unionTypes(static fn (Type $type): Type => $type->getGreaterOrEqualType($phpVersion));
 	}
 
 	public function isGreaterThan(Type $otherType, PhpVersion $phpVersion): TrinaryLogic
diff --git a/tests/PHPStan/Rules/Api/data/class-implements-out-of-phpstan.php b/tests/PHPStan/Rules/Api/data/class-implements-out-of-phpstan.php
index 9899e4aad8..c5211fd650 100644
--- a/tests/PHPStan/Rules/Api/data/class-implements-out-of-phpstan.php
+++ b/tests/PHPStan/Rules/Api/data/class-implements-out-of-phpstan.php
@@ -278,22 +278,22 @@ public function isLiteralString(): \PHPStan\TrinaryLogic
 		// TODO: Implement isLiteralString() method.
 	}
 
-	public function getSmallerType(): \PHPStan\Type\Type
+	public function getSmallerType(PhpVersion $phpVersion): \PHPStan\Type\Type
 	{
 		// TODO: Implement getSmallerType() method.
 	}
 
-	public function getSmallerOrEqualType(): \PHPStan\Type\Type
+	public function getSmallerOrEqualType(PhpVersion $phpVersion): \PHPStan\Type\Type
 	{
 		// TODO: Implement getSmallerOrEqualType() method.
 	}
 
-	public function getGreaterType(): \PHPStan\Type\Type
+	public function getGreaterType(PhpVersion $phpVersion): \PHPStan\Type\Type
 	{
 		// TODO: Implement getGreaterType() method.
 	}
 
-	public function getGreaterOrEqualType(): \PHPStan\Type\Type
+	public function getGreaterOrEqualType(PhpVersion $phpVersion): \PHPStan\Type\Type
 	{
 		// TODO: Implement getGreaterOrEqualType() method.
 	}

From 8cbbd32030631f46445218ae89ac303b534ac69c Mon Sep 17 00:00:00 2001
From: Vincent Langlet <vincentlanglet@hotmail.fr>
Date: Wed, 25 Sep 2024 11:10:39 +0200
Subject: [PATCH 5/7] Fix

---
 src/Analyser/TypeSpecifierFactory.php                        | 2 ++
 src/Rules/Functions/RandomIntParametersRule.php              | 5 +++--
 .../PHPStan/Rules/Functions/RandomIntParametersRuleTest.php  | 3 ++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/Analyser/TypeSpecifierFactory.php b/src/Analyser/TypeSpecifierFactory.php
index 60219c3b6d..83315b6e0c 100644
--- a/src/Analyser/TypeSpecifierFactory.php
+++ b/src/Analyser/TypeSpecifierFactory.php
@@ -5,6 +5,7 @@
 use PHPStan\Broker\BrokerFactory;
 use PHPStan\DependencyInjection\Container;
 use PHPStan\Node\Printer\ExprPrinter;
+use PHPStan\Php\PhpVersion;
 use PHPStan\Reflection\ReflectionProvider;
 use function array_merge;
 
@@ -24,6 +25,7 @@ public function create(): TypeSpecifier
 		$typeSpecifier = new TypeSpecifier(
 			$this->container->getByType(ExprPrinter::class),
 			$this->container->getByType(ReflectionProvider::class),
+			$this->container->getByType(PhpVersion::class),
 			$this->container->getServicesByTag(self::FUNCTION_TYPE_SPECIFYING_EXTENSION_TAG),
 			$this->container->getServicesByTag(self::METHOD_TYPE_SPECIFYING_EXTENSION_TAG),
 			$this->container->getServicesByTag(self::STATIC_METHOD_TYPE_SPECIFYING_EXTENSION_TAG),
diff --git a/src/Rules/Functions/RandomIntParametersRule.php b/src/Rules/Functions/RandomIntParametersRule.php
index fba4327729..e35c21a3ed 100644
--- a/src/Rules/Functions/RandomIntParametersRule.php
+++ b/src/Rules/Functions/RandomIntParametersRule.php
@@ -25,8 +25,9 @@ final class RandomIntParametersRule implements Rule
 	public function __construct(
 		private ReflectionProvider $reflectionProvider,
 		private PhpVersion $phpVersion,
-		private bool $reportMaybes
-	) {
+		private bool $reportMaybes,
+	)
+	{
 	}
 
 	public function getNodeType(): string
diff --git a/tests/PHPStan/Rules/Functions/RandomIntParametersRuleTest.php b/tests/PHPStan/Rules/Functions/RandomIntParametersRuleTest.php
index 4b9ab4e23c..40c0526e25 100644
--- a/tests/PHPStan/Rules/Functions/RandomIntParametersRuleTest.php
+++ b/tests/PHPStan/Rules/Functions/RandomIntParametersRuleTest.php
@@ -2,6 +2,7 @@
 
 namespace PHPStan\Rules\Functions;
 
+use PHPStan\Php\PhpVersion;
 use PHPStan\Rules\Rule;
 use PHPStan\Testing\RuleTestCase;
 use const PHP_INT_SIZE;
@@ -14,7 +15,7 @@ class RandomIntParametersRuleTest extends RuleTestCase
 
 	protected function getRule(): Rule
 	{
-		return new RandomIntParametersRule($this->createReflectionProvider(), true);
+		return new RandomIntParametersRule($this->createReflectionProvider(), new PhpVersion(80000), true);
 	}
 
 	public function testFile(): void

From 209efbe91cc429b862fe26533476932c56a9f65a Mon Sep 17 00:00:00 2001
From: Vincent Langlet <vincentlanglet@hotmail.fr>
Date: Wed, 25 Sep 2024 15:13:27 +0200
Subject: [PATCH 6/7] Update UPGRADING

---
 UPGRADING.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/UPGRADING.md b/UPGRADING.md
index a6b527bc54..69cfc6f1c0 100644
--- a/UPGRADING.md
+++ b/UPGRADING.md
@@ -178,3 +178,5 @@ As a replacement you can implement [`PHPStan\Type\ExpressionTypeResolverExtensio
 * Parameter `$callableParameters` of [`MutatingScope::enterAnonymousFunction()`](https://apiref.phpstan.org/2.0.x/PHPStan.Analyser.MutatingScope.html#_enterAnonymousFunction) and [`enterArrowFunction()`](https://apiref.phpstan.org/2.0.x/PHPStan.Analyser.MutatingScope.html#_enterArrowFunction) made required
 * Parameter `StatementContext $context` of [`NodeScopeResolver::processStmtNodes()`](https://apiref.phpstan.org/2.0.x/PHPStan.Analyser.NodeScopeResolver.html#_processStmtNodes) made required
 * ClassPropertiesNode - remove `$extensions` parameter from [`getUninitializedProperties()`](https://apiref.phpstan.org/2.0.x/PHPStan.Node.ClassPropertiesNode.html#_getUninitializedProperties)
+* `Type::getSmallerType()`, `Type::getSmallerOrEqualType()`, `Type::getGreaterType()`, `Type::getGreaterOrEqualType()`, `Type::isSmallerThan()`, `Type::isSmallerThanOrEqual()` now require the php version as argument.
+* `CompoundType::isGreaterThan()`, `CompoundType::isGreaterThanOrEqual()` now require the php version as argument.

From 09098eae95360a01ca4413c558439b659690ed86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Mirtes?= <ondrej@mirtes.cz>
Date: Wed, 25 Sep 2024 17:49:54 +0200
Subject: [PATCH 7/7] Update UPGRADING.md

---
 UPGRADING.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/UPGRADING.md b/UPGRADING.md
index 69cfc6f1c0..14b029acc9 100644
--- a/UPGRADING.md
+++ b/UPGRADING.md
@@ -178,5 +178,5 @@ As a replacement you can implement [`PHPStan\Type\ExpressionTypeResolverExtensio
 * Parameter `$callableParameters` of [`MutatingScope::enterAnonymousFunction()`](https://apiref.phpstan.org/2.0.x/PHPStan.Analyser.MutatingScope.html#_enterAnonymousFunction) and [`enterArrowFunction()`](https://apiref.phpstan.org/2.0.x/PHPStan.Analyser.MutatingScope.html#_enterArrowFunction) made required
 * Parameter `StatementContext $context` of [`NodeScopeResolver::processStmtNodes()`](https://apiref.phpstan.org/2.0.x/PHPStan.Analyser.NodeScopeResolver.html#_processStmtNodes) made required
 * ClassPropertiesNode - remove `$extensions` parameter from [`getUninitializedProperties()`](https://apiref.phpstan.org/2.0.x/PHPStan.Node.ClassPropertiesNode.html#_getUninitializedProperties)
-* `Type::getSmallerType()`, `Type::getSmallerOrEqualType()`, `Type::getGreaterType()`, `Type::getGreaterOrEqualType()`, `Type::isSmallerThan()`, `Type::isSmallerThanOrEqual()` now require the php version as argument.
-* `CompoundType::isGreaterThan()`, `CompoundType::isGreaterThanOrEqual()` now require the php version as argument.
+* `Type::getSmallerType()`, `Type::getSmallerOrEqualType()`, `Type::getGreaterType()`, `Type::getGreaterOrEqualType()`, `Type::isSmallerThan()`, `Type::isSmallerThanOrEqual()` now require [`PhpVersion`](https://apiref.phpstan.org/2.0.x/PHPStan.Php.PhpVersion.html) as argument.
+* `CompoundType::isGreaterThan()`, `CompoundType::isGreaterThanOrEqual()` now require [`PhpVersion`](https://apiref.phpstan.org/2.0.x/PHPStan.Php.PhpVersion.html) as argument.