Revert ConstantStringType::describe, only use VerbosityLevel for class-string

Address review feedback: do not modify ConstantStringType::describe()
at all. Instead, only add a class-string check in
VerbosityLevel::getRecommendedLevelByType that bumps verbosity to
value level when the accepting type is a class-string type.

This means class-string constants show as quoted values (e.g. 'stdClass')
at value verbosity, not as class-string<ClassName>. The verbosity is
only bumped when the accepting type contains a class-string, so when
a method expects object and receives a class-string, it still shows
as just 'string'.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: phpstan-bot

phpstan-baseline.neon

@@ -742,7 +742,7 @@ parameters:
 			path: src/Rules/RuleLevelHelper.php
 
 		-
-			rawMessage: 'Call to function method_exists() with class-string<PHPUnit\Framework\TestCase> and ''assertFileDoesNotEx…'' will always evaluate to true.'
+			rawMessage: 'Call to function method_exists() with ''PHPUnit\\Framework\\TestCase'' and ''assertFileDoesNotEx…'' will always evaluate to true.'
 			identifier: function.alreadyNarrowedType
 			count: 1
 			path: src/Testing/LevelsTestCase.php

src/Type/Constant/ConstantStringType.php

@@ -115,16 +115,14 @@ public function describe(VerbosityLevel $level): string
 		return $level->handle(
 			static fn (): string => 'string',
 			function (): string {
-				if ($this->isClassString) {
-					return 'class-string<' . $this->value . '>';
-				}
-
 				$value = $this->value;
 
-				try {
-					$value = Strings::truncate($value, self::DESCRIBE_LIMIT);
-				} catch (RegexpException) {
-					$value = substr($value, 0, self::DESCRIBE_LIMIT) . "\u{2026}";
+				if (!$this->isClassString) {
+					try {
+						$value = Strings::truncate($value, self::DESCRIBE_LIMIT);
+					} catch (RegexpException) {
+						$value = substr($value, 0, self::DESCRIBE_LIMIT) . "\u{2026}";
+					}
 				}
 
 				return self::export($value);

src/Type/VerbosityLevel.php

@@ -174,7 +174,7 @@ public static function getRecommendedLevelByType(Type $acceptingType, ?Type $acc
 				$moreVerbose = true;
 				return $type;
 			}
-			if ($type->isClassString()->yes()) {
+			if ($type->isString()->yes() && $type->isClassString()->yes()) {
 				$moreVerbose = true;
 				return $type;
 			}

tests/PHPStan/Rules/Classes/ClassAttributesRuleTest.php

@@ -150,7 +150,7 @@ public function testBug7171(): void
 	{
 		$this->analyse([__DIR__ . '/data/bug-7171.php'], [
 			[
-				'Parameter $repositoryClass of attribute class Bug7171\Entity constructor expects class-string<Bug7171\EntityRepository<T of object>>|null, class-string<stdClass> given.',
+				'Parameter $repositoryClass of attribute class Bug7171\Entity constructor expects class-string<Bug7171\EntityRepository<T of object>>|null, \'stdClass\' given.',
 				66,
 			],
 		]);

tests/PHPStan/Rules/Classes/ImpossibleInstanceOfRuleTest.php

@@ -190,12 +190,12 @@ public function testInstanceof(): void
 					$tipText,
 				],
 				[
-					'Instanceof between class-string<DateTimeInterface> and class-string<DateTimeInterface> will always evaluate to false.',
+					'Instanceof between class-string<DateTimeInterface> and \'DateTimeInterface\' will always evaluate to false.',
 					432,
 					$tipText,
 				],
 				[
-					'Instanceof between DateTimeInterface and class-string<DateTimeInterface> will always evaluate to true.',
+					'Instanceof between DateTimeInterface and \'DateTimeInterface\' will always evaluate to true.',
 					433,
 					$tipText,
 				],

tests/PHPStan/Rules/Comparison/ImpossibleCheckTypeFunctionCallRuleTest.php

@@ -160,7 +160,7 @@ public function testImpossibleCheckTypeFunctionCall(): void
 					582,
 				],
 				[
-					'Call to function method_exists() with class-string<CheckTypeFunctionCall\\MethodExists> and \'testWithStringFirst…\' will always evaluate to true.',
+					'Call to function method_exists() with \'CheckTypeFunctionCall\\\\MethodExists\' and \'testWithStringFirst…\' will always evaluate to true.',
 					596,
 				],
 				[
@@ -196,30 +196,30 @@ public function testImpossibleCheckTypeFunctionCall(): void
 					656,
 				],
 				[
-					'Call to function method_exists() with class-string<CheckTypeFunctionCall\MethodExistsWithTrait> and \'method\' will always evaluate to true.',
+					'Call to function method_exists() with \'CheckTypeFunctionCall\\\\MethodExistsWithTrait\' and \'method\' will always evaluate to true.',
 					659,
 					'Because the type is coming from a PHPDoc, you can turn off this check by setting <fg=cyan>treatPhpDocTypesAsCertain: false</> in your <fg=cyan>%configurationFile%</>.',
 				],
 				[
-					'Call to function method_exists() with class-string<CheckTypeFunctionCall\MethodExistsWithTrait> and \'someAnother\' will always evaluate to true.',
+					'Call to function method_exists() with \'CheckTypeFunctionCall\\\\MethodExistsWithTrait\' and \'someAnother\' will always evaluate to true.',
 					662,
 					'Because the type is coming from a PHPDoc, you can turn off this check by setting <fg=cyan>treatPhpDocTypesAsCertain: false</> in your <fg=cyan>%configurationFile%</>.',
 				],
 				[
-					'Call to function method_exists() with class-string<CheckTypeFunctionCall\MethodExistsWithTrait> and \'unknown\' will always evaluate to false.',
+					'Call to function method_exists() with \'CheckTypeFunctionCall\\\\MethodExistsWithTrait\' and \'unknown\' will always evaluate to false.',
 					665,
 					'Because the type is coming from a PHPDoc, you can turn off this check by setting <fg=cyan>treatPhpDocTypesAsCertain: false</> in your <fg=cyan>%configurationFile%</>.',
 				],
 				[
-					'Call to function method_exists() with class-string<CheckTypeFunctionCall\MethodExistsWithTrait> and \'method\' will always evaluate to true.',
+					'Call to function method_exists() with \'CheckTypeFunctionCall\\\\MethodExistsWithTrait\' and \'method\' will always evaluate to true.',
 					668,
 				],
 				[
-					'Call to function method_exists() with class-string<CheckTypeFunctionCall\MethodExistsWithTrait> and \'someAnother\' will always evaluate to true.',
+					'Call to function method_exists() with \'CheckTypeFunctionCall\\\\MethodExistsWithTrait\' and \'someAnother\' will always evaluate to true.',
 					671,
 				],
 				[
-					'Call to function method_exists() with class-string<CheckTypeFunctionCall\MethodExistsWithTrait> and \'unknown\' will always evaluate to false.',
+					'Call to function method_exists() with \'CheckTypeFunctionCall\\\\MethodExistsWithTrait\' and \'unknown\' will always evaluate to false.',
 					674,
 				],
 				[
@@ -391,11 +391,11 @@ public function testBug6305(): void
 		$this->treatPhpDocTypesAsCertain = true;
 		$this->analyse([__DIR__ . '/data/bug-6305.php'], [
 			[
-				'Call to function is_subclass_of() with Bug6305\B and class-string<Bug6305\A> will always evaluate to true.',
+				'Call to function is_subclass_of() with Bug6305\B and \'Bug6305\\\A\' will always evaluate to true.',
 				11,
 			],
 			[
-				'Call to function is_subclass_of() with Bug6305\B and class-string<Bug6305\B> will always evaluate to false.',
+				'Call to function is_subclass_of() with Bug6305\B and \'Bug6305\\\B\' will always evaluate to false.',
 				14,
 			],
 		]);
@@ -412,11 +412,11 @@ public function testBug13713(): void
 		$this->treatPhpDocTypesAsCertain = true;
 		$this->analyse([__DIR__ . '/data/bug-13713.php'], [
 			[
-				"Call to function is_subclass_of() with arguments Bug13713\\test, class-string<stdClass> and false will always evaluate to true.",
+				"Call to function is_subclass_of() with arguments Bug13713\\test, 'stdClass' and false will always evaluate to true.",
 				12,
 			],
 			[
-				"Call to function is_subclass_of() with arguments class-string<Bug13713\\test>, class-string<stdClass> and true will always evaluate to true.",
+				"Call to function is_subclass_of() with arguments class-string<Bug13713\\test>, 'stdClass' and true will always evaluate to true.",
 				25,
 				'Because the type is coming from a PHPDoc, you can turn off this check by setting <fg=cyan>treatPhpDocTypesAsCertain: false</> in your <fg=cyan>%configurationFile%</>.',
 			],
@@ -1004,7 +1004,7 @@ public function testBugPR3404(): void
 		$this->treatPhpDocTypesAsCertain = true;
 		$this->analyse([__DIR__ . '/data/bug-pr-3404.php'], [
 			[
-				'Call to function is_a() with arguments BugPR3404\Location, class-string<BugPR3404\\Location> and true will always evaluate to true.',
+				'Call to function is_a() with arguments BugPR3404\Location, \'BugPR3404\\\\Location\' and true will always evaluate to true.',
 				21,
 			],
 		]);

tests/PHPStan/Rules/Comparison/ImpossibleCheckTypeMethodCallRuleTest.php

@@ -264,7 +264,7 @@ public function testBug12473(): void
 				$tip,
 			],*/
 			[
-				'Call to method ReflectionClass<Bug12473\\PictureUser>::isSubclassOf() with class-string<Bug12473\\PictureProduct> will always evaluate to false.',
+				'Call to method ReflectionClass<Bug12473\\PictureUser>::isSubclassOf() with \'Bug12473\\\\PictureProduct\' will always evaluate to false.',
 				49,
 				$tip,
 			],

tests/PHPStan/Rules/Comparison/StrictComparisonOfDifferentTypesRuleTest.php

@@ -571,12 +571,12 @@ public function testBug3633(): void
 				$tipText,
 			],
 			[
-				'Strict comparison using === between class-string<Bug3633\HelloWorld> and class-string<Bug3633\HelloWorld> will always evaluate to true.',
+				'Strict comparison using === between \'Bug3633\\\HelloWorld\' and \'Bug3633\\\HelloWorld\' will always evaluate to true.',
 				41,
 				$tipText,
 			],
 			[
-				'Strict comparison using === between class-string<Bug3633\HelloWorld> and class-string<Bug3633\OtherClass> will always evaluate to false.',
+				'Strict comparison using === between \'Bug3633\\\HelloWorld\' and \'Bug3633\\\OtherClass\' will always evaluate to false.',
 				44,
 			],
 			[
@@ -585,12 +585,12 @@ public function testBug3633(): void
 				$tipText,
 			],
 			[
-				'Strict comparison using === between class-string<Bug3633\OtherClass> and class-string<Bug3633\HelloWorld> will always evaluate to false.',
+				'Strict comparison using === between \'Bug3633\\\OtherClass\' and \'Bug3633\\\HelloWorld\' will always evaluate to false.',
 				71,
 				$tipText,
 			],
 			[
-				'Strict comparison using === between class-string<Bug3633\OtherClass> and class-string<Bug3633\OtherClass> will always evaluate to true.',
+				'Strict comparison using === between \'Bug3633\\\OtherClass\' and \'Bug3633\\\OtherClass\' will always evaluate to true.',
 				74,
 				$tipText,
 			],
@@ -605,27 +605,27 @@ public function testBug3633(): void
 				$tipText,
 			],
 			[
-				'Strict comparison using === between class-string<Bug3633\FinalClass> and class-string<Bug3633\FinalClass> will always evaluate to true.',
+				'Strict comparison using === between \'Bug3633\\\FinalClass\' and \'Bug3633\\\FinalClass\' will always evaluate to true.',
 				102,
 				$tipText,
 			],
 			[
-				'Strict comparison using === between class-string<Bug3633\FinalClass> and class-string<Bug3633\HelloWorld> will always evaluate to false.',
+				'Strict comparison using === between \'Bug3633\\\FinalClass\' and \'Bug3633\\\HelloWorld\' will always evaluate to false.',
 				106,
 				$tipText,
 			],
 			[
-				'Strict comparison using === between class-string<Bug3633\FinalClass> and class-string<Bug3633\OtherClass> will always evaluate to false.',
+				'Strict comparison using === between \'Bug3633\\\FinalClass\' and \'Bug3633\\\OtherClass\' will always evaluate to false.',
 				109,
 				$tipText,
 			],
 			[
-				'Strict comparison using !== between class-string<Bug3633\FinalClass> and class-string<Bug3633\FinalClass> will always evaluate to false.',
+				'Strict comparison using !== between \'Bug3633\\\FinalClass\' and \'Bug3633\\\FinalClass\' will always evaluate to false.',
 				112,
 				$tipText,
 			],
 			[
-				'Strict comparison using === between class-string<Bug3633\FinalClass> and class-string<Bug3633\FinalClass> will always evaluate to true.',
+				'Strict comparison using === between \'Bug3633\\\FinalClass\' and \'Bug3633\\\FinalClass\' will always evaluate to true.',
 				115,
 			],
 		]);

tests/PHPStan/Rules/Functions/CallCallablesRuleTest.php

@@ -148,22 +148,22 @@ public function testRule(): void
 				176,
 			],
 			[
-				'Trying to invoke array{class-string<CallCallables\\CallableInForeach>, \'bar\'|\'foo\'} but it might not be a callable.',
+				'Trying to invoke array{\'CallCallables\\\\CallableInForeach\', \'bar\'|\'foo\'} but it might not be a callable.',
 				188,
 			],
 			[
-				'Trying to invoke array{class-string<CallCallables\\ConstantArrayUnionCallables>|class-string<DateTimeImmutable>, \'doFoo\'} but it might not be a callable.',
+				'Trying to invoke array{\'CallCallables\\\\ConstantArrayUnionCallables\'|\'DateTimeImmutable\', \'doFoo\'} but it might not be a callable.',
 				214,
 			],
 			[
-				'Trying to invoke array{class-string<CallCallables\\ConstantArrayUnionCallables>, \'doBaz\'|\'doFoo\'} but it might not be a callable.',
+				'Trying to invoke array{\'CallCallables\\\ConstantArrayUnionCallables\', \'doBaz\'|\'doFoo\'} but it might not be a callable.',
 				221,
 			],
 		];
 
 		if (PHP_VERSION_ID >= 80000) {
 			$errors[] = [
-				'Trying to invoke array{class-string<CallCallables\\ConstantArrayUnionCallables>|class-string<CallCallables\\ConstantArrayUnionCallablesTest>, \'doBar\'|\'doFoo\'} but it\'s not a callable.',
+				'Trying to invoke array{\'CallCallables\\\ConstantArrayUnionCallables\'|\'CallCallables\\\ConstantArrayUnionCallablesTest\', \'doBar\'|\'doFoo\'} but it\'s not a callable.',
 				229,
 			];
 		}

tests/PHPStan/Rules/Functions/CallToFunctionParametersRuleTest.php

@@ -1161,7 +1161,7 @@ public function testBug4413(): void
 		require_once __DIR__ . '/data/bug-4413.php';
 		$this->analyse([__DIR__ . '/data/bug-4413.php'], [
 			[
-				'Parameter #1 $date of function Bug4413\takesDate expects class-string<DateTime>, class-string<stdClass> given.',
+				'Parameter #1 $date of function Bug4413\takesDate expects class-string<DateTime>, \'stdClass\' given.',
 				18,
 			],
 		]);