Use dedicated Type methods over isSuperTypeOf()

staabm · web-flow · commit d147f4cc626c · 2023-11-27T14:54:33.000+01:00
diff --git a/src/Analyser/TypeSpecifier.php b/src/Analyser/TypeSpecifier.php
@@ -239,7 +239,7 @@ public function specifyTypesInCondition(
 				&& count($expr->right->getArgs()) === 1
 				&& $expr->right->name instanceof Name
 				&& in_array(strtolower((string) $expr->right->name), ['count', 'sizeof'], true)
-				&& (new IntegerType())->isSuperTypeOf($leftType)->yes()
+				&& $leftType->isInteger()->yes()
 			) {
 				if (
 					$context->truthy() && (IntegerRangeType::createAllGreaterThanOrEqualTo(1 - $offset)->isSuperTypeOf($leftType)->yes())
@@ -258,7 +258,7 @@ public function specifyTypesInCondition(
 				&& count($expr->right->getArgs()) === 1
 				&& $expr->right->name instanceof Name
 				&& strtolower((string) $expr->right->name) === 'strlen'
-				&& (new IntegerType())->isSuperTypeOf($leftType)->yes()
+				&& $leftType->isInteger()->yes()
 			) {
 				if (
 					$context->truthy() && (IntegerRangeType::createAllGreaterThanOrEqualTo(1 - $offset)->isSuperTypeOf($leftType)->yes())
@@ -1646,12 +1646,10 @@ public function resolveEqual(Expr\BinaryOp\Equal $expr, Scope $scope, TypeSpecif
 			return $this->create($expr->left, new NonEmptyArrayType(), $context->negate(), false, $scope, $rootExpr);
 		}
 
-		$integerType = new IntegerType();
-		$floatType = new FloatType();
 		if (
 			($leftType->isString()->yes() && $rightType->isString()->yes())
-			|| ($integerType->isSuperTypeOf($leftType)->yes() && $integerType->isSuperTypeOf($rightType)->yes())
-			|| ($floatType->isSuperTypeOf($leftType)->yes() && $floatType->isSuperTypeOf($rightType)->yes())
+			|| ($leftType->isInteger()->yes() && $rightType->isInteger()->yes())
+			|| ($leftType->isFloat()->yes() && $rightType->isFloat()->yes())
 			|| ($leftType->isEnum()->yes() && $rightType->isEnum()->yes())
 		) {
 			return $this->specifyTypesInCondition($scope, new Expr\BinaryOp\Identical($expr->left, $expr->right), $context, $rootExpr);
diff --git a/src/Reflection/InitializerExprTypeResolver.php b/src/Reflection/InitializerExprTypeResolver.php
@@ -877,9 +877,8 @@ public function getModType(Expr $left, Expr $right, callable $getTypeCallback):
 			}
 		}
 
-		$integer = new IntegerType();
 		$positiveInt = IntegerRangeType::fromInterval(0, null);
-		if ($integer->isSuperTypeOf($rightType)->yes()) {
+		if ($rightType->isInteger()->yes()) {
 			$rangeMin = null;
 			$rangeMax = null;
 
@@ -1334,15 +1333,12 @@ public function resolveIdenticalType(Type $leftType, Type $rightType): BooleanTy
 
 	public function resolveEqualType(Type $leftType, Type $rightType): BooleanType
 	{
-		$integerType = new IntegerType();
-		$floatType = new FloatType();
-
 		if (
 			($leftType->isEnum()->yes() && $rightType->isTrue()->no())
 			|| ($rightType->isEnum()->yes() && $leftType->isTrue()->no())
 			|| ($leftType->isString()->yes() && $rightType->isString()->yes())
-			|| ($integerType->isSuperTypeOf($leftType)->yes() && $integerType->isSuperTypeOf($rightType)->yes())
-			|| ($floatType->isSuperTypeOf($leftType)->yes() && $floatType->isSuperTypeOf($rightType)->yes())
+			|| ($leftType->isInteger()->yes() && $rightType->isInteger()->yes())
+			|| ($leftType->isFloat()->yes() && $rightType->isFloat()->yes())
 		) {
 			return $this->resolveIdenticalType($leftType, $rightType);
 		}
diff --git a/src/Type/Accessory/AccessoryLiteralStringType.php b/src/Type/Accessory/AccessoryLiteralStringType.php
@@ -134,7 +134,7 @@ public function isOffsetAccessible(): TrinaryLogic
 
 	public function hasOffsetValueType(Type $offsetType): TrinaryLogic
 	{
-		return (new IntegerType())->isSuperTypeOf($offsetType)->and(TrinaryLogic::createMaybe());
+		return $offsetType->isInteger()->and(TrinaryLogic::createMaybe());
 	}
 
 	public function getOffsetValueType(Type $offsetType): Type
diff --git a/src/Type/Accessory/AccessoryNonEmptyStringType.php b/src/Type/Accessory/AccessoryNonEmptyStringType.php
@@ -136,7 +136,7 @@ public function isOffsetAccessible(): TrinaryLogic
 
 	public function hasOffsetValueType(Type $offsetType): TrinaryLogic
 	{
-		return (new IntegerType())->isSuperTypeOf($offsetType)->and(TrinaryLogic::createMaybe());
+		return $offsetType->isInteger()->and(TrinaryLogic::createMaybe());
 	}
 
 	public function getOffsetValueType(Type $offsetType): Type
diff --git a/src/Type/Accessory/AccessoryNonFalsyStringType.php b/src/Type/Accessory/AccessoryNonFalsyStringType.php
@@ -137,7 +137,7 @@ public function isOffsetAccessible(): TrinaryLogic
 
 	public function hasOffsetValueType(Type $offsetType): TrinaryLogic
 	{
-		return (new IntegerType())->isSuperTypeOf($offsetType)->and(TrinaryLogic::createMaybe());
+		return $offsetType->isInteger()->and(TrinaryLogic::createMaybe());
 	}
 
 	public function getOffsetValueType(Type $offsetType): Type
diff --git a/src/Type/Accessory/AccessoryNumericStringType.php b/src/Type/Accessory/AccessoryNumericStringType.php
@@ -139,7 +139,7 @@ public function isOffsetAccessible(): TrinaryLogic
 
 	public function hasOffsetValueType(Type $offsetType): TrinaryLogic
 	{
-		return (new IntegerType())->isSuperTypeOf($offsetType)->and(TrinaryLogic::createMaybe());
+		return $offsetType->isInteger()->and(TrinaryLogic::createMaybe());
 	}
 
 	public function getOffsetValueType(Type $offsetType): Type
diff --git a/src/Type/ArrayType.php b/src/Type/ArrayType.php
@@ -499,7 +499,7 @@ public function unsetOffset(Type $offsetType): Type
 	public function fillKeysArray(Type $valueType): Type
 	{
 		$itemType = $this->getItemType();
-		if ((new IntegerType())->isSuperTypeOf($itemType)->no()) {
+		if ($itemType->isInteger()->no()) {
 			$stringKeyType = $itemType->toString();
 			if ($stringKeyType instanceof ErrorType) {
 				return $stringKeyType;
diff --git a/src/Type/BitwiseFlagHelper.php b/src/Type/BitwiseFlagHelper.php
@@ -94,8 +94,7 @@ private function typeContainsIntFlag(Type $type, int $flag): TrinaryLogic
 			return TrinaryLogic::createNo();
 		}
 
-		$integerType = new IntegerType();
-		if ($integerType->isSuperTypeOf($type)->yes() || $type instanceof MixedType) {
+		if ($type->isInteger()->yes() || $type instanceof MixedType) {
 			return TrinaryLogic::createMaybe();
 		}
 
diff --git a/src/Type/Constant/ConstantArrayType.php b/src/Type/Constant/ConstantArrayType.php
@@ -37,7 +37,6 @@
 use PHPStan\Type\Generic\TemplateTypeMap;
 use PHPStan\Type\Generic\TemplateTypeVariance;
 use PHPStan\Type\IntegerRangeType;
-use PHPStan\Type\IntegerType;
 use PHPStan\Type\IntersectionType;
 use PHPStan\Type\MixedType;
 use PHPStan\Type\NeverType;
@@ -746,7 +745,7 @@ public function fillKeysArray(Type $valueType): Type
 		$builder = ConstantArrayTypeBuilder::createEmpty();
 
 		foreach ($this->valueTypes as $i => $keyType) {
-			if ((new IntegerType())->isSuperTypeOf($keyType)->no()) {
+			if ($keyType->isInteger()->no()) {
 				$stringKeyType = $keyType->toString();
 				if ($stringKeyType instanceof ErrorType) {
 					return $stringKeyType;
diff --git a/src/Type/Php/ArrayCombineFunctionReturnTypeExtension.php b/src/Type/Php/ArrayCombineFunctionReturnTypeExtension.php
@@ -15,7 +15,6 @@
 use PHPStan\Type\Constant\ConstantStringType;
 use PHPStan\Type\DynamicFunctionReturnTypeExtension;
 use PHPStan\Type\ErrorType;
-use PHPStan\Type\IntegerType;
 use PHPStan\Type\MixedType;
 use PHPStan\Type\NeverType;
 use PHPStan\Type\Type;
@@ -74,7 +73,7 @@ public function getTypeFromFunctionCall(FunctionReflection $functionReflection,
 		if ($keysParamType->isArray()->yes()) {
 			$itemType = $keysParamType->getIterableValueType();
 
-			if ((new IntegerType())->isSuperTypeOf($itemType)->no()) {
+			if ($itemType->isInteger()->no()) {
 				if ($itemType->toString() instanceof ErrorType) {
 					return new NeverType();
 				}
@@ -117,7 +116,7 @@ private function sanitizeConstantArrayKeyTypes(array $types): ?array
 		$sanitizedTypes = [];
 
 		foreach ($types as $type) {
-			if ((new IntegerType())->isSuperTypeOf($type)->no() && ! $type->toString() instanceof ErrorType) {
+			if ($type->isInteger()->no() && ! $type->toString() instanceof ErrorType) {
 				$type = $type->toString();
 			}
 
diff --git a/src/Type/Php/ArrayRandFunctionReturnTypeExtension.php b/src/Type/Php/ArrayRandFunctionReturnTypeExtension.php
@@ -32,7 +32,7 @@ public function getTypeFromFunctionCall(FunctionReflection $functionReflection,
 		}
 
 		$firstArgType = $scope->getType($functionCall->getArgs()[0]->value);
-		$isInteger = (new IntegerType())->isSuperTypeOf($firstArgType->getIterableKeyType());
+		$isInteger = $firstArgType->getIterableKeyType()->isInteger();
 		$isString = $firstArgType->getIterableKeyType()->isString();
 
 		if ($isInteger->yes()) {
diff --git a/src/Type/Php/BcMathStringOrNullReturnTypeExtension.php b/src/Type/Php/BcMathStringOrNullReturnTypeExtension.php
@@ -12,7 +12,6 @@
 use PHPStan\Type\ConstantScalarType;
 use PHPStan\Type\DynamicFunctionReturnTypeExtension;
 use PHPStan\Type\IntegerRangeType;
-use PHPStan\Type\IntegerType;
 use PHPStan\Type\NeverType;
 use PHPStan\Type\NullType;
 use PHPStan\Type\StringType;
@@ -85,7 +84,7 @@ public function getTypeFromFunctionCall(FunctionReflection $functionReflection,
 		if ($thirdArgument instanceof ConstantScalarType && is_numeric($thirdArgument->getValue())) {
 			$thirdArgumentIsNumeric = true;
 			$thirdArgumentIsNegative = ($thirdArgument->getValue() < 0);
-		} elseif ((new IntegerType())->isSuperTypeOf($thirdArgument)->yes()) {
+		} elseif ($thirdArgument->isInteger()->yes()) {
 			$thirdArgumentIsNumeric = true;
 			if (IntegerRangeType::fromInterval(null, -1)->isSuperTypeOf($thirdArgument)->yes()) {
 				$thirdArgumentIsNegative = true;
diff --git a/src/Type/Php/DatePeriodConstructorReturnTypeExtension.php b/src/Type/Php/DatePeriodConstructorReturnTypeExtension.php
@@ -70,7 +70,7 @@ public function getTypeFromStaticMethodCall(MethodReflection $methodReflection,
 			]);
 		}
 
-		if ((new IntegerType())->isSuperTypeOf($thirdArgType)->yes()) {
+		if ($thirdArgType->isInteger()->yes()) {
 			return new GenericObjectType(DatePeriod::class, [
 				$firstArgType,
 				new NullType(),
diff --git a/src/Type/Php/RangeFunctionReturnTypeExtension.php b/src/Type/Php/RangeFunctionReturnTypeExtension.php
@@ -108,8 +108,8 @@ public function getTypeFromFunctionCall(FunctionReflection $functionReflection,
 		}
 
 		$argType = TypeCombinator::union($startType, $endType);
-		$isInteger = (new IntegerType())->isSuperTypeOf($argType)->yes();
-		$isStepInteger = (new IntegerType())->isSuperTypeOf($stepType)->yes();
+		$isInteger = $argType->isInteger()->yes();
+		$isStepInteger = $stepType->isInteger()->yes();
 
 		if ($isInteger && $isStepInteger) {
 			return AccessoryArrayListType::intersectWith(new ArrayType(new IntegerType(), new IntegerType()));
diff --git a/src/Type/StringType.php b/src/Type/StringType.php
@@ -58,7 +58,7 @@ public function isOffsetAccessible(): TrinaryLogic
 
 	public function hasOffsetValueType(Type $offsetType): TrinaryLogic
 	{
-		return (new IntegerType())->isSuperTypeOf($offsetType)->and(TrinaryLogic::createMaybe());
+		return $offsetType->isInteger()->and(TrinaryLogic::createMaybe());
 	}
 
 	public function getOffsetValueType(Type $offsetType): Type
@@ -81,7 +81,7 @@ public function setOffsetValueType(?Type $offsetType, Type $valueType, bool $uni
 			return new ErrorType();
 		}
 
-		if ((new IntegerType())->isSuperTypeOf($offsetType)->yes() || $offsetType instanceof MixedType) {
+		if ($offsetType->isInteger()->yes() || $offsetType instanceof MixedType) {
 			return new StringType();
 		}
 
diff --git a/tests/PHPStan/Analyser/NodeScopeResolverTest.php b/tests/PHPStan/Analyser/NodeScopeResolverTest.php
@@ -1374,6 +1374,7 @@ public function dataFileAsserts(): iterable
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/str-shuffle.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-9995.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/enum_exists.php');
+		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-9778.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-9867.php');
 	}
 
diff --git a/tests/PHPStan/Analyser/data/bug-9778.php b/tests/PHPStan/Analyser/data/bug-9778.php
@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Bug9778;
+
+const SOME_A = 0;
+
+class HelloWorld
+{
+	public function sayHello(int $a): void
+	{
+		\PHPStan\Testing\assertType('int', $a);
+
+		switch ($a) {
+			case SOME_A:
+				$b = "a";
+
+				break;
+			default:
+				$b = "default";
+
+				break;
+		}
+
+		\PHPStan\Testing\assertType('int', $a);
+	}
+}
+
diff --git a/tests/PHPStan/Rules/Comparison/MatchExpressionRuleTest.php b/tests/PHPStan/Rules/Comparison/MatchExpressionRuleTest.php
@@ -525,4 +525,13 @@ public function testBug9499(): void
 		$this->analyse([__DIR__ . '/data/bug-9499.php'], []);
 	}
 
+	public function testBug6407(): void
+	{
+		if (PHP_VERSION_ID < 80000) {
+			$this->markTestSkipped('Test requires PHP 8.0.');
+		}
+
+		$this->analyse([__DIR__ . '/data/bug-6407.php'], []);
+	}
+
 }
diff --git a/tests/PHPStan/Rules/Comparison/StrictComparisonOfDifferentTypesRuleTest.php b/tests/PHPStan/Rules/Comparison/StrictComparisonOfDifferentTypesRuleTest.php
@@ -990,4 +990,24 @@ public function testBug4061(): void
 		$this->analyse([__DIR__ . '/data/bug-4061.php'], []);
 	}
 
+	public function testBug9723(): void
+	{
+		if (PHP_VERSION_ID < 80100) {
+			$this->markTestSkipped('Test requires PHP 8.1.');
+		}
+
+		$this->checkAlwaysTrueStrictComparison = true;
+		$this->analyse([__DIR__ . '/data/bug-9723.php'], []);
+	}
+
+	public function testBug9723b(): void
+	{
+		if (PHP_VERSION_ID < 80100) {
+			$this->markTestSkipped('Test requires PHP 8.1.');
+		}
+
+		$this->checkAlwaysTrueStrictComparison = true;
+		$this->analyse([__DIR__ . '/data/bug-9723b.php'], []);
+	}
+
 }
diff --git a/tests/PHPStan/Rules/Comparison/data/bug-6407.php b/tests/PHPStan/Rules/Comparison/data/bug-6407.php
@@ -0,0 +1,65 @@
+<?php declare(strict_types=1);  // lint >= 8.0
+
+namespace Bug6407;
+
+class BookEditPacket
+{
+	public const TYPE_REPLACE_PAGE = 0;
+	public const TYPE_ADD_PAGE = 1;
+	public const TYPE_DELETE_PAGE = 2;
+	public const TYPE_SWAP_PAGES = 3;
+	public const TYPE_SIGN_BOOK = 4;
+
+	public int $type;
+}
+
+
+class PlayerEditBookEvent
+{
+	public const ACTION_REPLACE_PAGE = 0;
+	public const ACTION_ADD_PAGE = 1;
+	public const ACTION_DELETE_PAGE = 2;
+	public const ACTION_SWAP_PAGES = 3;
+	public const ACTION_SIGN_BOOK = 4;
+}
+
+class HelloWorld
+{
+	private BookEditPacket $packet;
+
+	private function iAmImpure(): void
+	{
+		$this->packet->type = 999;
+	}
+
+	public function sayHello(BookEditPacket $packet): bool
+	{
+		$this->packet = $packet;
+		switch ($packet->type) {
+			case BookEditPacket::TYPE_REPLACE_PAGE:
+				$this->iAmImpure();
+				break;
+			case BookEditPacket::TYPE_ADD_PAGE:
+				break;
+			case BookEditPacket::TYPE_DELETE_PAGE:
+				break;
+			case BookEditPacket::TYPE_SWAP_PAGES:
+				break;
+			case BookEditPacket::TYPE_SIGN_BOOK:
+				break;
+			default:
+				return false;
+		}
+
+		//for redundancy, in case of protocol changes, we don't want to pass these directly
+		$action = match ($packet->type) {
+			BookEditPacket::TYPE_REPLACE_PAGE => PlayerEditBookEvent::ACTION_REPLACE_PAGE,
+			BookEditPacket::TYPE_ADD_PAGE => PlayerEditBookEvent::ACTION_ADD_PAGE,
+			BookEditPacket::TYPE_DELETE_PAGE => PlayerEditBookEvent::ACTION_DELETE_PAGE,
+			BookEditPacket::TYPE_SWAP_PAGES => PlayerEditBookEvent::ACTION_SWAP_PAGES,
+			BookEditPacket::TYPE_SIGN_BOOK => PlayerEditBookEvent::ACTION_SIGN_BOOK,
+			default => throw new \Error("We already filtered unknown types in the switch above")
+		};
+		return true;
+	}
+}
diff --git a/tests/PHPStan/Rules/Comparison/data/bug-9723.php b/tests/PHPStan/Rules/Comparison/data/bug-9723.php
diff --git a/tests/PHPStan/Rules/Comparison/data/bug-9723b.php b/tests/PHPStan/Rules/Comparison/data/bug-9723b.php

Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ public function isOffsetAccessible(): TrinaryLogic`
`134`	`134`
`135`	`135`	`public function hasOffsetValueType(Type $offsetType): TrinaryLogic`
`136`	`136`	`{`
`137`		`- return (new IntegerType())->isSuperTypeOf($offsetType)->and(TrinaryLogic::createMaybe());`
	`137`	`+ return $offsetType->isInteger()->and(TrinaryLogic::createMaybe());`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`public function getOffsetValueType(Type $offsetType): Type`
Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ public function isOffsetAccessible(): TrinaryLogic`
`136`	`136`
`137`	`137`	`public function hasOffsetValueType(Type $offsetType): TrinaryLogic`
`138`	`138`	`{`
`139`		`- return (new IntegerType())->isSuperTypeOf($offsetType)->and(TrinaryLogic::createMaybe());`
	`139`	`+ return $offsetType->isInteger()->and(TrinaryLogic::createMaybe());`
`140`	`140`	`}`
`141`	`141`
`142`	`142`	`public function getOffsetValueType(Type $offsetType): Type`
Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ public function isOffsetAccessible(): TrinaryLogic`
`137`	`137`
`138`	`138`	`public function hasOffsetValueType(Type $offsetType): TrinaryLogic`
`139`	`139`	`{`
`140`		`- return (new IntegerType())->isSuperTypeOf($offsetType)->and(TrinaryLogic::createMaybe());`
	`140`	`+ return $offsetType->isInteger()->and(TrinaryLogic::createMaybe());`
`141`	`141`	`}`
`142`	`142`
`143`	`143`	`public function getOffsetValueType(Type $offsetType): Type`
Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ public function isOffsetAccessible(): TrinaryLogic`
`139`	`139`
`140`	`140`	`public function hasOffsetValueType(Type $offsetType): TrinaryLogic`
`141`	`141`	`{`
`142`		`- return (new IntegerType())->isSuperTypeOf($offsetType)->and(TrinaryLogic::createMaybe());`
	`142`	`+ return $offsetType->isInteger()->and(TrinaryLogic::createMaybe());`
`143`	`143`	`}`
`144`	`144`
`145`	`145`	`public function getOffsetValueType(Type $offsetType): Type`
Original file line number	Diff line number	Diff line change
`@@ -499,7 +499,7 @@ public function unsetOffset(Type $offsetType): Type`
`499`	`499`	`public function fillKeysArray(Type $valueType): Type`
`500`	`500`	`{`
`501`	`501`	`$itemType = $this->getItemType();`
`502`		`- if ((new IntegerType())->isSuperTypeOf($itemType)->no()) {`
	`502`	`+ if ($itemType->isInteger()->no()) {`
`503`	`503`	`$stringKeyType = $itemType->toString();`
`504`	`504`	`if ($stringKeyType instanceof ErrorType) {`
`505`	`505`	`return $stringKeyType;`
Original file line number	Diff line number	Diff line change
`@@ -94,8 +94,7 @@ private function typeContainsIntFlag(Type $type, int $flag): TrinaryLogic`
`94`	`94`	`return TrinaryLogic::createNo();`
`95`	`95`	`}`
`96`	`96`
`97`		`- $integerType = new IntegerType();`
`98`		`- if ($integerType->isSuperTypeOf($type)->yes() \|\| $type instanceof MixedType) {`
	`97`	`+ if ($type->isInteger()->yes() \|\| $type instanceof MixedType) {`
`99`	`98`	`return TrinaryLogic::createMaybe();`
`100`	`99`	`}`
`101`	`100`