Revert "CallableTypeHelper - always use isSuperTypeOf() instead of accepts()"

This reverts commit eceb9f6.

Author: ondrejmirtes

src/Type/CallableTypeHelper.php

@@ -4,7 +4,6 @@
 
 use PHPStan\Reflection\ParametersAcceptor;
 use PHPStan\TrinaryLogic;
-use PHPStan\Type\Generic\TemplateMixedType;
 use function array_merge;
 use function sprintf;
 
@@ -60,16 +59,7 @@ public static function isParametersAcceptorSuperTypeOf(
 			}
 
 			if ($treatMixedAsAny) {
-				if (
-					$ourParameterType instanceof MixedType
-					&& !$ourParameterType instanceof TemplateMixedType
-				) {
-					$isSuperType = new AcceptsResult(TrinaryLogic::createYes(), []);
-				} elseif ($ourParameterType instanceof BenevolentUnionType) {
-					$isSuperType = $theirParameter->getType()->acceptsWithReason($ourParameterType, true);
-				} else {
-					$isSuperType = new AcceptsResult($theirParameter->getType()->isSuperTypeOf($ourParameterType), []);
-				}
+				$isSuperType = $theirParameter->getType()->acceptsWithReason($ourParameterType, true);
 			} else {
 				$isSuperType = new AcceptsResult($theirParameter->getType()->isSuperTypeOf($ourParameterType), []);
 			}
@@ -95,16 +85,7 @@ public static function isParametersAcceptorSuperTypeOf(
 
 		$theirReturnType = $theirs->getReturnType();
 		if ($treatMixedAsAny) {
-			if (
-				$theirReturnType instanceof MixedType
-				&& !$theirReturnType instanceof TemplateMixedType
-			) {
-				$isReturnTypeSuperType = new AcceptsResult(TrinaryLogic::createYes(), []);
-			} elseif ($theirReturnType instanceof BenevolentUnionType) {
-				$isReturnTypeSuperType = $ours->getReturnType()->acceptsWithReason($theirReturnType, true);
-			} else {
-				$isReturnTypeSuperType = new AcceptsResult($ours->getReturnType()->isSuperTypeOf($theirReturnType), []);
-			}
+			$isReturnTypeSuperType = $ours->getReturnType()->acceptsWithReason($theirReturnType, true);
 		} else {
 			$isReturnTypeSuperType = new AcceptsResult($ours->getReturnType()->isSuperTypeOf($theirReturnType), []);
 		}

tests/PHPStan/Analyser/AnalyserIntegrationTest.php

@@ -772,17 +772,15 @@ public function testDiscussion7124(): void
 		}
 
 		$errors = $this->runAnalyse(__DIR__ . '/data/discussion-7124.php');
-		$this->assertCount(5, $errors);
-		$this->assertSame('Parameter #2 $callback of function array_filter expects callable(T): mixed, (callable(K): bool)|(callable(T): bool) given.', $errors[0]->getMessage());
-		$this->assertSame(30, $errors[0]->getLine());
-		$this->assertSame('Parameter #2 $callback of function Discussion7124\filter expects callable(bool, int=): bool, Closure(int, bool): bool given.', $errors[1]->getMessage());
-		$this->assertSame(38, $errors[1]->getLine());
-		$this->assertSame('Parameter #2 $callback of function Discussion7124\filter expects callable(bool, int=): bool, Closure(int): bool given.', $errors[2]->getMessage());
-		$this->assertSame(45, $errors[2]->getLine());
-		$this->assertSame('Parameter #2 $callback of function Discussion7124\filter expects callable(int): bool, Closure(bool): bool given.', $errors[3]->getMessage());
-		$this->assertSame(52, $errors[3]->getLine());
-		$this->assertSame('Parameter #2 $callback of function Discussion7124\filter expects callable(bool): bool, Closure(int): bool given.', $errors[4]->getMessage());
-		$this->assertSame(59, $errors[4]->getLine());
+		$this->assertCount(4, $errors);
+		$this->assertSame('Parameter #2 $callback of function Discussion7124\filter expects callable(bool, int=): bool, Closure(int, bool): bool given.', $errors[0]->getMessage());
+		$this->assertSame(38, $errors[0]->getLine());
+		$this->assertSame('Parameter #2 $callback of function Discussion7124\filter expects callable(bool, int=): bool, Closure(int): bool given.', $errors[1]->getMessage());
+		$this->assertSame(45, $errors[1]->getLine());
+		$this->assertSame('Parameter #2 $callback of function Discussion7124\filter expects callable(int): bool, Closure(bool): bool given.', $errors[2]->getMessage());
+		$this->assertSame(52, $errors[2]->getLine());
+		$this->assertSame('Parameter #2 $callback of function Discussion7124\filter expects callable(bool): bool, Closure(int): bool given.', $errors[3]->getMessage());
+		$this->assertSame(59, $errors[3]->getLine());
 	}
 
 	public function testBug7214(): void

tests/PHPStan/Rules/Methods/CallMethodsRuleTest.php

@@ -2910,11 +2910,6 @@ public function testTrickyCallables(): void
 				'• Parameter #1 $key of passed callable is required but the parameter of accepting callable is optional. It might be called without it.
 • Type int of parameter #1 $key of passed callable needs to be same or wider than parameter type int|string of accepting callable.',
 			],
-			[
-				'Parameter #1 $cb of method TrickyCallables\AcceptsFooParentCallable::sayHello() expects callable(TrickyCallables\FooParent): void, Closure(TrickyCallables\FooChild): void given.',
-				110,
-				'Type TrickyCallables\FooChild of parameter #1 $bar of passed callable needs to be same or wider than parameter type TrickyCallables\FooParent of accepting callable.',
-			],
 		]);
 	}
 

tests/PHPStan/Rules/Methods/data/tricky-callables.php

@@ -82,33 +82,3 @@ function (TwoErrorsAtOnce $t): void {
 	$filter = static fn (int $key): bool => true;
 	$t->run($filter);
 };
-
-class FooParent
-{
-
-}
-
-class FooChild extends FooParent
-{
-
-}
-
-class AcceptsFooParentCallable
-{
-
-	/**
-	 * @param callable(FooParent): void $cb
-	 */
-	public function sayHello(callable $cb): void
-	{
-		$cb(new FooParent());
-	}
-
-	public function doFoo(): void
-	{
-		$hw = new self();
-		$hw->sayHello(function (FooChild $bar): void {
-		});
-	}
-
-}