[TypeInfo] ArrayShape can resolve key type as callable instead of string

Dean151 · Dean151 · commit 85575db1cdbb · 2025-10-03T15:33:16.000+02:00
In PHP, array key type is either string or int. Although callable is not entirely false as long as it's a string callable, using callable as a key type for an array seems wrong, and it's unlikely to be what we expect.
This is peculiarly true in environment when key name might collide with global function name.
Proposed change is to check for int/string instead of resolving type.
Because the input is an array, the key is already narrowed down to string|int in the input

This bugfix is also a change of behavior, as callable was likely to be fed in keyTypes, and it won't longer occur with that change.
diff --git a/src/Symfony/Component/TypeInfo/Tests/TypeFactoryTest.php b/src/Symfony/Component/TypeInfo/Tests/TypeFactoryTest.php
@@ -226,6 +226,12 @@ public function testCreateArrayShape()
         ), Type::arrayShape(['foo' => Type::bool()], extraKeyType: Type::string(), extraValueType: Type::bool()));
     }
 
+    public function testCreateArrayShapeWithCallableKey()
+    {
+        $arrayShape = new ArrayShapeType(['substr' => ['type' => Type::string(), 'optional' => false]]);
+        $this->assertEquals(Type::string(), $arrayShape->getCollectionKeyType());
+    }
+
     public function testCreateArrayKey()
     {
         $this->assertEquals(new UnionType(Type::int(), Type::string()), Type::arrayKey());
diff --git a/src/Symfony/Component/TypeInfo/Type/ArrayShapeType.php b/src/Symfony/Component/TypeInfo/Type/ArrayShapeType.php
@@ -41,7 +41,11 @@ public function __construct(
         $valueTypes = [];
 
         foreach ($shape as $k => $v) {
-            $keyTypes[] = self::fromValue($k);
+            if (\is_int($k)) {
+                $keyTypes[] = Type::int();
+            } else {
+                $keyTypes[] = Type::string();
+            }
             $valueTypes[] = $v['type'];
         }
 

Original file line number	Diff line number	Diff line change
`@@ -226,6 +226,12 @@ public function testCreateArrayShape()`
`226`	`226`	`), Type::arrayShape(['foo' => Type::bool()], extraKeyType: Type::string(), extraValueType: Type::bool()));`
`227`	`227`	`}`
`228`	`228`
	`229`	`+ public function testCreateArrayShapeWithCallableKey()`
	`230`	`+ {`
	`231`	`+ $arrayShape = new ArrayShapeType(['substr' => ['type' => Type::string(), 'optional' => false]]);`
	`232`	`+ $this->assertEquals(Type::string(), $arrayShape->getCollectionKeyType());`
	`233`	`+ }`
	`234`	`+`
`229`	`235`	`public function testCreateArrayKey()`
`230`	`236`	`{`
`231`	`237`	`$this->assertEquals(new UnionType(Type::int(), Type::string()), Type::arrayKey());`