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;
@@ -83,7 +84,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()
+			&& !($otherType->isObject()->yes() && $otherType->isInstanceOf(Closure::class)->yes())
+		) {
 			return IsSuperTypeOfResult::createYes();
 		}
 

tests/PHPStan/Analyser/AnalyserIntegrationTest.php

@@ -1619,6 +1619,12 @@ public function testBug13980(): void
 		$this->assertNoErrors($errors);
 	}
 
+	public function testBug13975(): void
+	{
+		$errors = $this->runAnalyse(__DIR__ . '/data/bug-13975.php');
+		$this->assertNoErrors($errors);
+	}
+
 	/**
 	 * @param string[]|null $allAnalysedFiles
 	 * @return list<Error>

tests/PHPStan/Analyser/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';
+}