[BCB] Rename Type::isClassStringType() to Type::isClassString()

ondrejmirtes · ondrejmirtes · commit d904afcf06b2 · 2024-09-27T13:18:13.000+02:00
diff --git a/UPGRADING.md b/UPGRADING.md
@@ -244,3 +244,4 @@ Instead of `PHPStanTestCase::createBroker()`, call `PHPStanTestCase::createRefle
 * Remove `ConstantReflection::getValue()`, use `getValueExpr()` instead. To get `Type` from `Expr`, use `Scope::getType()` or `InitializerExprTypeResolver::getType()`
 * Remove `PropertyTag::getType()`, use `getReadableType()` / `getWritableType()` instead
 * Remove `GenericTypeVariableResolver`, use [`Type::getTemplateType()`](https://apiref.phpstan.org/2.0.x/PHPStan.Type.Type.html#_getTemplateType) instead
+* Rename `Type::isClassStringType()` to `Type::isClassString()`
diff --git a/src/Dependency/DependencyResolver.php b/src/Dependency/DependencyResolver.php
@@ -477,7 +477,7 @@ private function considerArrayForCallableTest(Scope $scope, Array_ $arrayNode):
 		}
 
 		$itemType = $scope->getType($items[0]->value);
-		return $itemType->isClassStringType()->yes();
+		return $itemType->isClassString()->yes();
 	}
 
 	/**
diff --git a/src/Reflection/InitializerExprTypeResolver.php b/src/Reflection/InitializerExprTypeResolver.php
@@ -1916,7 +1916,7 @@ function (Type $type, callable $traverse): Type {
 			);
 		}
 
-		if ($constantClassType->isClassStringType()->yes()) {
+		if ($constantClassType->isClassString()->yes()) {
 			if ($constantClassType->isConstantScalarValue()->yes()) {
 				$isObject = false;
 			}
diff --git a/src/Rules/Methods/MethodCallCheck.php b/src/Rules/Methods/MethodCallCheck.php
@@ -56,7 +56,7 @@ public function check(
 		if ($type instanceof StaticType) {
 			$typeForDescribe = $type->getStaticObjectType();
 		}
-		if (!$type->canCallMethods()->yes() || $type->isClassStringType()->yes()) {
+		if (!$type->canCallMethods()->yes() || $type->isClassString()->yes()) {
 			return [
 				[
 					RuleErrorBuilder::message(sprintf(
diff --git a/src/Type/Accessory/AccessoryArrayListType.php b/src/Type/Accessory/AccessoryArrayListType.php
@@ -391,7 +391,7 @@ public function isLowercaseString(): TrinaryLogic
 		return TrinaryLogic::createNo();
 	}
 
-	public function isClassStringType(): TrinaryLogic
+	public function isClassString(): TrinaryLogic
 	{
 		return TrinaryLogic::createNo();
 	}
diff --git a/src/Type/Accessory/AccessoryLiteralStringType.php b/src/Type/Accessory/AccessoryLiteralStringType.php
@@ -302,7 +302,7 @@ public function isLowercaseString(): TrinaryLogic
 		return TrinaryLogic::createMaybe();
 	}
 
-	public function isClassStringType(): TrinaryLogic
+	public function isClassString(): TrinaryLogic
 	{
 		return TrinaryLogic::createMaybe();
 	}
diff --git a/src/Type/Accessory/AccessoryLowercaseStringType.php b/src/Type/Accessory/AccessoryLowercaseStringType.php
@@ -298,7 +298,7 @@ public function isLowercaseString(): TrinaryLogic
 		return TrinaryLogic::createYes();
 	}
 
-	public function isClassStringType(): TrinaryLogic
+	public function isClassString(): TrinaryLogic
 	{
 		return TrinaryLogic::createMaybe();
 	}
diff --git a/src/Type/Accessory/AccessoryNonEmptyStringType.php b/src/Type/Accessory/AccessoryNonEmptyStringType.php
@@ -299,7 +299,7 @@ public function isLowercaseString(): TrinaryLogic
 		return TrinaryLogic::createMaybe();
 	}
 
-	public function isClassStringType(): TrinaryLogic
+	public function isClassString(): TrinaryLogic
 	{
 		return TrinaryLogic::createMaybe();
 	}
diff --git a/src/Type/Accessory/AccessoryNonFalsyStringType.php b/src/Type/Accessory/AccessoryNonFalsyStringType.php
@@ -299,7 +299,7 @@ public function isLowercaseString(): TrinaryLogic
 		return TrinaryLogic::createMaybe();
 	}
 
-	public function isClassStringType(): TrinaryLogic
+	public function isClassString(): TrinaryLogic
 	{
 		return TrinaryLogic::createMaybe();
 	}
diff --git a/src/Type/Accessory/AccessoryNumericStringType.php b/src/Type/Accessory/AccessoryNumericStringType.php
@@ -301,7 +301,7 @@ public function isLowercaseString(): TrinaryLogic
 		return TrinaryLogic::createMaybe();
 	}
 
-	public function isClassStringType(): TrinaryLogic
+	public function isClassString(): TrinaryLogic
 	{
 		return TrinaryLogic::createNo();
 	}
diff --git a/src/Type/Accessory/HasOffsetType.php b/src/Type/Accessory/HasOffsetType.php
@@ -302,7 +302,7 @@ public function isLowercaseString(): TrinaryLogic
 		return TrinaryLogic::createMaybe();
 	}
 
-	public function isClassStringType(): TrinaryLogic
+	public function isClassString(): TrinaryLogic
 	{
 		return TrinaryLogic::createMaybe();
 	}
diff --git a/src/Type/Accessory/HasOffsetValueType.php b/src/Type/Accessory/HasOffsetValueType.php
@@ -358,7 +358,7 @@ public function isLowercaseString(): TrinaryLogic
 		return TrinaryLogic::createMaybe();
 	}
 
-	public function isClassStringType(): TrinaryLogic
+	public function isClassString(): TrinaryLogic
 	{
 		return TrinaryLogic::createMaybe();
 	}
diff --git a/src/Type/Accessory/NonEmptyArrayType.php b/src/Type/Accessory/NonEmptyArrayType.php
@@ -369,7 +369,7 @@ public function isLowercaseString(): TrinaryLogic
 		return TrinaryLogic::createNo();
 	}
 
-	public function isClassStringType(): TrinaryLogic
+	public function isClassString(): TrinaryLogic
 	{
 		return TrinaryLogic::createNo();
 	}
diff --git a/src/Type/Accessory/OversizedArrayType.php b/src/Type/Accessory/OversizedArrayType.php
@@ -365,7 +365,7 @@ public function isLowercaseString(): TrinaryLogic
 		return TrinaryLogic::createNo();
 	}
 
-	public function isClassStringType(): TrinaryLogic
+	public function isClassString(): TrinaryLogic
 	{
 		return TrinaryLogic::createNo();
 	}
diff --git a/src/Type/ArrayType.php b/src/Type/ArrayType.php
@@ -355,7 +355,7 @@ public function isLowercaseString(): TrinaryLogic
 		return TrinaryLogic::createNo();
 	}
 
-	public function isClassStringType(): TrinaryLogic
+	public function isClassString(): TrinaryLogic
 	{
 		return TrinaryLogic::createNo();
 	}
diff --git a/src/Type/CallableType.php b/src/Type/CallableType.php
@@ -596,7 +596,7 @@ public function isLowercaseString(): TrinaryLogic
 		return TrinaryLogic::createMaybe();
 	}
 
-	public function isClassStringType(): TrinaryLogic
+	public function isClassString(): TrinaryLogic
 	{
 		return TrinaryLogic::createMaybe();
 	}
diff --git a/src/Type/ClassStringType.php b/src/Type/ClassStringType.php
@@ -32,7 +32,7 @@ public function acceptsWithReason(Type $type, bool $strictTypes): AcceptsResult
 			return $type->isAcceptedWithReasonBy($this, $strictTypes);
 		}
 
-		return new AcceptsResult($type->isClassStringType(), []);
+		return new AcceptsResult($type->isClassString(), []);
 	}
 
 	public function isSuperTypeOf(Type $type): TrinaryLogic
@@ -41,7 +41,7 @@ public function isSuperTypeOf(Type $type): TrinaryLogic
 			return $type->isSubTypeOf($this);
 		}
 
-		return $type->isClassStringType();
+		return $type->isClassString();
 	}
 
 	public function isString(): TrinaryLogic
@@ -74,7 +74,7 @@ public function isLowercaseString(): TrinaryLogic
 		return TrinaryLogic::createMaybe();
 	}
 
-	public function isClassStringType(): TrinaryLogic
+	public function isClassString(): TrinaryLogic
 	{
 		return TrinaryLogic::createYes();
 	}
diff --git a/src/Type/ClosureType.php b/src/Type/ClosureType.php
@@ -718,7 +718,7 @@ public function isLowercaseString(): TrinaryLogic
 		return TrinaryLogic::createNo();
 	}
 
-	public function isClassStringType(): TrinaryLogic
+	public function isClassString(): TrinaryLogic
 	{
 		return TrinaryLogic::createNo();
 	}
diff --git a/src/Type/Constant/ConstantStringType.php b/src/Type/Constant/ConstantStringType.php
@@ -82,7 +82,7 @@ public function getConstantStrings(): array
 		return [$this];
 	}
 
-	public function isClassStringType(): TrinaryLogic
+	public function isClassString(): TrinaryLogic
 	{
 		if ($this->isClassString) {
 			return TrinaryLogic::createYes();
@@ -95,7 +95,7 @@ public function isClassStringType(): TrinaryLogic
 
 	public function getClassStringObjectType(): Type
 	{
-		if ($this->isClassStringType()->yes()) {
+		if ($this->isClassString()->yes()) {
 			return new ObjectType($this->value);
 		}
 
@@ -107,14 +107,6 @@ public function getObjectTypeOrClassStringObjectType(): Type
 		return $this->getClassStringObjectType();
 	}
 
-	/**
-	 * @deprecated use isClassStringType() instead
-	 */
-	public function isClassString(): bool
-	{
-		return $this->isClassStringType()->yes();
-	}
-
 	public function describe(VerbosityLevel $level): string
 	{
 		return $level->handle(
@@ -176,7 +168,7 @@ public function isSuperTypeOf(Type $type): TrinaryLogic
 			return TrinaryLogic::createNo();
 		}
 		if ($type instanceof ClassStringType) {
-			return $this->isClassStringType()->yes() ? TrinaryLogic::createMaybe() : TrinaryLogic::createNo();
+			return $this->isClassString()->yes() ? TrinaryLogic::createMaybe() : TrinaryLogic::createNo();
 		}
 
 		if ($type instanceof self) {
@@ -534,7 +526,7 @@ public function getGreaterOrEqualType(PhpVersion $phpVersion): Type
 
 	public function canAccessConstants(): TrinaryLogic
 	{
-		return $this->isClassStringType();
+		return $this->isClassString();
 	}
 
 	public function hasConstant(string $constantName): TrinaryLogic
diff --git a/src/Type/FloatType.php b/src/Type/FloatType.php
@@ -234,7 +234,7 @@ public function isLowercaseString(): TrinaryLogic
 		return TrinaryLogic::createNo();
 	}
 
-	public function isClassStringType(): TrinaryLogic
+	public function isClassString(): TrinaryLogic
 	{
 		return TrinaryLogic::createNo();
 	}
diff --git a/src/Type/Generic/GenericClassStringType.php b/src/Type/Generic/GenericClassStringType.php
@@ -67,7 +67,7 @@ public function acceptsWithReason(Type $type, bool $strictTypes): AcceptsResult
 		}
 
 		if ($type instanceof ConstantStringType) {
-			if (!$type->isClassStringType()->yes()) {
+			if (!$type->isClassString()->yes()) {
 				return AcceptsResult::createNo();
 			}
 
@@ -113,7 +113,7 @@ public function isSuperTypeOf(Type $type): TrinaryLogic
 				$isSuperType = $genericType->isSuperTypeOf($objectType);
 			}
 
-			if (!$type->isClassStringType()->yes()) {
+			if (!$type->isClassString()->yes()) {
 				$isSuperType = $isSuperType->and(TrinaryLogic::createMaybe());
 			}
 
@@ -157,7 +157,7 @@ public function inferTemplateTypes(Type $receivedType): TemplateTypeMap
 			$typeToInfer = new ObjectType($receivedType->getValue());
 		} elseif ($receivedType instanceof self) {
 			$typeToInfer = $receivedType->type;
-		} elseif ($receivedType->isClassStringType()->yes()) {
+		} elseif ($receivedType->isClassString()->yes()) {
 			$typeToInfer = $this->type;
 			if ($typeToInfer instanceof TemplateType) {
 				$typeToInfer = $typeToInfer->getBound();
@@ -215,7 +215,7 @@ public function toPhpDocNode(): TypeNode
 
 	public function tryRemove(Type $typeToRemove): ?Type
 	{
-		if ($typeToRemove instanceof ConstantStringType && $typeToRemove->isClassStringType()->yes()) {
+		if ($typeToRemove instanceof ConstantStringType && $typeToRemove->isClassString()->yes()) {
 			$generic = $this->getGenericType();
 
 			$genericObjectClassNames = $generic->getObjectClassNames();
diff --git a/src/Type/IntersectionType.php b/src/Type/IntersectionType.php
@@ -648,9 +648,9 @@ public function isLowercaseString(): TrinaryLogic
 		return $this->intersectResults(static fn (Type $type): TrinaryLogic => $type->isLowercaseString());
 	}
 
-	public function isClassStringType(): TrinaryLogic
+	public function isClassString(): TrinaryLogic
 	{
-		return $this->intersectResults(static fn (Type $type): TrinaryLogic => $type->isClassStringType());
+		return $this->intersectResults(static fn (Type $type): TrinaryLogic => $type->isClassString());
 	}
 
 	public function getClassStringObjectType(): Type
diff --git a/src/Type/IterableType.php b/src/Type/IterableType.php
@@ -377,7 +377,7 @@ public function isLowercaseString(): TrinaryLogic
 		return TrinaryLogic::createNo();
 	}
 
-	public function isClassStringType(): TrinaryLogic
+	public function isClassString(): TrinaryLogic
 	{
 		return TrinaryLogic::createNo();
 	}
diff --git a/src/Type/JustNullableTypeTrait.php b/src/Type/JustNullableTypeTrait.php
@@ -152,7 +152,7 @@ public function isLowercaseString(): TrinaryLogic
 		return TrinaryLogic::createNo();
 	}
 
-	public function isClassStringType(): TrinaryLogic
+	public function isClassString(): TrinaryLogic
 	{
 		return TrinaryLogic::createNo();
 	}
diff --git a/src/Type/MixedType.php b/src/Type/MixedType.php
@@ -933,7 +933,7 @@ public function isLowercaseString(): TrinaryLogic
 		return TrinaryLogic::createMaybe();
 	}
 
-	public function isClassStringType(): TrinaryLogic
+	public function isClassString(): TrinaryLogic
 	{
 		if ($this->subtractedType !== null) {
 			if ($this->subtractedType->isSuperTypeOf(new StringType())->yes()) {
@@ -949,7 +949,7 @@ public function isClassStringType(): TrinaryLogic
 
 	public function getClassStringObjectType(): Type
 	{
-		if (!$this->isClassStringType()->no()) {
+		if (!$this->isClassString()->no()) {
 			return new ObjectWithoutClassType();
 		}
 
diff --git a/src/Type/NeverType.php b/src/Type/NeverType.php
@@ -481,7 +481,7 @@ public function isLowercaseString(): TrinaryLogic
 		return TrinaryLogic::createNo();
 	}
 
-	public function isClassStringType(): TrinaryLogic
+	public function isClassString(): TrinaryLogic
 	{
 		return TrinaryLogic::createNo();
 	}
diff --git a/src/Type/NullType.php b/src/Type/NullType.php
@@ -300,7 +300,7 @@ public function isLowercaseString(): TrinaryLogic
 		return TrinaryLogic::createNo();
 	}
 
-	public function isClassStringType(): TrinaryLogic
+	public function isClassString(): TrinaryLogic
 	{
 		return TrinaryLogic::createNo();
 	}
diff --git a/src/Type/ObjectType.php b/src/Type/ObjectType.php
@@ -1039,7 +1039,7 @@ public function isLowercaseString(): TrinaryLogic
 		return TrinaryLogic::createNo();
 	}
 
-	public function isClassStringType(): TrinaryLogic
+	public function isClassString(): TrinaryLogic
 	{
 		return TrinaryLogic::createNo();
 	}
diff --git a/src/Type/Php/ClassImplementsFunctionReturnTypeExtension.php b/src/Type/Php/ClassImplementsFunctionReturnTypeExtension.php
@@ -57,7 +57,7 @@ public function getTypeFromFunctionCall(FunctionReflection $functionReflection,
 			return $variant->getReturnType();
 		}
 
-		if ($firstArgType->isClassStringType()->no()) {
+		if ($firstArgType->isClassString()->no()) {
 			return new ConstantBooleanType(false);
 		}
 
diff --git a/src/Type/Php/LtrimFunctionReturnTypeExtension.php b/src/Type/Php/LtrimFunctionReturnTypeExtension.php
@@ -29,7 +29,7 @@ public function getTypeFromFunctionCall(FunctionReflection $functionReflection,
 		$string = $scope->getType($functionCall->getArgs()[0]->value);
 		$trimChars = $scope->getType($functionCall->getArgs()[1]->value);
 
-		if ($trimChars instanceof ConstantStringType && $trimChars->getValue() === '\\' && $string->isClassStringType()->yes()) {
+		if ($trimChars instanceof ConstantStringType && $trimChars->getValue() === '\\' && $string->isClassString()->yes()) {
 			if ($string instanceof ConstantStringType) {
 				return new ConstantStringType(ltrim($string->getValue(), $trimChars->getValue()), true);
 			}
diff --git a/src/Type/Php/MethodExistsTypeSpecifyingExtension.php b/src/Type/Php/MethodExistsTypeSpecifyingExtension.php
@@ -53,7 +53,7 @@ public function specifyTypes(
 
 		$objectType = $scope->getType($node->getArgs()[0]->value);
 		if ($objectType->isString()->yes()) {
-			if ($objectType->isClassStringType()->yes()) {
+			if ($objectType->isClassString()->yes()) {
 				return $this->typeSpecifier->create(
 					$node->getArgs()[0]->value,
 					new IntersectionType([
diff --git a/src/Type/StaticType.php b/src/Type/StaticType.php
@@ -570,9 +570,9 @@ public function isLowercaseString(): TrinaryLogic
 		return $this->getStaticObjectType()->isLowercaseString();
 	}
 
-	public function isClassStringType(): TrinaryLogic
+	public function isClassString(): TrinaryLogic
 	{
-		return $this->getStaticObjectType()->isClassStringType();
+		return $this->getStaticObjectType()->isClassString();
 	}
 
 	public function getClassStringObjectType(): Type
diff --git a/src/Type/StrictMixedType.php b/src/Type/StrictMixedType.php
@@ -280,7 +280,7 @@ public function isLowercaseString(): TrinaryLogic
 		return TrinaryLogic::createNo();
 	}
 
-	public function isClassStringType(): TrinaryLogic
+	public function isClassString(): TrinaryLogic
 	{
 		return TrinaryLogic::createNo();
 	}
diff --git a/src/Type/StringType.php b/src/Type/StringType.php
diff --git a/src/Type/Traits/LateResolvableTypeTrait.php b/src/Type/Traits/LateResolvableTypeTrait.php
diff --git a/src/Type/Traits/ObjectTypeTrait.php b/src/Type/Traits/ObjectTypeTrait.php
diff --git a/src/Type/Type.php b/src/Type/Type.php
diff --git a/src/Type/UnionType.php b/src/Type/UnionType.php
diff --git a/src/Type/VoidType.php b/src/Type/VoidType.php
diff --git a/tests/PHPStan/Type/MixedTypeTest.php b/tests/PHPStan/Type/MixedTypeTest.php

Original file line number	Diff line number	Diff line change
`@@ -477,7 +477,7 @@ private function considerArrayForCallableTest(Scope $scope, Array_ $arrayNode):`
`477`	`477`	`}`
`478`	`478`
`479`	`479`	`$itemType = $scope->getType($items[0]->value);`
`480`		`- return $itemType->isClassStringType()->yes();`
	`480`	`+ return $itemType->isClassString()->yes();`
`481`	`481`	`}`
`482`	`482`
`483`	`483`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -1916,7 +1916,7 @@ function (Type $type, callable $traverse): Type {`
`1916`	`1916`	`);`
`1917`	`1917`	`}`
`1918`	`1918`
`1919`		`- if ($constantClassType->isClassStringType()->yes()) {`
	`1919`	`+ if ($constantClassType->isClassString()->yes()) {`
`1920`	`1920`	`if ($constantClassType->isConstantScalarValue()->yes()) {`
`1921`	`1921`	`$isObject = false;`
`1922`	`1922`	`}`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ public function check(`
`56`	`56`	`if ($type instanceof StaticType) {`
`57`	`57`	`$typeForDescribe = $type->getStaticObjectType();`
`58`	`58`	`}`
`59`		`- if (!$type->canCallMethods()->yes() \|\| $type->isClassStringType()->yes()) {`
	`59`	`+ if (!$type->canCallMethods()->yes() \|\| $type->isClassString()->yes()) {`
`60`	`60`	`return [`
`61`	`61`	`[`
`62`	`62`	`RuleErrorBuilder::message(sprintf(`
Original file line number	Diff line number	Diff line change
`@@ -391,7 +391,7 @@ public function isLowercaseString(): TrinaryLogic`
`391`	`391`	`return TrinaryLogic::createNo();`
`392`	`392`	`}`
`393`	`393`
`394`		`- public function isClassStringType(): TrinaryLogic`
	`394`	`+ public function isClassString(): TrinaryLogic`
`395`	`395`	`{`
`396`	`396`	`return TrinaryLogic::createNo();`
`397`	`397`	`}`
Original file line number	Diff line number	Diff line change
`@@ -302,7 +302,7 @@ public function isLowercaseString(): TrinaryLogic`
`302`	`302`	`return TrinaryLogic::createMaybe();`
`303`	`303`	`}`
`304`	`304`
`305`		`- public function isClassStringType(): TrinaryLogic`
	`305`	`+ public function isClassString(): TrinaryLogic`
`306`	`306`	`{`
`307`	`307`	`return TrinaryLogic::createMaybe();`
`308`	`308`	`}`
Original file line number	Diff line number	Diff line change
`@@ -298,7 +298,7 @@ public function isLowercaseString(): TrinaryLogic`
`298`	`298`	`return TrinaryLogic::createYes();`
`299`	`299`	`}`
`300`	`300`
`301`		`- public function isClassStringType(): TrinaryLogic`
	`301`	`+ public function isClassString(): TrinaryLogic`
`302`	`302`	`{`
`303`	`303`	`return TrinaryLogic::createMaybe();`
`304`	`304`	`}`
Original file line number	Diff line number	Diff line change
`@@ -299,7 +299,7 @@ public function isLowercaseString(): TrinaryLogic`
`299`	`299`	`return TrinaryLogic::createMaybe();`
`300`	`300`	`}`
`301`	`301`
`302`		`- public function isClassStringType(): TrinaryLogic`
	`302`	`+ public function isClassString(): TrinaryLogic`
`303`	`303`	`{`
`304`	`304`	`return TrinaryLogic::createMaybe();`
`305`	`305`	`}`
Original file line number	Diff line number	Diff line change
`@@ -301,7 +301,7 @@ public function isLowercaseString(): TrinaryLogic`
`301`	`301`	`return TrinaryLogic::createMaybe();`
`302`	`302`	`}`
`303`	`303`
`304`		`- public function isClassStringType(): TrinaryLogic`
	`304`	`+ public function isClassString(): TrinaryLogic`
`305`	`305`	`{`
`306`	`306`	`return TrinaryLogic::createNo();`
`307`	`307`	`}`