Add support for any array keys

Author: mspirkov

src/TypeResolver.php

@@ -390,7 +390,9 @@ private function createFromGeneric(GenericTypeNode $type, Context $context): Typ
     {
         switch (strtolower($type->type->name)) {
             case 'array':
-                return $this->createArray($type->genericTypes, $context);
+                $genericTypes = array_reverse($this->createTypesByTypeNodes($type->genericTypes, $context));
+
+                return new Array_(...$genericTypes);
 
             case 'non-empty-array':
                 $genericTypes = array_reverse($this->createTypesByTypeNodes($type->genericTypes, $context));
@@ -630,33 +632,6 @@ private function resolveTypedObject(string $type, ?Context $context = null): Obj
         return new Object_($this->fqsenResolver->resolve($type, $context));
     }
 
-    /** @param TypeNode[] $typeNodes */
-    private function createArray(array $typeNodes, Context $context): Array_
-    {
-        $types = array_reverse($this->createTypesByTypeNodes($typeNodes, $context));
-
-        if (isset($types[1]) === false) {
-            return new Array_(...$types);
-        }
-
-        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 {

tests/unit/CollectionResolverTest.php

@@ -211,19 +211,6 @@ public function testResolvingCollectionOfCollection(): void
         $this->assertInstanceOf(Float_::class, $keyType->get(2));
     }
 
-    /**
-     * @covers ::__construct
-     * @covers ::resolve
-     * @covers ::createType
-     */
-    public function testBadArrayCollectionKey(): void
-    {
-        $this->expectException(RuntimeException::class);
-        $this->expectExceptionMessage('An array can have only integers or strings as keys');
-        $fixture = new TypeResolver();
-        $fixture->resolve('array<object,string>', new Context(''));
-    }
-
     /**
      * @covers ::__construct
      * @covers ::resolve

tests/unit/TypeResolverTest.php

@@ -1069,6 +1069,37 @@ public function genericsProvider(): array
                     new Integer()
                 ),
             ],
+            [
+                'array<key-of<Foo\\Bar::SOME_CONSTANT>, string>',
+                new Array_(
+                    new String_(),
+                    new KeyOf(new ConstExpression(new Object_(new Fqsen('\\phpDocumentor\\Foo\\Bar')), 'SOME_CONSTANT'))
+                ),
+            ],
+            [
+                'array<value-of<Foo\\Bar::SOME_CONSTANT>, string>',
+                new Array_(
+                    new String_(),
+                    new ValueOf(new ConstExpression(new Object_(new Fqsen('\\phpDocumentor\\Foo\\Bar')), 'SOME_CONSTANT'))
+                ),
+            ],
+            [
+                'array<Foo\\Bar::*, string>',
+                new Array_(
+                    new String_(),
+                    new ConstExpression(new Object_(new Fqsen('\\phpDocumentor\\Foo\\Bar')), '*')
+                ),
+            ],
+            [
+                'array<self::SOME_CONSTANT_FIRST|self::SOME_CONSTANT_SECOND, string>',
+                new Array_(
+                    new String_(),
+                    new Compound([
+                        new ConstExpression(new Self_(), 'SOME_CONSTANT_FIRST'),
+                        new ConstExpression(new Self_(), 'SOME_CONSTANT_SECOND'),
+                    ])
+                ),
+            ],
             [
                 'array<string|int, Foo\\Bar>',
                 new Array_(