Fix phpstan/phpstan#14440: Intersections in class-string<A&B> not correctly detected, reported as string

src/Type/Constant/ConstantStringType.php

@@ -113,7 +113,7 @@ public function getObjectTypeOrClassStringObjectType(): Type
 	public function describe(VerbosityLevel $level): string
 	{
 		return $level->handle(
-			static fn (): string => 'string',
+			fn (): string => $this->isClassString ? 'class-string<' . $this->value . '>' : 'string',
 			function (): string {
 				$value = $this->value;
 

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>, string given.',
+				'Parameter #1 $date of function Bug4413\takesDate expects class-string<DateTime>, class-string<stdClass> given.',
 				18,
 			],
 		]);
@@ -1200,11 +1200,11 @@ public function testBug4371(): void
 	{
 		$errors = [
 			[
-				'Parameter #1 $object_or_class of function is_a expects object, string given.',
+				'Parameter #1 $object_or_class of function is_a expects object, class-string<Bug4371\Bar> given.',
 				14,
 			],
 			[
-				'Parameter #1 $object_or_class of function is_a expects object, string given.',
+				'Parameter #1 $object_or_class of function is_a expects object, class-string<Bug4371\Bar> given.',
 				22,
 			],
 		];
@@ -1213,11 +1213,11 @@ public function testBug4371(): void
 			// php 7.x had different parameter names
 			$errors = [
 				[
-					'Parameter #1 $object_or_string of function is_a expects object, string given.',
+					'Parameter #1 $object_or_string of function is_a expects object, class-string<Bug4371\Bar> given.',
 					14,
 				],
 				[
-					'Parameter #1 $object_or_string of function is_a expects object, string given.',
+					'Parameter #1 $object_or_string of function is_a expects object, class-string<Bug4371\Bar> given.',
 					22,
 				],
 			];
@@ -1230,15 +1230,15 @@ public function testIsSubclassAllowString(): void
 	{
 		$errors = [
 			[
-				'Parameter #1 $object_or_class of function is_subclass_of expects object, string given.',
+				'Parameter #1 $object_or_class of function is_subclass_of expects object, class-string<IsSubclassAllowString\A> given.',
 				11,
 			],
 			[
-				'Parameter #1 $object_or_class of function is_subclass_of expects object, string given.',
+				'Parameter #1 $object_or_class of function is_subclass_of expects object, class-string<IsSubclassAllowString\B> given.',
 				14,
 			],
 			[
-				'Parameter #1 $object_or_class of function is_subclass_of expects object, string given.',
+				'Parameter #1 $object_or_class of function is_subclass_of expects object, class-string<IsSubclassAllowString\B> given.',
 				17,
 			],
 		];
@@ -1247,15 +1247,15 @@ public function testIsSubclassAllowString(): void
 			// php 7.x had different parameter names
 			$errors = [
 				[
-					'Parameter #1 $object_or_string of function is_subclass_of expects object, string given.',
+					'Parameter #1 $object_or_string of function is_subclass_of expects object, class-string<IsSubclassAllowString\A> given.',
 					11,
 				],
 				[
-					'Parameter #1 $object_or_string of function is_subclass_of expects object, string given.',
+					'Parameter #1 $object_or_string of function is_subclass_of expects object, class-string<IsSubclassAllowString\B> given.',
 					14,
 				],
 				[
-					'Parameter #1 $object_or_string of function is_subclass_of expects object, string given.',
+					'Parameter #1 $object_or_string of function is_subclass_of expects object, class-string<IsSubclassAllowString\B> given.',
 					17,
 				],
 			];

tests/PHPStan/Rules/Methods/CallMethodsRuleTest.php

@@ -507,7 +507,7 @@ public function testCallMethods(): void
 				1461,
 			],
 			[
-				'Parameter #1 $s of method Test\ClassStringWithUpperBounds::doFoo() expects class-string<Exception>, string given.',
+				'Parameter #1 $s of method Test\ClassStringWithUpperBounds::doFoo() expects class-string<Exception>, class-string<Throwable> given.',
 				1490,
 			],
 			[
@@ -834,7 +834,7 @@ public function testCallMethodsOnThisOnly(): void
 				1379,
 			],
 			[
-				'Parameter #1 $s of method Test\ClassStringWithUpperBounds::doFoo() expects class-string<Exception>, string given.',
+				'Parameter #1 $s of method Test\ClassStringWithUpperBounds::doFoo() expects class-string<Exception>, class-string<Throwable> given.',
 				1490,
 			],
 			[

tests/PHPStan/Rules/Methods/CallStaticMethodsRuleTest.php

@@ -579,7 +579,7 @@ public function testTemplateTypeInOneBranchOfConditional(): void
 			[
 				'Parameter #1 $params of static method TemplateTypeInOneBranchOfConditional\DriverManager::getConnection() expects array{wrapperClass?: class-string<TemplateTypeInOneBranchOfConditional\Connection>}, array{wrapperClass: \'stdClass\'} given.',
 				27,
-				"Offset 'wrapperClass' (class-string<TemplateTypeInOneBranchOfConditional\Connection>) does not accept type string.",
+				"Offset 'wrapperClass' (class-string<TemplateTypeInOneBranchOfConditional\Connection>) does not accept type class-string<stdClass>.",
 			],
 			[
 				'Unable to resolve the template type T in call to static method TemplateTypeInOneBranchOfConditional\DriverManager::getConnection()',

tests/PHPStan/Rules/Methods/ReturnTypeRuleTest.php

@@ -817,7 +817,7 @@ public function testBug8071(): void
 				// there should be no errors
 				'Method Bug8071\Inheritance::inherit() should return array<TKey of (int|string), TValues of bool|float|int|string|null> but returns array<string>.',
 				17,
-				'Type string is not always the same as TValues. It breaks the contract for some argument types, typically subtypes.',
+				"• Type class-string<Bug8071\Inheritance> is not always the same as TValues. It breaks the contract for some argument types, typically subtypes.\n• Type string is not always the same as TValues. It breaks the contract for some argument types, typically subtypes.",
 			],
 		]);
 	}
@@ -1331,4 +1331,18 @@ public function testBug11430(): void
 		$this->analyse([__DIR__ . '/../../Analyser/nsrt/bug-11430.php'], []);
 	}
 
+	public function testBug14440(): void
+	{
+		$this->analyse([__DIR__ . '/data/bug-14440.php'], [
+			[
+				'Method Bug14440\ChildOne::getCounterpartClass() should return class-string<Bug14440\ChildOne> but returns class-string<Bug14440\ChildTwo>.',
+				18,
+			],
+			[
+				'Method Bug14440\ChildTwo::getCounterpartClass() should return class-string<Bug14440\ChildTwo> but returns class-string<Bug14440\ChildOne>.',
+				27,
+			],
+		]);
+	}
+
 }

tests/PHPStan/Rules/Methods/data/bug-14440.php

@@ -0,0 +1,29 @@
+<?php declare(strict_types = 1);
+
+namespace Bug14440;
+
+interface I {}
+
+abstract class A
+{
+	/** @return class-string<static&I> */
+	abstract public static function getCounterpartClass(): string;
+}
+
+final class ChildOne extends A implements I
+{
+	#[\Override]
+	public static function getCounterpartClass(): string
+	{
+		return ChildTwo::class;
+	}
+}
+
+final class ChildTwo extends A implements I
+{
+	#[\Override]
+	public static function getCounterpartClass(): string
+	{
+		return ChildOne::class;
+	}
+}