Remove incorrect generics support

Author: herndlm

src/Type/Php/IsAFunctionTypeSpecifyingHelper.php

@@ -25,24 +25,7 @@ public function determineType(
 bool $allowSameClass,
 ): Type
 {
-$objectOrClassTypeClassNameType = TypeTraverser::map(
-$objectOrClassType,
-static function (Type $type, callable $traverse): Type {
-if ($type instanceof UnionType || $type instanceof IntersectionType) {
-return $traverse($type);
-}
-if ($type instanceof GenericClassStringType) {
-return $traverse($type->getGenericType());
-}
-if ($type instanceof TypeWithClassName) {
-return $type;
-}
-return new ObjectType('');
-},
-);
-$objectOrClassTypeClassName = $objectOrClassTypeClassNameType instanceof TypeWithClassName
-? $objectOrClassTypeClassNameType->getClassName()
-: null;
+$objectOrClassTypeClassName = $this->determineClassNameFromObjectOrClassType($objectOrClassType);
 
 return TypeTraverser::map(
 $classType,
@@ -64,18 +47,14 @@ static function (Type $type, callable $traverse) use ($objectOrClassTypeClassNam
 return new ObjectType($type->getValue());
 }
 if ($type instanceof GenericClassStringType) {
-$genericType = $type->getGenericType();
-if (!$allowSameClass && $genericType instanceof TypeWithClassName && $genericType->getClassName() === $objectOrClassTypeClassName) {
-return new NeverType();
-}
 if ($allowString) {
 return TypeCombinator::union(
-$genericType,
+$type->getGenericType(),
 $type,
 );
 }
 
-return $genericType;
+return $type->getGenericType();
 }
 if ($allowString) {
 return TypeCombinator::union(
@@ -89,4 +68,17 @@ static function (Type $type, callable $traverse) use ($objectOrClassTypeClassNam
 );
 }
 
+private function determineClassNameFromObjectOrClassType(Type $type): ?string
+{
+if ($type instanceof TypeWithClassName) {
+return $type->getClassName();
+}
+
+if ($type instanceof ConstantStringType) {
+return $type->getValue();
+}
+
+return null;
+}
+
 }

tests/PHPStan/Analyser/data/is-subclass-of.php

@@ -14,7 +14,7 @@ function (Bar $a, Bar $b, Bar $c, Bar $d) {
 /** @var class-string<Bar> $barClassString */
 $barClassString = 'Bar';
 if (is_subclass_of($c, $barClassString)) {
-\PHPStan\Testing\assertType('*NEVER*', $c);
+\PHPStan\Testing\assertType('IsSubclassOf\Bar', $c);
 }
 
 /** @var class-string<Foo> $fooClassString */
@@ -27,7 +27,7 @@ function (Bar $a, Bar $b, Bar $c, Bar $d) {
 function (string $a, string $b, string $c, string $d) {
 /** @var class-string<Bar> $a */
 if (is_subclass_of($a, Bar::class)) {
-\PHPStan\Testing\assertType('*NEVER*', $a);
+\PHPStan\Testing\assertType('class-string<IsSubclassOf\Bar>', $a);
 }
 
 /** @var class-string<Bar> $b */
@@ -39,7 +39,7 @@ function (string $a, string $b, string $c, string $d) {
 /** @var class-string<Bar> $barClassString */
 $barClassString = 'Bar';
 if (is_subclass_of($c, $barClassString)) {
-\PHPStan\Testing\assertType('*NEVER*', $c);
+\PHPStan\Testing\assertType('class-string<IsSubclassOf\Bar>', $c);
 }
 
 /** @var class-string<Bar> $d */