fix "RuntimeException" for "array-key" and for "class-string"

Author: voku

src/TypeResolver.php

@@ -16,6 +16,7 @@
 use ArrayIterator;
 use InvalidArgumentException;
 use phpDocumentor\Reflection\Types\Array_;
+use phpDocumentor\Reflection\Types\ArrayKey;
 use phpDocumentor\Reflection\Types\ClassString;
 use phpDocumentor\Reflection\Types\Collection;
 use phpDocumentor\Reflection\Types\Compound;
@@ -544,6 +545,7 @@ private function resolveCollection(ArrayIterator $tokens, Type $classType, Conte
                 // check the key type for an "array" collection. We allow only
                 // strings or integers.
                 if (
+                    !$keyType instanceof ArrayKey &&
                     !$keyType instanceof String_ &&
                     !$keyType instanceof Integer &&
                     !$keyType instanceof Compound
@@ -556,6 +558,7 @@ private function resolveCollection(ArrayIterator $tokens, Type $classType, Conte
                 if ($keyType instanceof Compound) {
                     foreach ($keyType->getIterator() as $item) {
                         if (
+                            !$item instanceof ArrayKey &&
                             !$item instanceof String_ &&
                             !$item instanceof Integer
                         ) {

src/Types/ClassString.php

@@ -14,14 +14,13 @@
 namespace phpDocumentor\Reflection\Types;
 
 use phpDocumentor\Reflection\Fqsen;
-use phpDocumentor\Reflection\Type;
 
 /**
  * Value Object representing the type 'string'.
  *
  * @psalm-immutable
  */
-final class ClassString implements Type
+final class ClassString extends String_
 {
     /** @var Fqsen|null */
     private $fqsen;

tests/unit/CollectionResolverTest.php

@@ -223,6 +223,19 @@ public function testBadArrayCollectionKey(): void
         $fixture->resolve('array<object,string>', new Context(''));
     }
 
+    /**
+     * @covers ::__construct
+     * @covers ::resolve
+     */
+    public function testGoodArrayCollectionKey(): void
+    {
+        $fixture = new TypeResolver();
+        $fixture->resolve('array<array-key,string>', new Context(''));
+
+        $fixture = new TypeResolver();
+        $fixture->resolve('array<class-string,string>', new Context(''));
+    }
+
     /**
      * @covers ::__construct
      * @covers ::resolve