Support for arrow functions containing arbitrary expr

Author: uekann

src/Type/Php/ArrayAllFunctionTypeSpecifyingExtension.php

@@ -4,12 +4,14 @@
 
 use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\FuncCall;
+use PhpParser\Node\Expr\Variable;
 use PHPStan\Analyser\Scope;
 use PHPStan\Analyser\SpecifiedTypes;
 use PHPStan\Analyser\TypeSpecifier;
 use PHPStan\Analyser\TypeSpecifierAwareExtension;
 use PHPStan\Analyser\TypeSpecifierContext;
 use PHPStan\DependencyInjection\AutowiredService;
+use PHPStan\Node\Expr\TypeExpr;
 use PHPStan\Reflection\FunctionReflection;
 use PHPStan\Type\Constant\ConstantBooleanType;
 use PHPStan\ShouldNotHappenException;
@@ -38,12 +40,39 @@ public function specifyTypes(FunctionReflection $functionReflection, FuncCall $n
 		}
 
 		$array = $args[0]->value;
+		$arrayArgType = $scope->getType($array);
+		$arrayTypes = $arrayArgType->getArrays();
+
+		if(count($arrayTypes) === 0) {
+			return new SpecifiedTypes();
+		}
+
 		$callable = $args[1]->value;
 
 
-		if ($callable instanceof Expr\ArrowFunction && $callable->expr instanceof Expr\FuncCall) {
+		// if ($callable instanceof Expr\ArrowFunction && $callable->expr instanceof Expr\FuncCall) {
+		if ($callable instanceof Expr\ArrowFunction) {
 
 			$callableParms = $callable->params;
+
+			// foreach($arrayTypes as $arrayType) {
+			// 	$keyType = $arrayType->getKeyType();
+			// 	$itemType = $arrayType->getItemType();
+			//
+			// 	$variables = [];
+			//
+			// 	if (count($callableParms) < 1) {
+			// 		continue;
+			// 	}
+			//
+			// 	if ($callableParms[0] ?? null instanceof Expr\Variable) {
+			// 		$variables[$callableParms[0]->name] = $itemType;
+			// 	}
+			//
+			// 	if ($callableParms[1] ?? null instanceof Expr\Variable) {
+			// 		$variables[$callableParms[1]->name] = $keyType;
+			// 	}
+			// }
 			$specifiedTypesInFuncCall = $this->typeSpecifier->specifyTypesInCondition($scope, $callable->expr, $context)->getSureTypes();
 
 			if(count($callableParms) >= 1 && $callableParms[0] instanceof Expr\Variable) {
@@ -87,6 +116,18 @@ public function specifyTypes(FunctionReflection $functionReflection, FuncCall $n
 		return new SpecifiedTypes();
 	}
 
+	// /**
+	//  * @param array<string, TypeExpr> $paramTypes
+	//  */
+	// private function replaceVariable(Expr $expr, array $paramTypes) : Expr {
+	// 	if ($expr instanceof Variable)  {
+	// 		$variableName = $expr->name;
+	// 		if (isset($paramTypes[$variableName])) {
+	// 			return $paramTypes[$variableName];
+	// 		}
+	// 	} elseif ($expr instanceof )
+	// }
+
 	public function setTypeSpecifier(TypeSpecifier $typeSpecifier): void
 	{
 		$this->typeSpecifier = $typeSpecifier;

tests/PHPStan/Analyser/TypeSpecifierTest.php

@@ -1364,6 +1364,78 @@ public static function dataCondition(): iterable
 				],
 				[]
 			],
+			[
+				new FuncCall(
+					new Name("array_all"),
+					[
+						new Arg(new Variable("array")),
+						new Arg(
+							new Expr\ArrowFunction(
+								[
+									'expr' => new Expr\BinaryOp\BooleanAnd(
+										new FuncCall(new Name("is_int"), [new Arg(new Variable("value"))]),
+										new FuncCall(new Name("is_string"), [new Arg(new Variable("key"))]),
+									),
+									'params' => [new Variable("value"), new Variable("key")],
+								],
+								[]
+							)
+						)
+					]
+				),
+				[
+					'$array' => 'array<string, int>'
+				],
+				[]
+			],
+			[
+				new FuncCall(
+					new Name("array_all"),
+					[
+						new Arg(new Variable("array")),
+						new Arg(
+							new Expr\ArrowFunction(
+								[
+									'expr' => new Expr\BinaryOp\BooleanAnd(
+										new FuncCall(new Name("is_string"), [new Arg(new Variable("value"))]),
+										new FuncCall(new Name("is_numeric"), [new Arg(new Variable("value"))]),
+									),
+									'params' => [new Variable("value"), new Variable("key")],
+								],
+								[]
+							)
+						)
+					]
+				),
+				[
+					'$array' => 'array<numeric-string>'
+				],
+				[]
+			],
+			[
+				new FuncCall(
+					new Name("array_all"),
+					[
+						new Arg(new Variable("array")),
+						new Arg(
+							new Expr\ArrowFunction(
+								[
+									'expr' => new Expr\BinaryOp\BooleanOr(
+										new FuncCall(new Name("is_float"), [new Arg(new Variable("value"))]),
+										new FuncCall(new Name("is_bool"), [new Arg(new Variable("value"))]),
+									),
+									'params' => [new Variable("value"), new Variable("key")],
+								],
+								[]
+							)
+						)
+					]
+				),
+				[
+					'$array' => 'array<bool|float>'
+				],
+				[]
+			],
 			[
 				new FuncCall(
 					new Name("array_all"),