Use dedicated Type methods over isSuperTypeOf()

Author: staabm

src/Analyser/NodeScopeResolver.php

@@ -3895,7 +3895,7 @@ private function processAssignVar(
 						new ObjectType(ArrayAccess::class),
 						new NullType(),
 					];
-					if ($offsetType !== null && (new IntegerType())->isSuperTypeOf($offsetType)->yes()) {
+					if ($offsetType !== null && $offsetType->isInteger()->yes()) {
 						$types[] = new StringType();
 					}
 					$offsetValueType = TypeCombinator::intersect($offsetValueType, TypeCombinator::union(...$types));
@@ -3911,7 +3911,7 @@ private function processAssignVar(
 						new ObjectType(ArrayAccess::class),
 						new NullType(),
 					];
-					if ($offsetNativeType !== null && (new IntegerType())->isSuperTypeOf($offsetNativeType)->yes()) {
+					if ($offsetNativeType !== null && $offsetNativeType->isInteger()->yes()) {
 						$types[] = new StringType();
 					}
 					$offsetNativeValueType = TypeCombinator::intersect($offsetNativeValueType, TypeCombinator::union(...$types));

src/Reflection/InitializerExprTypeResolver.php

@@ -1507,8 +1507,8 @@ private function resolveCommonMath(Expr\BinaryOp $expr, Type $leftType, Type $ri
 		}
 
 		if (
-			(new FloatType())->isSuperTypeOf($leftNumberType)->yes()
-			|| (new FloatType())->isSuperTypeOf($rightNumberType)->yes()
+			$leftNumberType->isFloat()->yes()
+			|| $rightNumberType->isFloat()->yes()
 		) {
 			return new FloatType();
 		}

src/Rules/FunctionReturnTypeCheck.php

@@ -11,7 +11,6 @@
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeUtils;
 use PHPStan\Type\VerbosityLevel;
-use PHPStan\Type\VoidType;
 use function sprintf;
 
 class FunctionReturnTypeCheck
@@ -53,7 +52,7 @@ public function checkReturnType(
 			}
 		}
 
-		$isVoidSuperType = (new VoidType())->isSuperTypeOf($returnType);
+		$isVoidSuperType = $returnType->isVoid();
 		$verbosityLevel = VerbosityLevel::getRecommendedLevelByType($returnType, null);
 		if ($returnValue === null) {
 			if (!$isVoidSuperType->no()) {

src/Rules/Functions/ArrowFunctionReturnTypeRule.php

@@ -11,7 +11,6 @@
 use PHPStan\ShouldNotHappenException;
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\Type;
-use PHPStan\Type\VoidType;
 
 /**
  * @implements Rule<InArrowFunctionNode>
@@ -39,7 +38,7 @@ public function processNode(Node $node, Scope $scope): array
 		$generatorType = new ObjectType(Generator::class);
 
 		$originalNode = $node->getOriginalNode();
-		$isVoidSuperType = (new VoidType())->isSuperTypeOf($returnType);
+		$isVoidSuperType = $returnType->isVoid();
 		if ($originalNode->returnType === null && $isVoidSuperType->yes()) {
 			return [];
 		}

src/Rules/PhpDoc/InvalidThrowsPhpDocValueRule.php

@@ -9,7 +9,6 @@
 use PHPStan\Type\FileTypeMapper;
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\VerbosityLevel;
-use PHPStan\Type\VoidType;
 use Throwable;
 use function sprintf;
 
@@ -57,7 +56,7 @@ public function processNode(Node $node, Scope $scope): array
 		}
 
 		$phpDocThrowsType = $resolvedPhpDoc->getThrowsTag()->getType();
-		if ((new VoidType())->isSuperTypeOf($phpDocThrowsType)->yes()) {
+		if ($phpDocThrowsType->isVoid()->yes()) {
 			return [];
 		}
 

src/Type/Php/MbStrlenFunctionReturnTypeExtension.php

@@ -136,7 +136,7 @@ public function getTypeFromFunctionCall(
 			} else {
 				$range = TypeCombinator::union(...array_map(static fn ($l) => new ConstantIntegerType($l), $lengths));
 			}
-		} elseif ((new BooleanType())->isSuperTypeOf($argType)->yes()) {
+		} elseif ($argType->isBoolean()->yes()) {
 			$range = IntegerRangeType::fromInterval(0, 1);
 		} elseif (
 			$isNonEmpty->yes()

src/Type/Php/RangeFunctionReturnTypeExtension.php

@@ -115,8 +115,7 @@ public function getTypeFromFunctionCall(FunctionReflection $functionReflection,
 			return AccessoryArrayListType::intersectWith(new ArrayType(new IntegerType(), new IntegerType()));
 		}
 
-		$isFloat = (new FloatType())->isSuperTypeOf($argType)->yes();
-		if ($isFloat) {
+		if ($argType->isFloat()->yes()) {
 			return AccessoryArrayListType::intersectWith(new ArrayType(new IntegerType(), new FloatType()));
 		}
 
@@ -127,8 +126,7 @@ public function getTypeFromFunctionCall(FunctionReflection $functionReflection,
 			return AccessoryArrayListType::intersectWith(new ArrayType(new IntegerType(), $numberType));
 		}
 
-		$isString = $argType->isString()->yes();
-		if ($isString) {
+		if ($argType->isString()->yes()) {
 			return AccessoryArrayListType::intersectWith(new ArrayType(new IntegerType(), new StringType()));
 		}