[TypeInfo] Simple array should be array type

matijn-made · nicolas-grekas · commit 54e723541cf8 · 2025-12-05T14:52:40.000+01:00
diff --git a/Tests/Fixtures/Model/DummyWithList.php b/Tests/Fixtures/Model/DummyWithList.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Symfony\Component\JsonStreamer\Tests\Fixtures\Model;
+
+class DummyWithList
+{
+    /** @var list<ClassicDummy> */
+    public array $dummies;
+
+    public string $customProperty;
+}
diff --git a/Tests/Fixtures/Model/DummyWithNestedList.php b/Tests/Fixtures/Model/DummyWithNestedList.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Symfony\Component\JsonStreamer\Tests\Fixtures\Model;
+
+class DummyWithNestedList
+{
+    /** @var list<DummyWithList> */
+    public array $dummies;
+
+    public string $stringProperty;
+}
diff --git a/Tests/Fixtures/stream_writer/double_nested_array.php b/Tests/Fixtures/stream_writer/double_nested_array.php
@@ -0,0 +1,40 @@
+<?php
+
+return static function (mixed $data, \Psr\Container\ContainerInterface $valueTransformers, array $options): \Traversable {
+    try {
+        yield '[';
+        $prefix = '';
+        foreach ($data as $value1) {
+            yield $prefix;
+            yield '{"dummies":{';
+            $prefix = '';
+            foreach ($value1->dummies as $key2 => $value2) {
+                $key2 = is_int($key2) ? $key2 : \substr(\json_encode($key2), 1, -1);
+                yield "{$prefix}\"{$key2}\":";
+                yield '{"dummies":{';
+                $prefix = '';
+                foreach ($value2->dummies as $key3 => $value3) {
+                    $key3 = is_int($key3) ? $key3 : \substr(\json_encode($key3), 1, -1);
+                    yield "{$prefix}\"{$key3}\":";
+                    yield '{"id":';
+                    yield \json_encode($value3->id, \JSON_THROW_ON_ERROR, 506);
+                    yield ',"name":';
+                    yield \json_encode($value3->name, \JSON_THROW_ON_ERROR, 506);
+                    yield '}';
+                    $prefix = ',';
+                }
+                yield '},"customProperty":';
+                yield \json_encode($value2->customProperty, \JSON_THROW_ON_ERROR, 508);
+                yield '}';
+                $prefix = ',';
+            }
+            yield '},"stringProperty":';
+            yield \json_encode($value1->stringProperty, \JSON_THROW_ON_ERROR, 510);
+            yield '}';
+            $prefix = ',';
+        }
+        yield ']';
+    } catch (\JsonException $e) {
+        throw new \Symfony\Component\JsonStreamer\Exception\NotEncodableValueException($e->getMessage(), 0, $e);
+    }
+};
diff --git a/Tests/Fixtures/stream_writer/nested_array.php b/Tests/Fixtures/stream_writer/nested_array.php
@@ -0,0 +1,30 @@
+<?php
+
+return static function (mixed $data, \Psr\Container\ContainerInterface $valueTransformers, array $options): \Traversable {
+    try {
+        yield '[';
+        $prefix = '';
+        foreach ($data as $value1) {
+            yield $prefix;
+            yield '{"dummies":{';
+            $prefix = '';
+            foreach ($value1->dummies as $key2 => $value2) {
+                $key2 = is_int($key2) ? $key2 : \substr(\json_encode($key2), 1, -1);
+                yield "{$prefix}\"{$key2}\":";
+                yield '{"id":';
+                yield \json_encode($value2->id, \JSON_THROW_ON_ERROR, 508);
+                yield ',"name":';
+                yield \json_encode($value2->name, \JSON_THROW_ON_ERROR, 508);
+                yield '}';
+                $prefix = ',';
+            }
+            yield '},"customProperty":';
+            yield \json_encode($value1->customProperty, \JSON_THROW_ON_ERROR, 510);
+            yield '}';
+            $prefix = ',';
+        }
+        yield ']';
+    } catch (\JsonException $e) {
+        throw new \Symfony\Component\JsonStreamer\Exception\NotEncodableValueException($e->getMessage(), 0, $e);
+    }
+};
diff --git a/Tests/JsonStreamWriterTest.php b/Tests/JsonStreamWriterTest.php
@@ -19,8 +19,10 @@
 use Symfony\Component\JsonStreamer\Tests\Fixtures\Model\DummyWithArray;
 use Symfony\Component\JsonStreamer\Tests\Fixtures\Model\DummyWithDateTimes;
 use Symfony\Component\JsonStreamer\Tests\Fixtures\Model\DummyWithGenerics;
+use Symfony\Component\JsonStreamer\Tests\Fixtures\Model\DummyWithList;
 use Symfony\Component\JsonStreamer\Tests\Fixtures\Model\DummyWithNameAttributes;
 use Symfony\Component\JsonStreamer\Tests\Fixtures\Model\DummyWithNestedArray;
+use Symfony\Component\JsonStreamer\Tests\Fixtures\Model\DummyWithNestedList;
 use Symfony\Component\JsonStreamer\Tests\Fixtures\Model\DummyWithNullableProperties;
 use Symfony\Component\JsonStreamer\Tests\Fixtures\Model\DummyWithPhpDoc;
 use Symfony\Component\JsonStreamer\Tests\Fixtures\Model\DummyWithUnionProperties;
@@ -119,7 +121,7 @@ public function testWriteCollection()
         $dummyWithArray2->customProperty = 'customProperty2';
 
         $this->assertWritten(
-            '[{"dummies":[{"id":1,"name":"dummy"}],"customProperty":"customProperty1"},{"dummies":[{"id":1,"name":"dummy"}],"customProperty":"customProperty2"}]',
+            '[{"dummies":{"0":{"id":1,"name":"dummy"}},"customProperty":"customProperty1"},{"dummies":{"0":{"id":1,"name":"dummy"}},"customProperty":"customProperty2"}]',
             [$dummyWithArray1, $dummyWithArray2],
             Type::list(Type::object(DummyWithArray::class)),
         );
@@ -133,10 +135,38 @@ public function testWriteCollection()
         $dummyWithNestedArray2->stringProperty = 'stringProperty2';
 
         $this->assertWritten(
-            '[{"dummies":[{"dummies":[{"id":1,"name":"dummy"}],"customProperty":"customProperty1"}],"stringProperty":"stringProperty1"},{"dummies":[{"dummies":[{"id":1,"name":"dummy"}],"customProperty":"customProperty2"}],"stringProperty":"stringProperty2"}]',
+            '[{"dummies":{"0":{"dummies":{"0":{"id":1,"name":"dummy"}},"customProperty":"customProperty1"}},"stringProperty":"stringProperty1"},{"dummies":{"0":{"dummies":{"0":{"id":1,"name":"dummy"}},"customProperty":"customProperty2"}},"stringProperty":"stringProperty2"}]',
             [$dummyWithNestedArray1, $dummyWithNestedArray2],
             Type::list(Type::object(DummyWithNestedArray::class)),
         );
+
+        $dummyWithList1 = new DummyWithList();
+        $dummyWithList1->dummies = [new ClassicDummy()];
+        $dummyWithList1->customProperty = 'customProperty1';
+
+        $dummyWithList2 = new DummyWithList();
+        $dummyWithList2->dummies = [new ClassicDummy()];
+        $dummyWithList2->customProperty = 'customProperty2';
+
+        $this->assertWritten(
+            '[{"dummies":[{"id":1,"name":"dummy"}],"customProperty":"customProperty1"},{"dummies":[{"id":1,"name":"dummy"}],"customProperty":"customProperty2"}]',
+            [$dummyWithList1, $dummyWithList2],
+            Type::list(Type::object(DummyWithList::class)),
+        );
+
+        $dummyWithNestedList1 = new DummyWithNestedList();
+        $dummyWithNestedList1->dummies = [$dummyWithList1];
+        $dummyWithNestedList1->stringProperty = 'stringProperty1';
+
+        $dummyWithNestedList2 = new DummyWithNestedList();
+        $dummyWithNestedList2->dummies = [$dummyWithList2];
+        $dummyWithNestedList2->stringProperty = 'stringProperty2';
+
+        $this->assertWritten(
+            '[{"dummies":[{"dummies":[{"id":1,"name":"dummy"}],"customProperty":"customProperty1"}],"stringProperty":"stringProperty1"},{"dummies":[{"dummies":[{"id":1,"name":"dummy"}],"customProperty":"customProperty2"}],"stringProperty":"stringProperty2"}]',
+            [$dummyWithNestedList1, $dummyWithNestedList2],
+            Type::list(Type::object(DummyWithNestedList::class)),
+        );
     }
 
     public function testWriteObject()
diff --git a/Tests/Write/StreamWriterGeneratorTest.php b/Tests/Write/StreamWriterGeneratorTest.php
@@ -22,8 +22,10 @@
 use Symfony\Component\JsonStreamer\Tests\Fixtures\Enum\DummyEnum;
 use Symfony\Component\JsonStreamer\Tests\Fixtures\Model\ClassicDummy;
 use Symfony\Component\JsonStreamer\Tests\Fixtures\Model\DummyWithArray;
+use Symfony\Component\JsonStreamer\Tests\Fixtures\Model\DummyWithList;
 use Symfony\Component\JsonStreamer\Tests\Fixtures\Model\DummyWithNameAttributes;
 use Symfony\Component\JsonStreamer\Tests\Fixtures\Model\DummyWithNestedArray;
+use Symfony\Component\JsonStreamer\Tests\Fixtures\Model\DummyWithNestedList;
 use Symfony\Component\JsonStreamer\Tests\Fixtures\Model\DummyWithOtherDummies;
 use Symfony\Component\JsonStreamer\Tests\Fixtures\Model\DummyWithUnionProperties;
 use Symfony\Component\JsonStreamer\Tests\Fixtures\Model\DummyWithValueTransformerAttributes;
@@ -95,8 +97,11 @@ public static function generatedStreamWriterDataProvider(): iterable
         yield ['null_list', Type::list(Type::null())];
         yield ['object_list', Type::list(Type::object(DummyWithNameAttributes::class))];
         yield ['nullable_object_list', Type::nullable(Type::list(Type::object(DummyWithNameAttributes::class)))];
-        yield ['nested_list', Type::list(Type::object(DummyWithArray::class))];
-        yield ['double_nested_list', Type::list(Type::object(DummyWithNestedArray::class))];
+        yield ['nested_list', Type::list(Type::object(DummyWithList::class))];
+        yield ['double_nested_list', Type::list(Type::object(DummyWithNestedList::class))];
+
+        yield ['nested_array', Type::list(Type::object(DummyWithArray::class))];
+        yield ['double_nested_array', Type::list(Type::object(DummyWithNestedArray::class))];
 
         yield ['dict', Type::dict()];
         yield ['object_dict', Type::dict(Type::object(DummyWithNameAttributes::class))];
diff --git a/composer.json b/composer.json
@@ -21,7 +21,7 @@
         "psr/container": "^1.1|^2.0",
         "psr/log": "^1|^2|^3",
         "symfony/filesystem": "^7.2",
-        "symfony/type-info": "^7.3.3",
+        "symfony/type-info": "~7.3.8|^7.4.1",
         "symfony/var-exporter": "^7.2"
     },
     "require-dev": {
