CallableTypeHelper - fixed purity check

Author: ondrejmirtes

Diff for: src/Type/CallableTypeHelper.php

@@ -103,8 +103,11 @@ public static function isParametersAcceptorSuperTypeOf(
 			$isReturnTypeSuperType = new AcceptsResult($ours->getReturnType()->isSuperTypeOf($theirReturnType), []);
 		}
 
-		if ($ours->isPure()->yes()) {
+		$pure = $ours->isPure();
+		if ($pure->yes()) {
 			$result = $result->and(new AcceptsResult($theirs->isPure(), []));
+		} elseif ($pure->no()) {
+			$result = $result->and(new AcceptsResult($theirs->isPure()->negate(), []));
 		}
 
 		return $result->and($isReturnTypeSuperType);

Diff for: src/Type/UnionTypeHelper.php

@@ -109,6 +109,10 @@ public static function sortTypes(array $types): array
 				return self::compareStrings($a->describe(VerbosityLevel::value()), $b->describe(VerbosityLevel::value()));
 			}
 
+			if ($a->isCallable()->yes() && $b->isCallable()->yes()) {
+				return self::compareStrings($a->describe(VerbosityLevel::value()), $b->describe(VerbosityLevel::value()));
+			}
+
 			return self::compareStrings($a->describe(VerbosityLevel::typeOnly()), $b->describe(VerbosityLevel::typeOnly()));
 		});
 		return $types;

Diff for: tests/PHPStan/Type/CallableTypeTest.php

@@ -382,6 +382,21 @@ public function dataAccepts(): array
 			[
 				new CallableType([], new VoidType(), false, null, null, [], TrinaryLogic::createNo()),
 				new CallableType([], new VoidType(), false, null, null, [], TrinaryLogic::createYes()),
+				TrinaryLogic::createNo(),
+			],
+			[
+				new CallableType([], new VoidType(), false, null, null, [], TrinaryLogic::createMaybe()),
+				new CallableType([], new VoidType(), false, null, null, [], TrinaryLogic::createYes()),
+				TrinaryLogic::createYes(),
+			],
+			[
+				new CallableType([], new VoidType(), false, null, null, [], TrinaryLogic::createMaybe()),
+				new CallableType([], new VoidType(), false, null, null, [], TrinaryLogic::createNo()),
+				TrinaryLogic::createYes(),
+			],
+			[
+				new CallableType([], new VoidType(), false, null, null, [], TrinaryLogic::createMaybe()),
+				new CallableType([], new VoidType(), false, null, null, [], TrinaryLogic::createMaybe()),
 				TrinaryLogic::createYes(),
 			],
 			[

Diff for: tests/PHPStan/Type/TypeCombinatorTest.php

@@ -2555,8 +2555,8 @@ public function dataUnion(): iterable
 				]),
 				new ClosureType(),
 			],
-			ClosureType::class,
-			'Closure(): mixed', // different result might be okay too
+			UnionType::class,
+			'(Closure(): mixed)|(pure-Closure)',
 		];
 		yield [
 			[
@@ -2566,7 +2566,7 @@ public function dataUnion(): iterable
 				new ClosureType(),
 			],
 			ClosureType::class,
-			'Closure(): mixed', // different result might be okay too
+			'Closure(): mixed',
 		];
 	}
 
@@ -4239,8 +4239,8 @@ public function dataIntersect(): iterable
 				]),
 				new ClosureType(),
 			],
-			ClosureType::class,
-			'pure-Closure', // different result might be okay too
+			NeverType::class,
+			'*NEVER*=implicit',
 		];
 		yield [
 			[
@@ -4250,7 +4250,7 @@ public function dataIntersect(): iterable
 				new ClosureType(),
 			],
 			ClosureType::class,
-			'pure-Closure', // different result might be okay too
+			'pure-Closure',
 		];
 	}