phpstan · ondrejmirtes · Nov 6, 2022 · Nov 5, 2022 · Nov 5, 2022 · Nov 5, 2022
diff --git a/build/baseline-lt-7.3.neon b/build/baseline-lt-7.3.neon
@@ -1,6 +1,2 @@
 parameters:
-	ignoreErrors:
-		-
-			message: "#^Call to an undefined static method PHPUnit\\\\Framework\\\\TestCase\\:\\:assertFileDoesNotExist\\(\\)\\.$#"
-			count: 1
-			path: ../src/Testing/LevelsTestCase.php
+	ignoreErrors: []
diff --git a/src/Analyser/MutatingScope.php b/src/Analyser/MutatingScope.php
@@ -1768,7 +1768,7 @@ private function resolveType(Expr $node): Type
 							return $type->getGenericType();
 						}
 
-						if ($type instanceof ConstantStringType && $type->isClassString()) {
+						if ($type instanceof ConstantStringType && $type->isClassStringType()->yes()) {
 							return new ObjectType($type->getValue());
 						}
 

diff --git a/src/Dependency/DependencyResolver.php b/src/Dependency/DependencyResolver.php
@@ -22,7 +22,6 @@
 use PHPStan\Reflection\ParametersAcceptorWithPhpDocs;
 use PHPStan\Reflection\ReflectionProvider;
 use PHPStan\Type\ClosureType;
-use PHPStan\Type\Constant\ConstantStringType;
 use PHPStan\Type\FileTypeMapper;
 use PHPStan\Type\ParserNodeTypeToPHPStanType;
 use PHPStan\Type\Type;
@@ -458,11 +457,7 @@ private function considerArrayForCallableTest(Scope $scope, Array_ $arrayNode):
 		}
 
 		$itemType = $scope->getType($items[0]->value);
-		if (!$itemType instanceof ConstantStringType) {
-			return false;
-		}
-
-		return $itemType->isClassString();
+		return $itemType->isClassStringType()->yes();
 	}
 
 	/**

diff --git a/src/Rules/Methods/StaticMethodCallCheck.php b/src/Rules/Methods/StaticMethodCallCheck.php
@@ -58,6 +58,11 @@ public function check(
 		$errors = [];
 		$isAbstract = false;
 		if ($class instanceof Name) {
+			$classStringType = $scope->getType(new Expr\ClassConstFetch($class, 'class'));
+			if ($classStringType->hasMethod($methodName)->yes()) {
+				return [[], null];
+			}
+
 			$className = (string) $class;
 			$lowercasedClassName = strtolower($className);
 			if (in_array($lowercasedClassName, ['self', 'static'], true)) {
@@ -109,11 +114,6 @@ public function check(
 
 				$classType = $scope->resolveTypeByName($class);
 			} else {
-				$classStringType = $scope->getType(new Expr\ClassConstFetch($class, 'class'));
-				if ($classStringType->hasMethod($methodName)->yes()) {
-					return [[], null];
-				}
-
 				if (!$this->reflectionProvider->hasClass($className)) {
 					if ($scope->isInClassExists($className)) {
 						return [[], null];

diff --git a/src/Type/Accessory/AccessoryArrayListType.php b/src/Type/Accessory/AccessoryArrayListType.php
@@ -277,6 +277,11 @@ public function isLiteralString(): TrinaryLogic
 		return TrinaryLogic::createNo();
 	}
 
+	public function isClassStringType(): TrinaryLogic
+	{
+		return TrinaryLogic::createNo();
+	}
+
 	public function toNumber(): Type
 	{
 		return new ErrorType();

diff --git a/src/Type/Accessory/AccessoryLiteralStringType.php b/src/Type/Accessory/AccessoryLiteralStringType.php
@@ -191,6 +191,11 @@ public function isLiteralString(): TrinaryLogic
 		return TrinaryLogic::createYes();
 	}
 
+	public function isClassStringType(): TrinaryLogic
+	{
+		return TrinaryLogic::createMaybe();
+	}
+
 	public function traverse(callable $cb): Type
 	{
 		return $this;

diff --git a/src/Type/Accessory/AccessoryNonEmptyStringType.php b/src/Type/Accessory/AccessoryNonEmptyStringType.php
@@ -191,6 +191,11 @@ public function isLiteralString(): TrinaryLogic
 		return TrinaryLogic::createMaybe();
 	}
 
+	public function isClassStringType(): TrinaryLogic
+	{
+		return TrinaryLogic::createMaybe();
+	}
+
 	public function traverse(callable $cb): Type
 	{
 		return $this;

diff --git a/src/Type/Accessory/AccessoryNonFalsyStringType.php b/src/Type/Accessory/AccessoryNonFalsyStringType.php
@@ -191,6 +191,11 @@ public function isLiteralString(): TrinaryLogic
 		return TrinaryLogic::createMaybe();
 	}
 
+	public function isClassStringType(): TrinaryLogic
+	{
+		return TrinaryLogic::createMaybe();
+	}
+
 	public function traverse(callable $cb): Type
 	{
 		return $this;

diff --git a/src/Type/Accessory/AccessoryNumericStringType.php b/src/Type/Accessory/AccessoryNumericStringType.php
@@ -194,6 +194,11 @@ public function isLiteralString(): TrinaryLogic
 		return TrinaryLogic::createMaybe();
 	}
 
+	public function isClassStringType(): TrinaryLogic
+	{
+		return TrinaryLogic::createNo();
+	}
+
 	public function traverse(callable $cb): Type
 	{
 		return $this;

diff --git a/src/Type/Accessory/HasOffsetType.php b/src/Type/Accessory/HasOffsetType.php
@@ -194,6 +194,11 @@ public function isLiteralString(): TrinaryLogic
 		return TrinaryLogic::createMaybe();
 	}
 
+	public function isClassStringType(): TrinaryLogic
+	{
+		return TrinaryLogic::createMaybe();
+	}
+
 	public function getKeysArray(): Type
 	{
 		return new NonEmptyArrayType();

diff --git a/src/Type/Accessory/HasOffsetValueType.php b/src/Type/Accessory/HasOffsetValueType.php
@@ -245,6 +245,11 @@ public function isLiteralString(): TrinaryLogic
 		return TrinaryLogic::createMaybe();
 	}
 
+	public function isClassStringType(): TrinaryLogic
+	{
+		return TrinaryLogic::createMaybe();
+	}
+
 	public function toNumber(): Type
 	{
 		return new ErrorType();

diff --git a/src/Type/Accessory/NonEmptyArrayType.php b/src/Type/Accessory/NonEmptyArrayType.php
@@ -262,6 +262,11 @@ public function isLiteralString(): TrinaryLogic
 		return TrinaryLogic::createNo();
 	}
 
+	public function isClassStringType(): TrinaryLogic
+	{
+		return TrinaryLogic::createNo();
+	}
+
 	public function toNumber(): Type
 	{
 		return new ErrorType();

diff --git a/src/Type/Accessory/OversizedArrayType.php b/src/Type/Accessory/OversizedArrayType.php
@@ -261,6 +261,11 @@ public function isLiteralString(): TrinaryLogic
 		return TrinaryLogic::createNo();
 	}
 
+	public function isClassStringType(): TrinaryLogic
+	{
+		return TrinaryLogic::createNo();
+	}
+
 	public function toNumber(): Type
 	{
 		return new ErrorType();

diff --git a/src/Type/ArrayType.php b/src/Type/ArrayType.php
@@ -285,6 +285,11 @@ public function isLiteralString(): TrinaryLogic
 		return TrinaryLogic::createNo();
 	}
 
+	public function isClassStringType(): TrinaryLogic
+	{
+		return TrinaryLogic::createNo();
+	}
+
 	public function isOffsetAccessible(): TrinaryLogic
 	{
 		return TrinaryLogic::createYes();

diff --git a/src/Type/CallableType.php b/src/Type/CallableType.php
@@ -347,6 +347,11 @@ public function isLiteralString(): TrinaryLogic
 		return TrinaryLogic::createMaybe();
 	}
 
+	public function isClassStringType(): TrinaryLogic
+	{
+		return TrinaryLogic::createMaybe();
+	}
+
 	public function isCommonCallable(): bool
 	{
 		return $this->isCommonCallable;

diff --git a/src/Type/ClassStringType.php b/src/Type/ClassStringType.php
@@ -3,7 +3,6 @@
 namespace PHPStan\Type;
 
 use PHPStan\TrinaryLogic;
-use PHPStan\Type\Constant\ConstantStringType;
 
 /** @api */
 class ClassStringType extends StringType
@@ -26,40 +25,16 @@ public function accepts(Type $type, bool $strictTypes): TrinaryLogic
 			return $type->isAcceptedBy($this, $strictTypes);
 		}
 
-		if ($type instanceof ConstantStringType) {
-			return TrinaryLogic::createFromBoolean($type->isClassString());
-		}
-
-		if ($type instanceof self) {
-			return TrinaryLogic::createYes();
-		}
-
-		if ($type instanceof StringType) {
-			return TrinaryLogic::createMaybe();
-		}
-
-		return TrinaryLogic::createNo();
+		return $type->isClassStringType();
 	}
 
 	public function isSuperTypeOf(Type $type): TrinaryLogic
 	{
-		if ($type instanceof ConstantStringType) {
-			return TrinaryLogic::createFromBoolean($type->isClassString());
-		}
-
-		if ($type instanceof self) {
-			return TrinaryLogic::createYes();
-		}
-
-		if ($type instanceof parent) {
-			return TrinaryLogic::createMaybe();
-		}
-
 		if ($type instanceof CompoundType) {
 			return $type->isSubTypeOf($this);
 		}
 
-		return TrinaryLogic::createNo();
+		return $type->isClassStringType();
 	}
 
 	public function isString(): TrinaryLogic
@@ -87,6 +62,11 @@ public function isLiteralString(): TrinaryLogic
 		return TrinaryLogic::createMaybe();
 	}
 
+	public function isClassStringType(): TrinaryLogic
+	{
+		return TrinaryLogic::createYes();
+	}
+
 	/**
 	 * @param mixed[] $properties
 	 */

diff --git a/src/Type/ClosureType.php b/src/Type/ClosureType.php
@@ -416,6 +416,11 @@ public function isLiteralString(): TrinaryLogic
 		return TrinaryLogic::createNo();
 	}
 
+	public function isClassStringType(): TrinaryLogic
+	{
+		return TrinaryLogic::createNo();
+	}
+
 	/**
 	 * @param mixed[] $properties
 	 */

diff --git a/src/Type/Constant/ConstantStringType.php b/src/Type/Constant/ConstantStringType.php
@@ -64,23 +64,24 @@ public function getValue(): string
 		return $this->value;
 	}
 
-	public function hasMethod(string $methodName): TrinaryLogic
-	{
-		if ($this->isClassString()) {
-			return TrinaryLogic::createMaybe();
-		}
-		return TrinaryLogic::createNo();
-	}
-
-	public function isClassString(): bool
+	public function isClassStringType(): TrinaryLogic
 	{
 		if ($this->isClassString) {
-			return true;
+			return TrinaryLogic::createYes();
+
 		}
 
 		$reflectionProvider = ReflectionProviderStaticAccessor::getInstance();
 
-		return $reflectionProvider->hasClass($this->value);
+		return TrinaryLogic::createFromBoolean($reflectionProvider->hasClass($this->value));
+	}
+
+	/**
+	 * @deprecated use isClassStringType() instead
+	 */
+	public function isClassString(): bool
+	{
+		return $this->isClassStringType()->yes();
 	}
 
 	public function describe(VerbosityLevel $level): string
@@ -143,7 +144,7 @@ public function isSuperTypeOf(Type $type): TrinaryLogic
 			return TrinaryLogic::createNo();
 		}
 		if ($type instanceof ClassStringType) {
-			return $this->isClassString() ? TrinaryLogic::createMaybe() : TrinaryLogic::createNo();
+			return $this->isClassStringType()->yes() ? TrinaryLogic::createMaybe() : TrinaryLogic::createNo();
 		}
 
 		if ($type instanceof self) {
@@ -445,7 +446,7 @@ public function getGreaterOrEqualType(): Type
 
 	public function canAccessConstants(): TrinaryLogic
 	{
-		return TrinaryLogic::createFromBoolean($this->isClassString());
+		return $this->isClassStringType();
 	}
 
 	public function hasConstant(string $constantName): TrinaryLogic

diff --git a/src/Type/FloatType.php b/src/Type/FloatType.php
@@ -146,6 +146,11 @@ public function isLiteralString(): TrinaryLogic
 		return TrinaryLogic::createNo();
 	}
 
+	public function isClassStringType(): TrinaryLogic
+	{
+		return TrinaryLogic::createNo();
+	}
+
 	public function traverse(callable $cb): Type
 	{
 		return $this;

diff --git a/src/Type/Generic/GenericClassStringType.php b/src/Type/Generic/GenericClassStringType.php
@@ -52,7 +52,7 @@ public function accepts(Type $type, bool $strictTypes): TrinaryLogic
 		}
 
 		if ($type instanceof ConstantStringType) {
-			if (!$type->isClassString()) {
+			if (!$type->isClassStringType()->yes()) {
 				return TrinaryLogic::createNo();
 			}
 
@@ -98,7 +98,7 @@ public function isSuperTypeOf(Type $type): TrinaryLogic
 				$isSuperType = $genericType->isSuperTypeOf($objectType);
 			}
 
-			if (!$type->isClassString()) {
+			if (!$type->isClassStringType()->yes()) {
 				$isSuperType = $isSuperType->and(TrinaryLogic::createMaybe());
 			}
 
@@ -132,7 +132,7 @@ public function inferTemplateTypes(Type $receivedType): TemplateTypeMap
 			$typeToInfer = new ObjectType($receivedType->getValue());
 		} elseif ($receivedType instanceof self) {
 			$typeToInfer = $receivedType->type;
-		} elseif ($receivedType instanceof ClassStringType) {
+		} elseif ($receivedType->isClassStringType()->yes()) {
 			$typeToInfer = $this->type;
 			if ($typeToInfer instanceof TemplateType) {
 				$typeToInfer = $typeToInfer->getBound();
@@ -180,7 +180,7 @@ public static function __set_state(array $properties): Type
 
 	public function tryRemove(Type $typeToRemove): ?Type
 	{
-		if ($typeToRemove instanceof ConstantStringType && $typeToRemove->isClassString()) {
+		if ($typeToRemove instanceof ConstantStringType && $typeToRemove->isClassStringType()->yes()) {
 			$generic = $this->getGenericType();
 
 			if ($generic instanceof TypeWithClassName) {

diff --git a/src/Type/IntersectionType.php b/src/Type/IntersectionType.php
@@ -506,6 +506,11 @@ public function isLiteralString(): TrinaryLogic
 		return $this->intersectResults(static fn (Type $type): TrinaryLogic => $type->isLiteralString());
 	}
 
+	public function isClassStringType(): TrinaryLogic
+	{
+		return $this->intersectResults(static fn (Type $type): TrinaryLogic => $type->isClassStringType());
+	}
+
 	public function isOffsetAccessible(): TrinaryLogic
 	{
 		return $this->intersectResults(static fn (Type $type): TrinaryLogic => $type->isOffsetAccessible());

diff --git a/src/Type/IterableType.php b/src/Type/IterableType.php
@@ -285,6 +285,11 @@ public function isLiteralString(): TrinaryLogic
 		return TrinaryLogic::createNo();
 	}
 
+	public function isClassStringType(): TrinaryLogic
+	{
+		return TrinaryLogic::createNo();
+	}
+
 	public function inferTemplateTypes(Type $receivedType): TemplateTypeMap
 	{
 		if ($receivedType instanceof UnionType || $receivedType instanceof IntersectionType) {