[TypeInfo] Simple array should be array type

Author: matijn-made

Tests/TypeResolver/StringTypeResolverTest.php

@@ -73,7 +73,16 @@ public static function resolveDataProvider(): iterable
         yield [Type::callable(), 'callable(string, int): mixed'];
 
         // array
-        yield [Type::list(Type::bool()), 'bool[]'];
+        yield [Type::array(Type::bool()), 'bool[]'];
+        yield [Type::array(Type::bool()), 'array<bool>'];
+        yield [Type::array(Type::bool(), Type::int()), 'array<int, bool>'];
+        yield [Type::array(Type::bool(), Type::arrayKey()), 'array<array-key, bool>'];
+        yield [Type::array(Type::bool(), Type::arrayKey()), 'array<int|string, bool>'];
+        yield [Type::array(Type::bool(), Type::arrayKey()), 'non-empty-array<int|string, bool>'];
+
+        // list
+        yield [Type::list(Type::bool()), 'list<bool>'];
+        yield [Type::list(Type::bool()), 'non-empty-list<bool>'];
 
         // array shape
         yield [Type::arrayShape(['foo' => Type::true(), 1 => Type::false()]), 'array{foo: true, 1: false}'];
@@ -253,4 +262,28 @@ public function testCannotResolveValueOfInvalidType()
         $this->expectException(UnsupportedException::class);
         $this->resolver->resolve('value-of<int>');
     }
+
+    public function testCannotResolveListWithKeyType()
+    {
+        $this->expectException(UnsupportedException::class);
+        $this->resolver->resolve('list<int, string>');
+    }
+
+    public function testCannotResolveInvalidNonEmptyListWithKeyType()
+    {
+        $this->expectException(UnsupportedException::class);
+        $this->resolver->resolve('non-empty-list<int, string>');
+    }
+
+    public function testCannotResolveInvalidArrayKeyType()
+    {
+        $this->expectException(InvalidArgumentException::class);
+        $this->resolver->resolve('array<mixed, string>');
+    }
+
+    public function testCannotResolveInvalidUnionArrayKeyType()
+    {
+        $this->expectException(InvalidArgumentException::class);
+        $this->resolver->resolve('array<int|mixed, string>');
+    }
 }

Type/CollectionType.php

@@ -49,6 +49,16 @@ public function __construct(
             if (!$keyType instanceof BuiltinType || TypeIdentifier::INT !== $keyType->getTypeIdentifier()) {
                 throw new InvalidArgumentException(\sprintf('"%s" is not a valid list key type.', (string) $keyType));
             }
+        } elseif ($type instanceof GenericType && $type->getWrappedType() instanceof BuiltinType && TypeIdentifier::ARRAY === $type->getWrappedType()->getTypeIdentifier()) {
+            $keyType = $this->getCollectionKeyType();
+
+            $keyTypes = $keyType instanceof UnionType ? $keyType->getTypes() : [$keyType];
+
+            foreach ($keyTypes as $type) {
+                if (!$type instanceof BuiltinType || !\in_array($type->getTypeIdentifier(), [TypeIdentifier::INT, TypeIdentifier::STRING], true)) {
+                    throw new InvalidArgumentException(\sprintf('"%s" is not a valid array key type.', (string) $keyType));
+                }
+            }
         }
     }
 

TypeResolver/StringTypeResolver.php

@@ -100,7 +100,7 @@ private function getTypeFromNode(TypeNode $node, ?TypeContext $typeContext): Typ
         }
 
         if ($node instanceof ArrayTypeNode) {
-            return Type::list($this->getTypeFromNode($node->type, $typeContext));
+            return Type::array($this->getTypeFromNode($node->type, $typeContext));
         }
 
         if ($node instanceof ArrayShapeNode) {
@@ -263,6 +263,10 @@ private function getTypeFromNode(TypeNode $node, ?TypeContext $typeContext): Typ
                 if (1 === \count($variableTypes)) {
                     return new CollectionType(Type::generic($type, $keyType, $variableTypes[0]), $asList);
                 } elseif (2 === \count($variableTypes)) {
+                    if ($asList) {
+                        throw new \DomainException(\sprintf('"%s" type cannot have a key type defined.', $node->type));
+                    }
+
                     return Type::collection($type, $variableTypes[1], $variableTypes[0], $asList);
                 }
             }