[JsonStreamer] Fix reading/writing objects with generics

Author: mtarld

Mapping/GenericTypePropertyMetadataLoader.php

@@ -43,10 +43,7 @@ public function load(string $className, array $options = [], array $context = []
 
         foreach ($result as &$metadata) {
             $type = $metadata->getType();
-
-            if (isset($variableTypes[(string) $type])) {
-                $metadata = $metadata->withType($this->replaceVariableTypes($type, $variableTypes));
-            }
+            $metadata = $metadata->withType($this->replaceVariableTypes($type, $variableTypes));
         }
 
         return $result;
@@ -122,19 +119,19 @@ private function replaceVariableTypes(Type $type, array $variableTypes): Type
         }
 
         if ($type instanceof UnionType) {
-            return new UnionType(...array_map(fn (Type $t): Type => $this->replaceVariableTypes($t, $variableTypes), $type->getTypes()));
+            return Type::union(...array_map(fn (Type $t): Type => $this->replaceVariableTypes($t, $variableTypes), $type->getTypes()));
         }
 
         if ($type instanceof IntersectionType) {
-            return new IntersectionType(...array_map(fn (Type $t): Type => $this->replaceVariableTypes($t, $variableTypes), $type->getTypes()));
+            return Type::intersection(...array_map(fn (Type $t): Type => $this->replaceVariableTypes($t, $variableTypes), $type->getTypes()));
         }
 
         if ($type instanceof CollectionType) {
             return new CollectionType($this->replaceVariableTypes($type->getWrappedType(), $variableTypes), $type->isList());
         }
 
         if ($type instanceof GenericType) {
-            return new GenericType(
+            return Type::generic(
                 $this->replaceVariableTypes($type->getWrappedType(), $variableTypes),
                 ...array_map(fn (Type $t): Type => $this->replaceVariableTypes($t, $variableTypes), $type->getVariableTypes()),
             );

Read/StreamReaderGenerator.php

@@ -34,6 +34,7 @@
 use Symfony\Component\TypeInfo\Type\BuiltinType;
 use Symfony\Component\TypeInfo\Type\CollectionType;
 use Symfony\Component\TypeInfo\Type\EnumType;
+use Symfony\Component\TypeInfo\Type\GenericType;
 use Symfony\Component\TypeInfo\Type\ObjectType;
 use Symfony\Component\TypeInfo\Type\UnionType;
 
@@ -118,6 +119,10 @@ public function createDataModel(Type $type, array $options = [], array $context
             return new BackedEnumNode($type);
         }
 
+        if ($type instanceof GenericType) {
+            $type = $type->getWrappedType();
+        }
+
         if ($type instanceof ObjectType && !$type instanceof EnumType) {
             $typeString = (string) $type;
             $className = $type->getClassName();

Tests/Fixtures/Model/DummyWithGenerics.php

@@ -8,7 +8,7 @@
 class DummyWithGenerics
 {
     /**
-     * @var array<int, T>
+     * @var list<T>
      */
     public array $dummies = [];
 }

Tests/JsonStreamReaderTest.php

@@ -16,6 +16,7 @@
 use Symfony\Component\JsonStreamer\Tests\Fixtures\Enum\DummyBackedEnum;
 use Symfony\Component\JsonStreamer\Tests\Fixtures\Model\ClassicDummy;
 use Symfony\Component\JsonStreamer\Tests\Fixtures\Model\DummyWithDateTimes;
+use Symfony\Component\JsonStreamer\Tests\Fixtures\Model\DummyWithGenerics;
 use Symfony\Component\JsonStreamer\Tests\Fixtures\Model\DummyWithNameAttributes;
 use Symfony\Component\JsonStreamer\Tests\Fixtures\Model\DummyWithNullableProperties;
 use Symfony\Component\JsonStreamer\Tests\Fixtures\Model\DummyWithPhpDoc;
@@ -100,6 +101,17 @@ public function testReadObject()
         }, '{"id": 10, "name": "dummy name"}', Type::object(ClassicDummy::class));
     }
 
+    public function testReadObjectWithGenerics()
+    {
+        $reader = JsonStreamReader::create(streamReadersDir: $this->streamReadersDir, lazyGhostsDir: $this->lazyGhostsDir);
+
+        $this->assertRead($reader, function (mixed $read) {
+            $this->assertInstanceOf(DummyWithGenerics::class, $read);
+            $this->assertSame(10, $read->dummies[0]->id);
+            $this->assertSame('dummy name', $read->dummies[0]->name);
+        }, '{"dummies":[{"id":10,"name":"dummy name"}]}', Type::generic(Type::object(DummyWithGenerics::class), Type::object(ClassicDummy::class)));
+    }
+
     public function testReadObjectWithStreamedName()
     {
         $reader = JsonStreamReader::create(streamReadersDir: $this->streamReadersDir, lazyGhostsDir: $this->lazyGhostsDir);

Tests/JsonStreamWriterTest.php

@@ -17,6 +17,7 @@
 use Symfony\Component\JsonStreamer\Tests\Fixtures\Enum\DummyBackedEnum;
 use Symfony\Component\JsonStreamer\Tests\Fixtures\Model\ClassicDummy;
 use Symfony\Component\JsonStreamer\Tests\Fixtures\Model\DummyWithDateTimes;
+use Symfony\Component\JsonStreamer\Tests\Fixtures\Model\DummyWithGenerics;
 use Symfony\Component\JsonStreamer\Tests\Fixtures\Model\DummyWithNameAttributes;
 use Symfony\Component\JsonStreamer\Tests\Fixtures\Model\DummyWithNullableProperties;
 use Symfony\Component\JsonStreamer\Tests\Fixtures\Model\DummyWithPhpDoc;
@@ -117,6 +118,18 @@ public function testWriteObject()
         $this->assertWritten('{"id":10,"name":"dummy name"}', $dummy, Type::object(ClassicDummy::class));
     }
 
+    public function testWriteObjectWithGenerics()
+    {
+        $nestedDummy = new DummyWithNameAttributes();
+        $nestedDummy->id = 10;
+        $nestedDummy->name = 'dummy name';
+
+        $dummy = new DummyWithGenerics();
+        $dummy->dummies = [$nestedDummy];
+
+        $this->assertWritten('{"dummies":[{"id":10,"name":"dummy name"}]}', $dummy, Type::generic(Type::object(DummyWithGenerics::class), Type::object(ClassicDummy::class)));
+    }
+
     public function testWriteObjectWithStreamedName()
     {
         $dummy = new DummyWithNameAttributes();

Write/StreamWriterGenerator.php

@@ -35,6 +35,7 @@
 use Symfony\Component\TypeInfo\Type\BuiltinType;
 use Symfony\Component\TypeInfo\Type\CollectionType;
 use Symfony\Component\TypeInfo\Type\EnumType;
+use Symfony\Component\TypeInfo\Type\GenericType;
 use Symfony\Component\TypeInfo\Type\ObjectType;
 use Symfony\Component\TypeInfo\Type\UnionType;
 
@@ -124,6 +125,10 @@ private function createDataModel(Type $type, DataAccessorInterface $accessor, ar
             return new BackedEnumNode($accessor, $type);
         }
 
+        if ($type instanceof GenericType) {
+            $type = $type->getWrappedType();
+        }
+
         if ($type instanceof ObjectType && !$type instanceof EnumType) {
             $typeString = (string) $type;
             $className = $type->getClassName();
@@ -133,7 +138,7 @@ private function createDataModel(Type $type, DataAccessorInterface $accessor, ar
             }
 
             $context['generated_classes'][$typeString] = true;
-            $propertiesMetadata = $this->propertyMetadataLoader->load($className, $options, ['original_type' => $type] + $context);
+            $propertiesMetadata = $this->propertyMetadataLoader->load($className, $options, $context);
 
             try {
                 $classReflection = new \ReflectionClass($className);