[TypeInfo] Simple array should be array type

Author: matijn-made

Tests/Extractor/PhpStanExtractorTest.php

@@ -691,12 +691,12 @@ public static function typesProvider(): iterable
         yield ['foo2', Type::float()];
         yield ['foo3', Type::callable()];
         yield ['foo5', Type::mixed()];
-        yield ['files', Type::union(Type::list(Type::object(\SplFileInfo::class)), Type::resource()), null, null];
+        yield ['files', Type::union(Type::array(Type::object(\SplFileInfo::class)), Type::resource()), null, null];
         yield ['bal', Type::object(\DateTimeImmutable::class)];
         yield ['parent', Type::object(ParentDummy::class)];
-        yield ['collection', Type::list(Type::object(\DateTimeImmutable::class))];
-        yield ['nestedCollection', Type::list(Type::list(Type::string()))];
-        yield ['mixedCollection', Type::list()];
+        yield ['collection', Type::array(Type::object(\DateTimeImmutable::class))];
+        yield ['nestedCollection', Type::array(Type::array(Type::string()))];
+        yield ['mixedCollection', Type::array(Type::mixed())];
         yield ['a', Type::int()];
         yield ['b', Type::nullable(Type::object(ParentDummy::class))];
         yield ['c', Type::nullable(Type::bool())];
@@ -707,7 +707,7 @@ public static function typesProvider(): iterable
         yield ['h', Type::nullable(Type::string())];
         yield ['i', Type::union(Type::int(), Type::string(), Type::null())];
         yield ['j', Type::nullable(Type::object(\DateTimeImmutable::class))];
-        yield ['nullableCollectionOfNonNullableElements', Type::nullable(Type::list(Type::int()))];
+        yield ['nullableCollectionOfNonNullableElements', Type::nullable(Type::array(Type::int()))];
         yield ['donotexist', null];
         yield ['staticGetter', null];
         yield ['staticSetter', null];
@@ -716,7 +716,7 @@ public static function typesProvider(): iterable
         yield ['arrayOfMixed', Type::dict(Type::mixed())];
         yield ['listOfStrings', Type::list(Type::string())];
         yield ['self', Type::object(Dummy::class)];
-        yield ['rootDummyItems', Type::list(Type::object(RootDummyItem::class))];
+        yield ['rootDummyItems', Type::array(Type::object(RootDummyItem::class))];
         yield ['rootDummyItem', Type::object(RootDummyItem::class)];
         yield ['collectionAsObject', Type::collection(Type::object(DummyCollection::class), Type::string(), Type::int())];
     }
@@ -767,12 +767,12 @@ public static function typesWithNoPrefixesProvider(): iterable
         yield ['foo2', Type::float()];
         yield ['foo3', Type::callable()];
         yield ['foo5', Type::mixed()];
-        yield ['files', Type::union(Type::list(Type::object(\SplFileInfo::class)), Type::resource())];
+        yield ['files', Type::union(Type::array(Type::object(\SplFileInfo::class)), Type::resource())];
         yield ['bal', Type::object(\DateTimeImmutable::class)];
         yield ['parent', Type::object(ParentDummy::class)];
-        yield ['collection', Type::list(Type::object(\DateTimeImmutable::class))];
-        yield ['nestedCollection', Type::list(Type::list(Type::string()))];
-        yield ['mixedCollection', Type::list()];
+        yield ['collection', Type::array(Type::object(\DateTimeImmutable::class))];
+        yield ['nestedCollection', Type::array(Type::array(Type::string()))];
+        yield ['mixedCollection', Type::array(Type::mixed())];
         yield ['a', null];
         yield ['b', null];
         yield ['c', null];
@@ -783,7 +783,7 @@ public static function typesWithNoPrefixesProvider(): iterable
         yield ['h', Type::nullable(Type::string())];
         yield ['i', Type::union(Type::int(), Type::string(), Type::null())];
         yield ['j', Type::nullable(Type::object(\DateTimeImmutable::class))];
-        yield ['nullableCollectionOfNonNullableElements', Type::nullable(Type::list(Type::int()))];
+        yield ['nullableCollectionOfNonNullableElements', Type::nullable(Type::array(Type::int()))];
         yield ['donotexist', null];
         yield ['staticGetter', null];
         yield ['staticSetter', null];
@@ -830,12 +830,12 @@ public static function typesWithCustomPrefixesProvider(): iterable
         yield ['foo2', Type::float()];
         yield ['foo3', Type::callable()];
         yield ['foo5', Type::mixed()];
-        yield ['files', Type::union(Type::list(Type::object(\SplFileInfo::class)), Type::resource())];
+        yield ['files', Type::union(Type::array(Type::object(\SplFileInfo::class)), Type::resource())];
         yield ['bal', Type::object(\DateTimeImmutable::class)];
         yield ['parent', Type::object(ParentDummy::class)];
-        yield ['collection', Type::list(Type::object(\DateTimeImmutable::class))];
-        yield ['nestedCollection', Type::list(Type::list(Type::string()))];
-        yield ['mixedCollection', Type::list()];
+        yield ['collection', Type::array(Type::object(\DateTimeImmutable::class))];
+        yield ['nestedCollection', Type::array(Type::array(Type::string()))];
+        yield ['mixedCollection', Type::array(Type::mixed())];
         yield ['a', null];
         yield ['b', null];
         yield ['c', Type::nullable(Type::bool())];
@@ -846,7 +846,7 @@ public static function typesWithCustomPrefixesProvider(): iterable
         yield ['h', Type::nullable(Type::string())];
         yield ['i', Type::union(Type::int(), Type::string(), Type::null())];
         yield ['j', Type::nullable(Type::object(\DateTimeImmutable::class))];
-        yield ['nullableCollectionOfNonNullableElements', Type::nullable(Type::list(Type::int()))];
+        yield ['nullableCollectionOfNonNullableElements', Type::nullable(Type::array(Type::int()))];
         yield ['nonNullableCollectionOfNullableElements', Type::array(Type::nullable(Type::int()))];
         yield ['nullableCollectionOfMultipleNonNullableElementTypes', Type::nullable(Type::array(Type::union(Type::int(), Type::string())))];
         yield ['donotexist', null];
@@ -976,16 +976,16 @@ public function testExtractorUnionTypes(string $property, ?Type $type)
     public static function unionTypesProvider(): iterable
     {
         yield ['a', Type::union(Type::string(), Type::int())];
-        yield ['b', Type::list(Type::union(Type::string(), Type::int()))];
+        yield ['b', Type::array(Type::union(Type::string(), Type::int()))];
         yield ['c', Type::array(Type::union(Type::string(), Type::int()))];
         yield ['d', Type::array(Type::array(Type::string()), Type::union(Type::string(), Type::int()))];
         yield ['e', Type::union(
             Type::generic(
                 Type::object(Dummy::class),
-                Type::array(Type::string(), Type::mixed()),
+                Type::array(Type::string()),
                 Type::union(
                     Type::int(),
-                    Type::list(Type::collection(Type::object(\Traversable::class), Type::object(DefaultValue::class))),
+                    Type::array(Type::collection(Type::object(\Traversable::class), Type::object(DefaultValue::class))),
                 ),
             ),
             Type::object(ParentDummy::class),

Tests/Fixtures/DummyUnionType.php

@@ -40,7 +40,7 @@ class DummyUnionType
     public $d;
 
     /**
-     * @var (Dummy<array<mixed, string>, (int | (\Traversable<DefaultValue>)[])> | ParentDummy | null)
+     * @var (Dummy<array<string>, (int | (\Traversable<DefaultValue>)[])> | ParentDummy | null)
      */
     public $e;
 

composer.json

@@ -26,7 +26,7 @@
         "php": ">=8.2",
         "symfony/deprecation-contracts": "^2.5|^3",
         "symfony/string": "^6.4|^7.0",
-        "symfony/type-info": "^7.3.5"
+        "symfony/type-info": "~7.3.8|^7.4.1"
     },
     "require-dev": {
         "symfony/serializer": "^6.4|^7.0",