Check callable parameter type for array_map() and array_filter()

Author: ondrejmirtes

src/Analyser/NodeScopeResolver.php

@@ -50,7 +50,6 @@
 use PHPStan\BetterReflection\Reflector\ClassReflector;
 use PHPStan\BetterReflection\SourceLocator\Ast\Strategy\NodeToReflection;
 use PHPStan\BetterReflection\SourceLocator\Located\LocatedSource;
-use PHPStan\DependencyInjection\BleedingEdgeToggle;
 use PHPStan\DependencyInjection\Reflection\ClassReflectionExtensionRegistryProvider;
 use PHPStan\DependencyInjection\Type\DynamicThrowTypeExtensionProvider;
 use PHPStan\File\FileHelper;
@@ -91,14 +90,11 @@
 use PHPStan\Reflection\Native\NativeMethodReflection;
 use PHPStan\Reflection\ParametersAcceptor;
 use PHPStan\Reflection\ParametersAcceptorSelector;
-use PHPStan\Reflection\PassedByReference;
-use PHPStan\Reflection\Php\DummyParameter;
 use PHPStan\Reflection\Php\PhpMethodReflection;
 use PHPStan\Reflection\ReflectionProvider;
 use PHPStan\TrinaryLogic;
 use PHPStan\Type\Accessory\NonEmptyArrayType;
 use PHPStan\Type\ArrayType;
-use PHPStan\Type\CallableType;
 use PHPStan\Type\ClosureType;
 use PHPStan\Type\Constant\ConstantArrayType;
 use PHPStan\Type\Constant\ConstantArrayTypeBuilder;
@@ -3157,47 +3153,6 @@ private function processArgs(
 						$scope = $scope->assignVariable($argValue->name, new MixedType());
 					}
 				}
-
-				if (!BleedingEdgeToggle::isBleedingEdge() && $calleeReflection instanceof FunctionReflection) {
-					if (
-						$i === 0
-						&& $calleeReflection->getName() === 'array_map'
-						&& isset($args[1])
-					) {
-						$parameterType = new CallableType([
-							new DummyParameter('item', $scope->getType($args[1]->value)->getIterableValueType(), false, PassedByReference::createNo(), false, null),
-						], new MixedType(), false);
-					}
-
-					if (
-						$i === 1
-						&& $calleeReflection->getName() === 'array_filter'
-						&& isset($args[0])
-					) {
-						if (isset($args[2])) {
-							$mode = $scope->getType($args[2]->value);
-							if ($mode instanceof ConstantIntegerType) {
-								if ($mode->getValue() === ARRAY_FILTER_USE_KEY) {
-									$arrayFilterParameters = [
-										new DummyParameter('key', $scope->getType($args[0]->value)->getIterableKeyType(), false, PassedByReference::createNo(), false, null),
-									];
-								} elseif ($mode->getValue() === ARRAY_FILTER_USE_BOTH) {
-									$arrayFilterParameters = [
-										new DummyParameter('item', $scope->getType($args[0]->value)->getIterableValueType(), false, PassedByReference::createNo(), false, null),
-										new DummyParameter('key', $scope->getType($args[0]->value)->getIterableKeyType(), false, PassedByReference::createNo(), false, null),
-									];
-								}
-							}
-						}
-						$parameterType = new CallableType(
-							$arrayFilterParameters ?? [
-								new DummyParameter('item', $scope->getType($args[0]->value)->getIterableValueType(), false, PassedByReference::createNo(), false, null),
-							],
-							new MixedType(),
-							false
-						);
-					}
-				}
 			}
 
 			$originalScope = $scope;

src/Reflection/ParametersAcceptorSelector.php

@@ -5,7 +5,6 @@
 use PhpParser\Node\Expr\FuncCall;
 use PhpParser\Node\Name;
 use PHPStan\Analyser\Scope;
-use PHPStan\DependencyInjection\BleedingEdgeToggle;
 use PHPStan\Reflection\Native\NativeParameterReflection;
 use PHPStan\Reflection\Php\DummyParameter;
 use PHPStan\TrinaryLogic;
@@ -50,8 +49,7 @@ public static function selectFromArgs(
 		$types = [];
 		$unpack = false;
 		if (
-			BleedingEdgeToggle::isBleedingEdge()
-			&& count($args) > 0
+			count($args) > 0
 			&& count($parametersAcceptors) > 0
 		) {
 			$functionName = null;