Fix invokable objects incorrectly labeled as instances of Closure

Author: HypeMC

src/Type/Accessory/HasMethodType.php

@@ -2,6 +2,7 @@
 
 namespace PHPStan\Type\Accessory;
 
+use Closure;
 use PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode;
 use PHPStan\PhpDocParser\Ast\Type\TypeNode;
 use PHPStan\Reflection\ClassMemberAccessAnswerer;
@@ -17,6 +18,7 @@
 use PHPStan\Type\ErrorType;
 use PHPStan\Type\IntersectionType;
 use PHPStan\Type\IsSuperTypeOfResult;
+use PHPStan\Type\ObjectType;
 use PHPStan\Type\StringType;
 use PHPStan\Type\Traits\NonGeneralizableTypeTrait;
 use PHPStan\Type\Traits\NonGenericTypeTrait;
@@ -83,7 +85,11 @@ public function isSubTypeOf(Type $otherType): IsSuperTypeOfResult
 			return $otherType->isSuperTypeOf($this);
 		}
 
-		if ($this->isCallable()->yes() && $otherType->isCallable()->yes()) {
+		if (
+			$this->isCallable()->yes()
+			&& $otherType->isCallable()->yes()
+			&& (new ObjectType(Closure::class))->isSuperTypeOf($otherType)->no()
+		) {
 			return IsSuperTypeOfResult::createYes();
 		}
 

tests/PHPStan/Rules/Classes/ImpossibleInstanceOfRuleTest.php

@@ -569,4 +569,10 @@ public function testBug13469(): void
 		]);
 	}
 
+	public function testBug13975(): void
+	{
+		$this->treatPhpDocTypesAsCertain = true;
+		$this->analyse([__DIR__ . '/data/bug-13975.php'], []);
+	}
+
 }

tests/PHPStan/Rules/Classes/data/bug-13975.php

@@ -0,0 +1,18 @@
+<?php declare(strict_types=1);
+
+namespace Bug13975;
+
+function foo(): callable
+{
+	return new class () {
+		public function __invoke(): void
+		{
+		}
+	};
+}
+
+$foo = foo();
+
+if (\is_object($foo) && method_exists($foo, '__invoke') && !$foo instanceof \Closure) {
+	echo 'true';
+}