More

VincentLanglet · VincentLanglet · commit 8ba587e66b4e · 2024-09-25T11:06:22.000+02:00
diff --git 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
@@ -40,31 +40,31 @@ 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();
 		}
 		return new NeverType();
 	}
 
-	public function getSmallerOrEqualType(): Type
+	public function getSmallerOrEqualType(PhpVersion $phpVersion): Type
 	{
 		if ($this->value) {
 			return new MixedType();
 		}
 		return StaticTypeFactory::falsey();
 	}
 
-	public function getGreaterType(): Type
+	public function getGreaterType(PhpVersion $phpVersion): Type
 	{
 		if ($this->value) {
 			return new NeverType();
 		}
 		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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -40,31 +40,31 @@ public function describe(VerbosityLevel $level): string`
`40`	`40`	`return $this->value ? 'true' : 'false';`
`41`	`41`	`}`
`42`	`42`
`43`		`- public function getSmallerType(): Type`
	`43`	`+ public function getSmallerType(PhpVersion $phpVersion): Type`
`44`	`44`	`{`
`45`	`45`	`if ($this->value) {`
`46`	`46`	`return StaticTypeFactory::falsey();`
`47`	`47`	`}`
`48`	`48`	`return new NeverType();`
`49`	`49`	`}`
`50`	`50`
`51`		`- public function getSmallerOrEqualType(): Type`
	`51`	`+ public function getSmallerOrEqualType(PhpVersion $phpVersion): Type`
`52`	`52`	`{`
`53`	`53`	`if ($this->value) {`
`54`	`54`	`return new MixedType();`
`55`	`55`	`}`
`56`	`56`	`return StaticTypeFactory::falsey();`
`57`	`57`	`}`
`58`	`58`
`59`		`- public function getGreaterType(): Type`
	`59`	`+ public function getGreaterType(PhpVersion $phpVersion): Type`
`60`	`60`	`{`
`61`	`61`	`if ($this->value) {`
`62`	`62`	`return new NeverType();`
`63`	`63`	`}`
`64`	`64`	`return StaticTypeFactory::truthy();`
`65`	`65`	`}`
`66`	`66`
`67`		`- public function getGreaterOrEqualType(): Type`
	`67`	`+ public function getGreaterOrEqualType(PhpVersion $phpVersion): Type`
`68`	`68`	`{`
`69`	`69`	`if ($this->value) {`
`70`	`70`	`return StaticTypeFactory::truthy();`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`use Nette\Utils\Strings;`
`7`	`7`	`use PhpParser\Node\Name;`
`8`	`8`	`use PHPStan\Analyser\OutOfClassScope;`
	`9`	`+use PHPStan\Php\PhpVersion;`
`9`	`10`	`use PHPStan\PhpDocParser\Ast\ConstExpr\ConstExprStringNode;`
`10`	`11`	`use PHPStan\PhpDocParser\Ast\Type\ConstTypeNode;`
`11`	`12`	`use PHPStan\PhpDocParser\Ast\Type\TypeNode;`
`@@ -461,7 +462,7 @@ public function generalize(GeneralizePrecision $precision): Type`
`461`	`462`	`return new StringType();`
`462`	`463`	`}`
`463`	`464`
`464`		`- public function getSmallerType(): Type`
	`465`	`+ public function getSmallerType(PhpVersion $phpVersion): Type`
`465`	`466`	`{`
`466`	`467`	`$subtractedTypes = [`
`467`	`468`	`new ConstantBooleanType(true),`
`@@ -480,7 +481,7 @@ public function getSmallerType(): Type`
`480`	`481`	`return TypeCombinator::remove(new MixedType(), TypeCombinator::union(...$subtractedTypes));`
`481`	`482`	`}`
`482`	`483`
`483`		`- public function getSmallerOrEqualType(): Type`
	`484`	`+ public function getSmallerOrEqualType(PhpVersion $phpVersion): Type`
`484`	`485`	`{`
`485`	`486`	`$subtractedTypes = [`
`486`	`487`	`IntegerRangeType::createAllGreaterThan((float) $this->value),`
`@@ -493,7 +494,7 @@ public function getSmallerOrEqualType(): Type`
`493`	`494`	`return TypeCombinator::remove(new MixedType(), TypeCombinator::union(...$subtractedTypes));`
`494`	`495`	`}`
`495`	`496`
`496`		`- public function getGreaterType(): Type`
	`497`	`+ public function getGreaterType(PhpVersion $phpVersion): Type`
`497`	`498`	`{`
`498`	`499`	`$subtractedTypes = [`
`499`	`500`	`new ConstantBooleanType(false),`
`@@ -507,7 +508,7 @@ public function getGreaterType(): Type`
`507`	`508`	`return TypeCombinator::remove(new MixedType(), TypeCombinator::union(...$subtractedTypes));`
`508`	`509`	`}`
`509`	`510`
`510`		`- public function getGreaterOrEqualType(): Type`
	`511`	`+ public function getGreaterOrEqualType(PhpVersion $phpVersion): Type`
`511`	`512`	`{`
`512`	`513`	`$subtractedTypes = [`
`513`	`514`	`IntegerRangeType::createAllSmallerThan((float) $this->value),`
Original file line number	Diff line number	Diff line change
`@@ -376,7 +376,7 @@ public function isGreaterThanOrEqual(Type $otherType, PhpVersion $phpVersion): T`
`376`	`376`	`return TrinaryLogic::extremeIdentity($minIsSmaller, $maxIsSmaller);`
`377`	`377`	`}`
`378`	`378`
`379`		`- public function getSmallerType(): Type`
	`379`	`+ public function getSmallerType(PhpVersion $phpVersion): Type`
`380`	`380`	`{`
`381`	`381`	`$subtractedTypes = [`
`382`	`382`	`new ConstantBooleanType(true),`
`@@ -389,7 +389,7 @@ public function getSmallerType(): Type`
`389`	`389`	`return TypeCombinator::remove(new MixedType(), TypeCombinator::union(...$subtractedTypes));`
`390`	`390`	`}`
`391`	`391`
`392`		`- public function getSmallerOrEqualType(): Type`
	`392`	`+ public function getSmallerOrEqualType(PhpVersion $phpVersion): Type`
`393`	`393`	`{`
`394`	`394`	`$subtractedTypes = [];`
`395`	`395`
`@@ -400,7 +400,7 @@ public function getSmallerOrEqualType(): Type`
`400`	`400`	`return TypeCombinator::remove(new MixedType(), TypeCombinator::union(...$subtractedTypes));`
`401`	`401`	`}`
`402`	`402`
`403`		`- public function getGreaterType(): Type`
	`403`	`+ public function getGreaterType(PhpVersion $phpVersion): Type`
`404`	`404`	`{`
`405`	`405`	`$subtractedTypes = [`
`406`	`406`	`new NullType(),`
`@@ -418,7 +418,7 @@ public function getGreaterType(): Type`
`418`	`418`	`return TypeCombinator::remove(new MixedType(), TypeCombinator::union(...$subtractedTypes));`
`419`	`419`	`}`
`420`	`420`
`421`		`- public function getGreaterOrEqualType(): Type`
	`421`	`+ public function getGreaterOrEqualType(PhpVersion $phpVersion): Type`
`422`	`422`	`{`
`423`	`423`	`$subtractedTypes = [];`
`424`	`424`
Original file line number	Diff line number	Diff line change
`@@ -886,24 +886,24 @@ public function isGreaterThanOrEqual(Type $otherType, PhpVersion $phpVersion): T`
`886`	`886`	`return $this->intersectResults(static fn (Type $type): TrinaryLogic => $otherType->isSmallerThanOrEqual($type, $phpVersion));`
`887`	`887`	`}`
`888`	`888`
`889`		`- public function getSmallerType(): Type`
	`889`	`+ public function getSmallerType(PhpVersion $phpVersion): Type`
`890`	`890`	`{`
`891`		`- return $this->intersectTypes(static fn (Type $type): Type => $type->getSmallerType());`
	`891`	`+ return $this->intersectTypes(static fn (Type $type): Type => $type->getSmallerType($phpVersion));`
`892`	`892`	`}`
`893`	`893`
`894`		`- public function getSmallerOrEqualType(): Type`
	`894`	`+ public function getSmallerOrEqualType(PhpVersion $phpVersion): Type`
`895`	`895`	`{`
`896`		`- return $this->intersectTypes(static fn (Type $type): Type => $type->getSmallerOrEqualType());`
	`896`	`+ return $this->intersectTypes(static fn (Type $type): Type => $type->getSmallerOrEqualType($phpVersion));`
`897`	`897`	`}`
`898`	`898`
`899`		`- public function getGreaterType(): Type`
	`899`	`+ public function getGreaterType(PhpVersion $phpVersion): Type`
`900`	`900`	`{`
`901`		`- return $this->intersectTypes(static fn (Type $type): Type => $type->getGreaterType());`
	`901`	`+ return $this->intersectTypes(static fn (Type $type): Type => $type->getGreaterType($phpVersion));`
`902`	`902`	`}`
`903`	`903`
`904`		`- public function getGreaterOrEqualType(): Type`
	`904`	`+ public function getGreaterOrEqualType(PhpVersion $phpVersion): Type`
`905`	`905`	`{`
`906`		`- return $this->intersectTypes(static fn (Type $type): Type => $type->getGreaterOrEqualType());`
	`906`	`+ return $this->intersectTypes(static fn (Type $type): Type => $type->getGreaterOrEqualType($phpVersion));`
`907`	`907`	`}`
`908`	`908`
`909`	`909`	`public function toBoolean(): BooleanType`
Original file line number	Diff line number	Diff line change
`@@ -338,12 +338,12 @@ public function looseCompare(Type $type, PhpVersion $phpVersion): BooleanType`
`338`	`338`	`return new BooleanType();`
`339`	`339`	`}`
`340`	`340`
`341`		`- public function getSmallerType(): Type`
	`341`	`+ public function getSmallerType(PhpVersion $phpVersion): Type`
`342`	`342`	`{`
`343`	`343`	`return new NeverType();`
`344`	`344`	`}`
`345`	`345`
`346`		`- public function getSmallerOrEqualType(): Type`
	`346`	`+ public function getSmallerOrEqualType(PhpVersion $phpVersion): Type`
`347`	`347`	`{`
`348`	`348`	`// All falsey types except '0'`
`349`	`349`	`return new UnionType([`
`@@ -356,7 +356,7 @@ public function getSmallerOrEqualType(): Type`
`356`	`356`	`]);`
`357`	`357`	`}`
`358`	`358`
`359`		`- public function getGreaterType(): Type`
	`359`	`+ public function getGreaterType(PhpVersion $phpVersion): Type`
`360`	`360`	`{`
`361`	`361`	`// All truthy types, but also '0'`
`362`	`362`	`return new MixedType(false, new UnionType([`
`@@ -369,7 +369,7 @@ public function getGreaterType(): Type`
`369`	`369`	`]));`
`370`	`370`	`}`
`371`	`371`
`372`		`- public function getGreaterOrEqualType(): Type`
	`372`	`+ public function getGreaterOrEqualType(PhpVersion $phpVersion): Type`
`373`	`373`	`{`
`374`	`374`	`return new MixedType();`
`375`	`375`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace PHPStan\Type\Traits;`
`4`	`4`
	`5`	`+use PHPStan\Php\PhpVersion;`
`5`	`6`	`use PHPStan\Type\Constant\ConstantBooleanType;`
`6`	`7`	`use PHPStan\Type\Constant\ConstantFloatType;`
`7`	`8`	`use PHPStan\Type\IntegerRangeType;`
`@@ -13,7 +14,7 @@`
`13`	`14`	`trait ConstantNumericComparisonTypeTrait`
`14`	`15`	`{`
`15`	`16`
`16`		`- public function getSmallerType(): Type`
	`17`	`+ public function getSmallerType(PhpVersion $phpVersion): Type`
`17`	`18`	`{`
`18`	`19`	`$subtractedTypes = [`
`19`	`20`	`new ConstantBooleanType(true),`
`@@ -29,7 +30,7 @@ public function getSmallerType(): Type`
`29`	`30`	`return TypeCombinator::remove(new MixedType(), TypeCombinator::union(...$subtractedTypes));`
`30`	`31`	`}`
`31`	`32`
`32`		`- public function getSmallerOrEqualType(): Type`
	`33`	`+ public function getSmallerOrEqualType(PhpVersion $phpVersion): Type`
`33`	`34`	`{`
`34`	`35`	`$subtractedTypes = [`
`35`	`36`	`IntegerRangeType::createAllGreaterThan($this->value),`
`@@ -43,7 +44,7 @@ public function getSmallerOrEqualType(): Type`
`43`	`44`	`return TypeCombinator::remove(new MixedType(), TypeCombinator::union(...$subtractedTypes));`
`44`	`45`	`}`
`45`	`46`
`46`		`- public function getGreaterType(): Type`
	`47`	`+ public function getGreaterType(PhpVersion $phpVersion): Type`
`47`	`48`	`{`
`48`	`49`	`$subtractedTypes = [`
`49`	`50`	`new NullType(),`
`@@ -59,7 +60,7 @@ public function getGreaterType(): Type`
`59`	`60`	`return TypeCombinator::remove(new MixedType(), TypeCombinator::union(...$subtractedTypes));`
`60`	`61`	`}`
`61`	`62`
`62`		`- public function getGreaterOrEqualType(): Type`
	`63`	`+ public function getGreaterOrEqualType(PhpVersion $phpVersion): Type`
`63`	`64`	`{`
`64`	`65`	`$subtractedTypes = [`
`65`	`66`	`IntegerRangeType::createAllSmallerThan($this->value),`
Original file line number	Diff line number	Diff line change
`@@ -482,24 +482,24 @@ public function looseCompare(Type $type, PhpVersion $phpVersion): BooleanType`
`482`	`482`	`return new BooleanType();`
`483`	`483`	`}`
`484`	`484`
`485`		`- public function getSmallerType(): Type`
	`485`	`+ public function getSmallerType(PhpVersion $phpVersion): Type`
`486`	`486`	`{`
`487`		`- return $this->resolve()->getSmallerType();`
	`487`	`+ return $this->resolve()->getSmallerType($phpVersion);`
`488`	`488`	`}`
`489`	`489`
`490`		`- public function getSmallerOrEqualType(): Type`
	`490`	`+ public function getSmallerOrEqualType(PhpVersion $phpVersion): Type`
`491`	`491`	`{`
`492`		`- return $this->resolve()->getSmallerOrEqualType();`
	`492`	`+ return $this->resolve()->getSmallerOrEqualType($phpVersion);`
`493`	`493`	`}`
`494`	`494`
`495`		`- public function getGreaterType(): Type`
	`495`	`+ public function getGreaterType(PhpVersion $phpVersion): Type`
`496`	`496`	`{`
`497`		`- return $this->resolve()->getGreaterType();`
	`497`	`+ return $this->resolve()->getGreaterType($phpVersion);`
`498`	`498`	`}`
`499`	`499`
`500`		`- public function getGreaterOrEqualType(): Type`
	`500`	`+ public function getGreaterOrEqualType(PhpVersion $phpVersion): Type`
`501`	`501`	`{`
`502`		`- return $this->resolve()->getGreaterOrEqualType();`
	`502`	`+ return $this->resolve()->getGreaterOrEqualType($phpVersion);`
`503`	`503`	`}`
`504`	`504`
`505`	`505`	`public function inferTemplateTypes(Type $receivedType): TemplateTypeMap`
Original file line number	Diff line number	Diff line change
`@@ -20,22 +20,22 @@ public function isSmallerThanOrEqual(Type $otherType, PhpVersion $phpVersion): T`
`20`	`20`	`return TrinaryLogic::createMaybe();`
`21`	`21`	`}`
`22`	`22`
`23`		`- public function getSmallerType(): Type`
	`23`	`+ public function getSmallerType(PhpVersion $phpVersion): Type`
`24`	`24`	`{`
`25`	`25`	`return new MixedType();`
`26`	`26`	`}`
`27`	`27`
`28`		`- public function getSmallerOrEqualType(): Type`
	`28`	`+ public function getSmallerOrEqualType(PhpVersion $phpVersion): Type`
`29`	`29`	`{`
`30`	`30`	`return new MixedType();`
`31`	`31`	`}`
`32`	`32`
`33`		`- public function getGreaterType(): Type`
	`33`	`+ public function getGreaterType(PhpVersion $phpVersion): Type`
`34`	`34`	`{`
`35`	`35`	`return new MixedType();`
`36`	`36`	`}`
`37`	`37`
`38`		`- public function getGreaterOrEqualType(): Type`
	`38`	`+ public function getGreaterOrEqualType(PhpVersion $phpVersion): Type`
`39`	`39`	`{`
`40`	`40`	`return new MixedType();`
`41`	`41`	`}`