accept callable as callback to preg_replace_callback

Author: schlndh

src/Type/Php/PregReplaceCallbackClosureTypeExtension.php

@@ -8,7 +8,7 @@
 use PHPStan\Reflection\Native\NativeParameterReflection;
 use PHPStan\Reflection\ParameterReflection;
 use PHPStan\TrinaryLogic;
-use PHPStan\Type\ClosureType;
+use PHPStan\Type\CallableType;
 use PHPStan\Type\FunctionParameterClosureTypeExtension;
 use PHPStan\Type\StringType;
 use PHPStan\Type\Type;
@@ -49,7 +49,7 @@ public function getTypeFromFunctionCall(FunctionReflection $functionReflection,
 			return null;
 		}
 
-		return new ClosureType(
+		return new CallableType(
 			[
 				new NativeParameterReflection($parameter->getName(), $parameter->isOptional(), $matchesType, $parameter->passedByReference(), $parameter->isVariadic(), $parameter->getDefaultValue()),
 			],

tests/PHPStan/Rules/Functions/CallToFunctionParametersRuleTest.php

@@ -671,19 +671,19 @@ public function testPregReplaceCallback(): void
 	{
 		$this->analyse([__DIR__ . '/data/preg_replace_callback.php'], [
 			[
-				'Parameter #2 $callback of function preg_replace_callback expects Closure(array{string}): string, Closure(string): string given.',
+				'Parameter #2 $callback of function preg_replace_callback expects callable(array{string}): string, Closure(string): string given.',
 				6,
 			],
 			[
-				'Parameter #2 $callback of function preg_replace_callback expects Closure(array{string}): string, Closure(string): string given.',
+				'Parameter #2 $callback of function preg_replace_callback expects callable(array{string}): string, Closure(string): string given.',
 				13,
 			],
 			[
-				'Parameter #2 $callback of function preg_replace_callback expects Closure(array{string}): string, Closure(array): void given.',
+				'Parameter #2 $callback of function preg_replace_callback expects callable(array{string}): string, Closure(array): void given.',
 				20,
 			],
 			[
-				'Parameter #2 $callback of function preg_replace_callback expects Closure(array{string}): string, Closure(): void given.',
+				'Parameter #2 $callback of function preg_replace_callback expects callable(array{string}): string, Closure(): void given.',
 				25,
 			],
 		]);
@@ -1774,7 +1774,7 @@ public function testParameterClosureTypeExtension(): void
 
 		$this->analyse([__DIR__ . '/data/function-parameter-closure-type-extension.php'], [
 			[
-				'Parameter #2 $callback of function preg_replace_callback expects Closure(array{0: array{string, int<-1, max>}, 1?: array{\'\'|\'foo\', int<-1, max>}, 2?: array{\'\'|\'bar\', int<-1, max>}, 3?: array{\'baz\', int<-1, max>}}): string, Closure(array<int>): string given.',
+				'Parameter #2 $callback of function preg_replace_callback expects callable(array{0: array{string, int<-1, max>}, 1?: array{\'\'|\'foo\', int<-1, max>}, 2?: array{\'\'|\'bar\', int<-1, max>}, 3?: array{\'baz\', int<-1, max>}}): string, Closure(array<int>): string given.',
 				44,
 			],
 		]);