Revert "Improve nonexistent class name handling in GenericClassString…

…Type" This reverts commit d738439.
phpstan · Dec 20, 2022 · 387bde4 · 387bde4
1 parent e7b0173
commit 387bde4
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 21 deletions.
diff --git a/build/phpstan.neon b/build/phpstan.neon
@@ -85,7 +85,7 @@ parameters:
 			message: '#^Variable property access on PHPStan\\Rules\\RuleError\.$#'
 			path: ../src/Rules/RuleErrorBuilder.php
 		-
-			message: "#^Parameter \\#1 (?:\\$argument|\\$objectOrClass) of class ReflectionClass constructor expects class\\-string\\<T of object>\\|T of object, string given\\.$#"
+			message: "#^Parameter \\#1 (?:\\$argument|\\$objectOrClass) of class ReflectionClass constructor expects class\\-string\\<PHPStan\\\\ExtensionInstaller\\\\GeneratedConfig\\>\\|PHPStan\\\\ExtensionInstaller\\\\GeneratedConfig, string given\\.$#"
 			count: 1
 			path: ../src/Command/CommandHelper.php
 		- '#^Parameter \#1 \$offsetType of class PHPStan\\Type\\Accessory\\HasOffsetType constructor expects PHPStan\\Type\\Constant\\ConstantIntegerType\|PHPStan\\Type\\Constant\\ConstantStringType#'

diff --git a/src/Type/Generic/GenericClassStringType.php b/src/Type/Generic/GenericClassStringType.php
@@ -53,9 +53,6 @@ public function accepts(Type $type, bool $strictTypes): TrinaryLogic
 
 		if ($type instanceof ConstantStringType) {
 			if (!$type->isClassStringType()->yes()) {
-				if ($this->type instanceof TypeWithClassName) {
-					return TrinaryLogic::createFromBoolean($this->type->getClassName() === $type->getValue());
-				}
 				return TrinaryLogic::createNo();
 			}
 
@@ -102,9 +99,6 @@ public function isSuperTypeOf(Type $type): TrinaryLogic
 			}
 
 			if (!$type->isClassStringType()->yes()) {
-				if ($this->type instanceof TypeWithClassName) {
-					return $isSuperType->or(TrinaryLogic::createFromBoolean($this->type->getClassName() === $type->getValue()));
-				}
 				$isSuperType = $isSuperType->and(TrinaryLogic::createMaybe());
 			}
 
@@ -134,7 +128,7 @@ public function inferTemplateTypes(Type $receivedType): TemplateTypeMap
 			return $receivedType->inferTemplateTypesOn($this);
 		}
 
-		if ($receivedType instanceof ConstantStringType && $receivedType->isClassStringType()->yes()) {
+		if ($receivedType instanceof ConstantStringType) {
 			$typeToInfer = new ObjectType($receivedType->getValue());
 		} elseif ($receivedType instanceof self) {
 			$typeToInfer = $receivedType->type;

diff --git a/tests/PHPStan/Analyser/data/bug-6687.php b/tests/PHPStan/Analyser/data/bug-6687.php
@@ -28,7 +28,7 @@ function bar(string $a): void
 	function baz(string $a): void
 	{
 		if ($a === BAZ || is_subclass_of($a, BAZ)) {
-			assertType("class-string<BAZ>", $a);
+			assertType("'BAZ'|class-string<BAZ>", $a);
 		}
 	}
 

diff --git a/tests/PHPStan/Rules/Methods/CallStaticMethodsRuleTest.php b/tests/PHPStan/Rules/Methods/CallStaticMethodsRuleTest.php
@@ -411,11 +411,11 @@ public function testBug4550(): void
 		$this->checkThisOnly = false;
 		$this->analyse([__DIR__ . '/data/bug-4550.php'], [
 			[
-				'Parameter #1 $class of static method Bug4550\Test::valuesOf() expects class-string<mixed>, string given.',
+				'Parameter #1 $class of static method Bug4550\Test::valuesOf() expects class-string<Person>, string given.',
 				34,
 			],
 			[
-				'Parameter #1 $class of static method Bug4550\Test::valuesOf() expects class-string<mixed>, string given.',
+				'Parameter #1 $class of static method Bug4550\Test::valuesOf() expects class-string<Person>, string given.',
 				44,
 			],
 		]);

diff --git a/tests/PHPStan/Type/Generic/GenericClassStringTypeTest.php b/tests/PHPStan/Type/Generic/GenericClassStringTypeTest.php
@@ -155,11 +155,6 @@ public function dataIsSuperTypeOf(): array
 				new ConstantStringType(IntegerType::class),
 				TrinaryLogic::createMaybe(),
 			],
-			[
-				new GenericClassStringType(new ObjectType('NonexistentClass')),
-				new ConstantStringType('NonexistentClass'),
-				TrinaryLogic::createYes(),
-			],
 		];
 	}
 
@@ -277,11 +272,6 @@ public function dataAccepts(): array
 				new BenevolentUnionType([new IntegerType(), new StringType()]),
 				TrinaryLogic::createMaybe(),
 			],
-			[
-				new GenericClassStringType(new ObjectType('NonexistentClass')),
-				new ConstantStringType('NonexistentClass'),
-				TrinaryLogic::createYes(),
-			],
 		];
 	}