Merge pull request #188 from phpDocumentor/bugfix/compound_array_key

Fix compound array key support
phpDocumentor · Mar 27, 2023 · dfc078e · dfc078e
2 parents 1534aea + b36cd54
commit dfc078e
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/src/TypeResolver.php b/src/TypeResolver.php
@@ -551,13 +551,24 @@ private function createArray(array $typeNodes, Context $context): Array_
             return new Array_(...$types);
         }
 
-        if ($types[1] instanceof String_ || $types[1] instanceof Integer || $types[1] instanceof ArrayKey) {
+        if ($this->validArrayKeyType($types[1]) || $types[1] instanceof ArrayKey) {
             return new Array_(...$types);
         }
 
+        if ($types[1] instanceof Compound && $types[1]->getIterator()->count() === 2) {
+            if ($this->validArrayKeyType($types[1]->get(0)) && $this->validArrayKeyType($types[1]->get(1))) {
+                return new Array_(...$types);
+            }
+        }
+
         throw new RuntimeException('An array can have only integers or strings as keys');
     }
 
+    private function validArrayKeyType(?Type $type): bool
+    {
+        return $type instanceof String_ || $type instanceof Integer;
+    }
+
     private function parse(TokenIterator $tokenIterator): TypeNode
     {
         try {

diff --git a/tests/unit/TypeResolverTest.php b/tests/unit/TypeResolverTest.php
@@ -960,6 +960,18 @@ public function genericsProvider(): array
                     new Integer()
                 ),
             ],
+            [
+                'array<string|int, Foo\\Bar>',
+                new Array_(
+                    new Object_(new Fqsen('\\phpDocumentor\\Foo\\Bar')),
+                    new Compound(
+                        [
+                            new String_(),
+                            new Integer(),
+                        ]
+                    )
+                ),
+            ],
             [
                 'Collection<array-key, int>[]',
                 new Array_(