Implement of type specifacation for array's key

Author: uekann

src/Type/Php/ArrayAllFunctionTypeSpecifyingExtension.php

@@ -39,19 +39,49 @@ public function specifyTypes(FunctionReflection $functionReflection, FuncCall $n
 
 		$array = $args[0]->value;
 		$callable = $args[1]->value;
+
+
 		if ($callable instanceof Expr\ArrowFunction && $callable->expr instanceof Expr\FuncCall) {
-			$specifiedTypesInCallable = $this->typeSpecifier->specifyTypesInCondition($scope, $callable->expr, $context)->getSureTypes();
-			$callableParm = $callable->params[0];
-			if (!$callableParm instanceof Expr\Variable || !key_exists("$" . $callableParm->name, $specifiedTypesInCallable)) {
-				return new SpecifiedTypes();
+
+			$callableParms = $callable->params;
+			$specifiedTypesInFuncCall = $this->typeSpecifier->specifyTypesInCondition($scope, $callable->expr, $context)->getSureTypes();
+
+			if(count($callableParms) >= 1 && $callableParms[0] instanceof Expr\Variable) {
+
+				$callableParmValueName = $callableParms[0]->name;
+				$specifiedTypeOfValue = array_find(
+					$specifiedTypesInFuncCall,
+					fn($specifiedType) => $specifiedType[0] instanceof Expr\Variable && $specifiedType[0]->name === $callableParmValueName
+				);
+
+				if(isset($specifiedTypeOfValue)) {
+					$valueType = $specifiedTypeOfValue[1];
+				}
+
+			}
+
+			if(count($callableParms) >= 2 && $callableParms[1] instanceof Expr\Variable) {
+
+				$callableParmKeyName = $callableParms[1]->name;
+				$specifiedTypeOfKey = array_find(
+					$specifiedTypesInFuncCall,
+					fn($specifiedType) => $specifiedType[0] instanceof Expr\Variable && $specifiedType[0]->name === $callableParmKeyName
+				);
+
+				if(isset($specifiedTypeOfKey)) {
+					$keyType = $specifiedTypeOfKey[1];
+				}
+
+			}
+
+			if(isset($keyType) || isset($valueType)) {
+				return $this->typeSpecifier->create(
+					$array,
+					new ArrayType($keyType ?? new MixedType(), $valueType ?? new MixedType()),
+					$context,
+					$scope
+				);
 			}
-			$ItemType = $specifiedTypesInCallable["$" . $callableParm->name][1];
-			return $this->typeSpecifier->create(
-				$array,
-				new ArrayType(new MixedType(), $ItemType),
-				$context,
-				$scope
-			);
 		}
 
 		return new SpecifiedTypes();

tests/PHPStan/Analyser/TypeSpecifierTest.php

@@ -17,6 +17,7 @@
 use PhpParser\Node\Name;
 use PhpParser\Node\Scalar\LNumber;
 use PhpParser\Node\Scalar\String_;
+use PhpParser\Node\VariadicPlaceholder;
 use PhpParser\Node\VarLikeIdentifier;
 use PhpParser\PrettyPrinter\Standard;
 use PHPStan\Node\Expr\AlwaysRememberedExpr;
@@ -1342,6 +1343,27 @@ public static function dataCondition(): iterable
 				],
 				[]
 			],
+			[
+				new FuncCall(
+					new Name("array_all"),
+					[
+						new Arg(new Variable("array")),
+						new Arg(
+							new Expr\ArrowFunction(
+								[
+									'expr' => new FuncCall(new Name("is_string"), [new Arg(new Variable("key"))]),
+									'params' => [new Variable("value"), new Variable("key")],
+								],
+								[]
+							)
+						)
+					]
+				),
+				[
+					'$array' => 'array<string, mixed>'
+				],
+				[]
+			],
 			[
 				new FuncCall(
 					new Name("array_all"),