Replace error-prone instanceof in Rules classes

phpstan-baseline.neon

@@ -411,30 +411,12 @@ parameters:
 			count: 1
 			path: src/Reflection/SignatureMap/Php8SignatureMapProvider.php
 
-		-
-			message: '#^Doing instanceof PHPStan\\Type\\Constant\\ConstantStringType is error\-prone and deprecated\. Use Type\:\:getConstantStrings\(\) instead\.$#'
-			identifier: phpstanApi.instanceofType
-			count: 1
-			path: src/Rules/Api/NodeConnectingVisitorAttributesRule.php
-
-		-
-			message: '#^Doing instanceof PHPStan\\Type\\ConstantScalarType is error\-prone and deprecated\. Use Type\:\:isConstantScalarValue\(\) or Type\:\:getConstantScalarTypes\(\) or Type\:\:getConstantScalarValues\(\) instead\.$#'
-			identifier: phpstanApi.instanceofType
-			count: 1
-			path: src/Rules/Arrays/DuplicateKeysInLiteralArraysRule.php
-
 		-
 			message: '#^Doing instanceof PHPStan\\Type\\Constant\\ConstantBooleanType is error\-prone and deprecated\. Use Type\:\:isTrue\(\) or Type\:\:isFalse\(\) instead\.$#'
 			identifier: phpstanApi.instanceofType
 			count: 2
 			path: src/Rules/Classes/ImpossibleInstanceOfRule.php
 
-		-
-			message: '#^Doing instanceof PHPStan\\Type\\ObjectType is error\-prone and deprecated\. Use Type\:\:isObject\(\) or Type\:\:getObjectClassNames\(\) instead\.$#'
-			identifier: phpstanApi.instanceofType
-			count: 2
-			path: src/Rules/Classes/RequireExtendsRule.php
-
 		-
 			message: '#^Doing instanceof PHPStan\\Type\\ObjectType is error\-prone and deprecated\. Use Type\:\:isObject\(\) or Type\:\:getObjectClassNames\(\) instead\.$#'
 			identifier: phpstanApi.instanceofType
@@ -459,12 +441,6 @@ parameters:
 			count: 6
 			path: src/Rules/Comparison/BooleanOrConstantConditionRule.php
 
-		-
-			message: '#^Doing instanceof PHPStan\\Type\\Constant\\ConstantBooleanType is error\-prone and deprecated\. Use Type\:\:isTrue\(\) or Type\:\:isFalse\(\) instead\.$#'
-			identifier: phpstanApi.instanceofType
-			count: 2
-			path: src/Rules/Comparison/ConstantLooseComparisonRule.php
-
 		-
 			message: '#^Doing instanceof PHPStan\\Type\\Constant\\ConstantBooleanType is error\-prone and deprecated\. Use Type\:\:isTrue\(\) or Type\:\:isFalse\(\) instead\.$#'
 			identifier: phpstanApi.instanceofType
@@ -492,7 +468,7 @@ parameters:
 		-
 			message: '#^Doing instanceof PHPStan\\Type\\Constant\\ConstantBooleanType is error\-prone and deprecated\. Use Type\:\:isTrue\(\) or Type\:\:isFalse\(\) instead\.$#'
 			identifier: phpstanApi.instanceofType
-			count: 2
+			count: 1
 			path: src/Rules/Comparison/ImpossibleCheckTypeHelper.php
 
 		-
@@ -645,18 +621,6 @@ parameters:
 			count: 1
 			path: src/Rules/Methods/StaticMethodCallCheck.php
 
-		-
-			message: '#^Doing instanceof PHPStan\\Type\\ObjectType is error\-prone and deprecated\. Use Type\:\:isObject\(\) or Type\:\:getObjectClassNames\(\) instead\.$#'
-			identifier: phpstanApi.instanceofType
-			count: 1
-			path: src/Rules/PhpDoc/RequireExtendsCheck.php
-
-		-
-			message: '#^Doing instanceof PHPStan\\Type\\ObjectType is error\-prone and deprecated\. Use Type\:\:isObject\(\) or Type\:\:getObjectClassNames\(\) instead\.$#'
-			identifier: phpstanApi.instanceofType
-			count: 1
-			path: src/Rules/PhpDoc/RequireImplementsDefinitionTraitRule.php
-
 		-
 			message: '#^Doing instanceof PHPStan\\Type\\Generic\\GenericObjectType is error\-prone and deprecated\.$#'
 			identifier: phpstanApi.instanceofType
@@ -675,36 +639,6 @@ parameters:
 			count: 1
 			path: src/Rules/RuleLevelHelper.php
 
-		-
-			message: '#^Doing instanceof PHPStan\\Type\\ObjectType is error\-prone and deprecated\. Use Type\:\:isObject\(\) or Type\:\:getObjectClassNames\(\) instead\.$#'
-			identifier: phpstanApi.instanceofType
-			count: 2
-			path: src/Rules/RuleLevelHelper.php
-
-		-
-			message: '#^Doing instanceof PHPStan\\Type\\Constant\\ConstantBooleanType is error\-prone and deprecated\. Use Type\:\:isTrue\(\) or Type\:\:isFalse\(\) instead\.$#'
-			identifier: phpstanApi.instanceofType
-			count: 1
-			path: src/Rules/TooWideTypehints/TooWideMethodReturnTypehintRule.php
-
-		-
-			message: '#^Doing instanceof PHPStan\\Type\\Constant\\ConstantStringType is error\-prone and deprecated\. Use Type\:\:getConstantStrings\(\) instead\.$#'
-			identifier: phpstanApi.instanceofType
-			count: 1
-			path: src/Rules/UnusedFunctionParametersCheck.php
-
-		-
-			message: '#^Doing instanceof PHPStan\\Type\\Constant\\ConstantArrayType is error\-prone and deprecated\. Use Type\:\:getConstantArrays\(\) instead\.$#'
-			identifier: phpstanApi.instanceofType
-			count: 1
-			path: src/Rules/Variables/CompactVariablesRule.php
-
-		-
-			message: '#^Doing instanceof PHPStan\\Type\\Constant\\ConstantStringType is error\-prone and deprecated\. Use Type\:\:getConstantStrings\(\) instead\.$#'
-			identifier: phpstanApi.instanceofType
-			count: 1
-			path: src/Rules/Variables/CompactVariablesRule.php
-
 		-
 			message: '''
 				#^Call to deprecated method assertFileNotExists\(\) of class PHPUnit\\Framework\\Assert\:

src/Rules/Api/NodeConnectingVisitorAttributesRule.php

@@ -7,7 +7,6 @@
 use PHPStan\Analyser\Scope;
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleErrorBuilder;
-use PHPStan\Type\Constant\ConstantStringType;
 use PHPStan\Type\ObjectType;
 use function array_keys;
 use function in_array;
@@ -41,37 +40,40 @@ public function processNode(Node $node, Scope $scope): array
 		if (!isset($args[0])) {
 			return [];
 		}
+
+		$messages = [];
 		$argType = $scope->getType($args[0]->value);
-		if (!$argType instanceof ConstantStringType) {
-			return [];
-		}
-		if (!in_array($argType->getValue(), ['parent', 'previous', 'next'], true)) {
-			return [];
-		}
-		if (!$scope->isInClass()) {
-			return [];
-		}
+		foreach ($argType->getConstantStrings() as $constantString) {
+			$argValue = $constantString->getValue();
+			if (!in_array($argValue, ['parent', 'previous', 'next'], true)) {
+				continue;
+			}
 
-		$classReflection = $scope->getClassReflection();
-		$hasPhpStanInterface = false;
-		foreach (array_keys($classReflection->getInterfaces()) as $interfaceName) {
-			if (!str_starts_with($interfaceName, 'PHPStan\\')) {
+			if (!$scope->isInClass()) {
 				continue;
 			}
 
-			$hasPhpStanInterface = true;
-		}
+			$classReflection = $scope->getClassReflection();
+			$hasPhpStanInterface = false;
+			foreach (array_keys($classReflection->getInterfaces()) as $interfaceName) {
+				if (!str_starts_with($interfaceName, 'PHPStan\\')) {
+					continue;
+				}
 
-		if (!$hasPhpStanInterface) {
-			return [];
-		}
+				$hasPhpStanInterface = true;
+			}
 
-		return [
-			RuleErrorBuilder::message(sprintf('Node attribute \'%s\' is no longer available.', $argType->getValue()))
+			if (!$hasPhpStanInterface) {
+				continue;
+			}
+
+			$messages[] = RuleErrorBuilder::message(sprintf('Node attribute \'%s\' is no longer available.', $argValue))
 				->identifier('phpParser.nodeConnectingAttribute')
 				->tip('See: https://phpstan.org/blog/preprocessing-ast-for-custom-rules')
-				->build(),
-		];
+				->build();
+		}
+
+		return $messages;
 	}
 
 }

src/Rules/Arrays/DuplicateKeysInLiteralArraysRule.php

@@ -9,10 +9,10 @@
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleErrorBuilder;
 use PHPStan\Type\Constant\ConstantIntegerType;
-use PHPStan\Type\ConstantScalarType;
 use function array_keys;
 use function count;
 use function implode;
+use function is_int;
 use function max;
 use function sprintf;
 use function var_export;
@@ -70,38 +70,37 @@ public function processNode(Node $node, Scope $scope): array
 				}
 			} else {
 				$keyType = $itemNode->getScope()->getType($key);
-
-				$arrayKeyValue = $keyType->toArrayKey();
-				if ($arrayKeyValue instanceof ConstantIntegerType) {
+				$arrayKeyValues = $keyType->toArrayKey()->getConstantScalarValues();
+				if (count($arrayKeyValues) === 1 && is_int($arrayKeyValues[0])) {
 					$autoGeneratedIndex = $autoGeneratedIndex === null
-						? $arrayKeyValue->getValue()
-						: max($autoGeneratedIndex, $arrayKeyValue->getValue());
+						? $arrayKeyValues[0]
+						: max($autoGeneratedIndex, $arrayKeyValues[0]);
 				}
 			}
 
-			if (!$keyType instanceof ConstantScalarType) {
+			if (count($keyType->getConstantScalarValues()) === 0) {
 				$autoGeneratedIndex = false;
 				continue;
 			}
 
-			$value = $keyType->getValue();
-			$printedValue = $key !== null
-				? $this->exprPrinter->printExpr($key)
-				: $value;
+			foreach ($keyType->getConstantScalarValues() as $value) {
+				$printedValue = $key !== null
+					? $this->exprPrinter->printExpr($key)
+					: $value;
+				$printedValues[$value][] = $printedValue;
 
-			$printedValues[$value][] = $printedValue;
+				if (!isset($valueLines[$value])) {
+					$valueLines[$value] = $item->getStartLine();
+				}
 
-			if (!isset($valueLines[$value])) {
-				$valueLines[$value] = $item->getStartLine();
-			}
+				$previousCount = count($values);
+				$values[$value] = $printedValue;
+				if ($previousCount !== count($values)) {
+					continue;
+				}
 
-			$previousCount = count($values);
-			$values[$value] = $printedValue;
-			if ($previousCount !== count($values)) {
-				continue;
+				$duplicateKeys[$value] = true;
 			}
-
-			$duplicateKeys[$value] = true;
 		}
 
 		$messages = [];

src/Rules/Classes/RequireExtendsRule.php

@@ -7,7 +7,6 @@
 use PHPStan\Node\InClassNode;
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleErrorBuilder;
-use PHPStan\Type\ObjectType;
 use PHPStan\Type\VerbosityLevel;
 use function sprintf;
 
@@ -35,49 +34,49 @@ public function processNode(Node $node, Scope $scope): array
 			$extendsTags = $interface->getRequireExtendsTags();
 			foreach ($extendsTags as $extendsTag) {
 				$type = $extendsTag->getType();
-				if (!$type instanceof ObjectType) {
-					continue;
-				}
+				foreach ($type->getObjectClassNames() as $className) {
+					if ($classReflection->is($className)) {
+						continue;
+					}
 
-				if ($classReflection->is($type->getClassName())) {
-					continue;
-				}
+					$errors[] = RuleErrorBuilder::message(
+						sprintf(
+							'Interface %s requires implementing class to extend %s, but %s does not.',
+							$interface->getDisplayName(),
+							$type->describe(VerbosityLevel::typeOnly()),
+							$classReflection->getDisplayName(),
+						),
+					)
+						->identifier('class.missingExtends')
+						->build();
 
-				$errors[] = RuleErrorBuilder::message(
-					sprintf(
-						'Interface %s requires implementing class to extend %s, but %s does not.',
-						$interface->getDisplayName(),
-						$type->describe(VerbosityLevel::typeOnly()),
-						$classReflection->getDisplayName(),
-					),
-				)
-					->identifier('class.missingExtends')
-					->build();
+					break;
+				}
 			}
 		}
 
 		foreach ($classReflection->getTraits(true) as $trait) {
 			$extendsTags = $trait->getRequireExtendsTags();
 			foreach ($extendsTags as $extendsTag) {
 				$type = $extendsTag->getType();
-				if (!$type instanceof ObjectType) {
-					continue;
-				}
+				foreach ($type->getObjectClassNames() as $className) {
+					if ($classReflection->is($className)) {
+						continue;
+					}
 
-				if ($classReflection->is($type->getClassName())) {
-					continue;
-				}
+					$errors[] = RuleErrorBuilder::message(
+						sprintf(
+							'Trait %s requires using class to extend %s, but %s does not.',
+							$trait->getDisplayName(),
+							$type->describe(VerbosityLevel::typeOnly()),
+							$classReflection->getDisplayName(),
+						),
+					)
+						->identifier('class.missingExtends')
+						->build();
 
-				$errors[] = RuleErrorBuilder::message(
-					sprintf(
-						'Trait %s requires using class to extend %s, but %s does not.',
-						$trait->getDisplayName(),
-						$type->describe(VerbosityLevel::typeOnly()),
-						$classReflection->getDisplayName(),
-					),
-				)
-					->identifier('class.missingExtends')
-					->build();
+					break;
+				}
 			}
 		}
 

src/Rules/Comparison/ConstantLooseComparisonRule.php

@@ -7,7 +7,6 @@
 use PHPStan\Parser\LastConditionVisitor;
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleErrorBuilder;
-use PHPStan\Type\Constant\ConstantBooleanType;
 use PHPStan\Type\VerbosityLevel;
 use function sprintf;
 
@@ -37,7 +36,7 @@ public function processNode(Node $node, Scope $scope): array
 		}
 
 		$nodeType = $this->treatPhpDocTypesAsCertain ? $scope->getType($node) : $scope->getNativeType($node);
-		if (!$nodeType instanceof ConstantBooleanType) {
+		if (!$nodeType->isTrue()->yes() && !$nodeType->isFalse()->yes()) {
 			return [];
 		}
 
@@ -47,7 +46,7 @@ public function processNode(Node $node, Scope $scope): array
 			}
 
 			$instanceofTypeWithoutPhpDocs = $scope->getNativeType($node);
-			if ($instanceofTypeWithoutPhpDocs instanceof ConstantBooleanType) {
+			if ($instanceofTypeWithoutPhpDocs->isTrue()->yes() || $instanceofTypeWithoutPhpDocs->isFalse()->yes()) {
 				return $ruleErrorBuilder;
 			}
 			if (!$this->treatPhpDocTypesAsCertainTip) {
@@ -57,7 +56,7 @@ public function processNode(Node $node, Scope $scope): array
 			return $ruleErrorBuilder->treatPhpDocTypesAsCertainTip();
 		};
 
-		if (!$nodeType->getValue()) {
+		if ($nodeType->isFalse()->yes()) {
 			return [
 				$addTip(RuleErrorBuilder::message(sprintf(
 					'Loose comparison using %s between %s and %s will always evaluate to false.',

src/Rules/Comparison/ImpossibleCheckTypeHelper.php

@@ -69,11 +69,12 @@ public function findSpecifiedType(
 				if ($functionName === 'assert' && $argsCount >= 1) {
 					$arg = $node->getArgs()[0]->value;
 					$assertValue = ($this->treatPhpDocTypesAsCertain ? $scope->getType($arg) : $scope->getNativeType($arg))->toBoolean();
-					if (!$assertValue instanceof ConstantBooleanType) {
+					if (! $assertValue->isTrue()->yes() && ! $assertValue->isFalse()->yes()) {
 						return null;
 					}
 
-					return $assertValue->getValue();
+					/** @var bool */
+					return $assertValue->getConstantScalarValues()[0];
 				}
 				if (in_array($functionName, [
 					'class_exists',