add generic & template type support

baseline.xml

@@ -54,6 +54,13 @@
     <InvalidOperand>
       <code><![CDATA[$guessers]]></code>
     </InvalidOperand>
+    <MixedReturnStatement>
+      <code><![CDATA[(new ReflectionClass($class))->newLazyProxy(
+            function () use ($metadata, $data): object {
+                return $this->doHydrate($metadata, $data);
+            },
+        )]]></code>
+    </MixedReturnStatement>
     <PossiblyInvalidArgument>
       <code><![CDATA[[
                 ...$guessers,
@@ -89,23 +96,6 @@
       <code><![CDATA[$value]]></code>
     </MixedArgumentTypeCoercion>
   </file>
-  <file src="tests/Benchmark/tideways.php">
-    <ClassMustBeFinal>
-      <code><![CDATA[CompiledMetadataHydrator]]></code>
-    </ClassMustBeFinal>
-    <MixedMethodCall>
-      <code><![CDATA[normalize]]></code>
-      <code><![CDATA[normalize]]></code>
-    </MixedMethodCall>
-    <MixedReturnTypeCoercion>
-      <code><![CDATA[array]]></code>
-      <code><![CDATA[match (true) {
-            $object instanceof ProfileCreated => $this->extractProfileCreated($object),
-            $object instanceof Skill => $this->extractSkill($object),
-            default => throw new InvalidArgumentException('Unknown object type'),
-        }]]></code>
-    </MixedReturnTypeCoercion>
-  </file>
   <file src="tests/Unit/Cryptography/Cipher/OpensslCipherTest.php">
     <MixedAssignment>
       <code><![CDATA[$return]]></code>
@@ -163,6 +153,20 @@
       <code><![CDATA[['foo' => $normalizer]]]></code>
     </InvalidArgument>
   </file>
+  <file src="tests/Unit/Normalizer/EnumNormalizerTest.php">
+    <DeprecatedMethod>
+      <code><![CDATA[handleReflectionType]]></code>
+      <code><![CDATA[handleReflectionType]]></code>
+      <code><![CDATA[handleReflectionType]]></code>
+    </DeprecatedMethod>
+  </file>
+  <file src="tests/Unit/Normalizer/ObjectNormalizerTest.php">
+    <DeprecatedMethod>
+      <code><![CDATA[handleReflectionType]]></code>
+      <code><![CDATA[handleReflectionType]]></code>
+      <code><![CDATA[handleReflectionType]]></code>
+    </DeprecatedMethod>
+  </file>
   <file src="tests/Unit/Normalizer/ReflectionTypeUtilTest.php">
     <DeprecatedClass>
       <code><![CDATA[ReflectionTypeUtil::classString($this->reflectionType($object, 'notAObject'))]]></code>

src/Metadata/AttributeMetadataFactory.php

@@ -25,8 +25,10 @@
 use Symfony\Component\TypeInfo\Type;
 use Symfony\Component\TypeInfo\Type\ArrayShapeType;
 use Symfony\Component\TypeInfo\Type\CollectionType;
+use Symfony\Component\TypeInfo\Type\GenericType;
 use Symfony\Component\TypeInfo\Type\NullableType;
 use Symfony\Component\TypeInfo\Type\ObjectType;
+use Symfony\Component\TypeInfo\Type\TemplateType;
 use Symfony\Component\TypeInfo\TypeResolver\TypeResolver;
 
 use function array_key_exists;
@@ -391,6 +393,14 @@ private function inferNormalizerByType(Type $type): Normalizer|null
             $type = $type->getWrappedType();
         }
 
+        if ($type instanceof TemplateType) {
+            $type = $type->getWrappedType();
+        }
+
+        if ($type instanceof GenericType) {
+            $type = $type->getWrappedType();
+        }
+
         if ($type instanceof ObjectType) {
             $normalizer = $this->findNormalizerOnClass($type->getClassName());
 

src/Normalizer/EnumNormalizer.php

@@ -58,6 +58,7 @@ public function denormalize(mixed $value): BackedEnum|null
         }
     }
 
+    /** @deprecated use `handleType()` instead */
     public function handleReflectionType(ReflectionType|null $reflectionType): void
     {
         if ($this->enum !== null || $reflectionType === null) {

src/Normalizer/ObjectNormalizer.php

@@ -8,8 +8,10 @@
 use Patchlevel\Hydrator\Hydrator;
 use ReflectionType;
 use Symfony\Component\TypeInfo\Type;
+use Symfony\Component\TypeInfo\Type\GenericType;
 use Symfony\Component\TypeInfo\Type\NullableType;
 use Symfony\Component\TypeInfo\Type\ObjectType;
+use Symfony\Component\TypeInfo\Type\TemplateType;
 
 use function is_array;
 
@@ -68,6 +70,7 @@ public function setHydrator(Hydrator $hydrator): void
         $this->hydrator = $hydrator;
     }
 
+    /** @deprecated use handleType instead */
     public function handleReflectionType(ReflectionType|null $reflectionType): void
     {
         if ($this->className !== null || $reflectionType === null) {
@@ -87,6 +90,14 @@ public function handleType(Type|null $type): void
             $type = $type->getWrappedType();
         }
 
+        if ($type instanceof GenericType) {
+            $type = $type->getWrappedType();
+        }
+
+        if ($type instanceof TemplateType) {
+            $type = $type->getWrappedType();
+        }
+
         if (!$type instanceof ObjectType) {
             return;
         }

tests/Unit/Fixture/ProfileCreatedWithGeneric.php

@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Patchlevel\Hydrator\Tests\Unit\Fixture;
+
+final class ProfileCreatedWithGeneric
+{
+    /** @param Wrapper<Email> $email */
+    public function __construct(
+        #[IdNormalizer]
+        public ProfileId $profileId,
+        public Wrapper $email,
+    ) {
+    }
+}

tests/Unit/Fixture/Wrapper.php

@@ -0,0 +1,24 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Patchlevel\Hydrator\Tests\Unit\Fixture;
+
+use Patchlevel\Hydrator\Normalizer\ObjectNormalizer;
+
+/** @template T */
+#[ObjectNormalizer]
+final class Wrapper
+{
+    /**
+     * @param T                    $value
+     * @param Wrapper<Email>       $object
+     * @param Wrapper<string>|null $scalar
+     */
+    public function __construct(
+        public mixed $value,
+        public Wrapper $object,
+        public Wrapper|null $scalar = null,
+    ) {
+    }
+}

tests/Unit/Metadata/AttributeMetadataFactoryTest.php

@@ -18,6 +18,7 @@
 use Patchlevel\Hydrator\Metadata\PropertyMetadataNotFound;
 use Patchlevel\Hydrator\Metadata\SubjectIdAndPersonalDataConflict;
 use Patchlevel\Hydrator\Normalizer\EnumNormalizer;
+use Patchlevel\Hydrator\Normalizer\ObjectNormalizer;
 use Patchlevel\Hydrator\Tests\Unit\Fixture\BrokenParentDto;
 use Patchlevel\Hydrator\Tests\Unit\Fixture\DistributionCreated;
 use Patchlevel\Hydrator\Tests\Unit\Fixture\DuplicateFieldNameDto;
@@ -29,8 +30,10 @@
 use Patchlevel\Hydrator\Tests\Unit\Fixture\MissingSubjectIdDto;
 use Patchlevel\Hydrator\Tests\Unit\Fixture\ParentDto;
 use Patchlevel\Hydrator\Tests\Unit\Fixture\ParentWithPersonalDataDto;
+use Patchlevel\Hydrator\Tests\Unit\Fixture\ProfileCreatedWithGeneric;
 use Patchlevel\Hydrator\Tests\Unit\Fixture\ProfileId;
 use Patchlevel\Hydrator\Tests\Unit\Fixture\Status;
+use Patchlevel\Hydrator\Tests\Unit\Fixture\Wrapper;
 use PHPUnit\Framework\TestCase;
 
 final class AttributeMetadataFactoryTest extends TestCase
@@ -136,7 +139,7 @@ public function __construct(
         self::assertNull($propertyMetadata->normalizer());
     }
 
-    public function testEventWithFieldName(): void
+    public function testNormalizedName(): void
     {
         $object = new class ('Foo') {
             public function __construct(
@@ -160,7 +163,7 @@ public function __construct(
         self::assertNull($propertyMetadata->normalizer());
     }
 
-    public function testEventWithNormalizer(): void
+    public function testDefineNormalizer(): void
     {
         $object = new class (Email::fromString('info@patchlevel.de')) {
             public function __construct(
@@ -184,7 +187,7 @@ public function __construct(
         self::assertInstanceOf(EmailNormalizer::class, $propertyMetadata->normalizer());
     }
 
-    public function testEventWithTypeAwareNormalizer(): void
+    public function testTypeAwareNormalizer(): void
     {
         $object = new class (Status::Draft) {
             public function __construct(
@@ -212,7 +215,7 @@ public function __construct(
         self::assertSame(Status::class, $normalizer->getEnum());
     }
 
-    public function testEventWithInferNormalizer(): void
+    public function testInferNormalizer(): void
     {
         $object = new class {
             public function __construct(
@@ -233,6 +236,34 @@ public function __construct(
         self::assertEquals(new IdNormalizer(ProfileId::class), $propertyMetadata->normalizer());
     }
 
+    public function testInferNormalizerWithGeneric(): void
+    {
+        $metadataFactory = new AttributeMetadataFactory();
+        $metadata = $metadataFactory->metadata(ProfileCreatedWithGeneric::class);
+
+        self::assertCount(2, $metadata->properties());
+
+        $propertyMetadata = $metadata->propertyForField('email');
+        self::assertEquals(new ObjectNormalizer(Wrapper::class), $propertyMetadata->normalizer());
+    }
+
+    public function testInferNormalizerWithTemplate(): void
+    {
+        $metadataFactory = new AttributeMetadataFactory();
+        $metadata = $metadataFactory->metadata(Wrapper::class);
+
+        self::assertCount(3, $metadata->properties());
+
+        $propertyMetadata = $metadata->propertyForField('value');
+        self::assertNull($propertyMetadata->normalizer());
+
+        $propertyMetadata = $metadata->propertyForField('object');
+        self::assertEquals(new ObjectNormalizer(Wrapper::class), $propertyMetadata->normalizer());
+
+        $propertyMetadata = $metadata->propertyForField('scalar');
+        self::assertEquals(new ObjectNormalizer(Wrapper::class), $propertyMetadata->normalizer());
+    }
+
     public function testExtends(): void
     {
         $metadataFactory = new AttributeMetadataFactory();

tests/Unit/Normalizer/ObjectNormalizerTest.php

@@ -18,6 +18,7 @@
 use ReflectionClass;
 use ReflectionType;
 use RuntimeException;
+use Symfony\Component\TypeInfo\Type;
 
 use function serialize;
 use function unserialize;
@@ -115,7 +116,10 @@ public function testDenormalizeWithValue(): void
             Email::fromString('info@patchlevel.de'),
         );
 
-        $hydrator->expects($this->once())->method('hydrate')->with(ProfileCreated::class, ['profileId' => '1', 'email' => 'info@patchlevel.de'])
+        $hydrator->expects($this->once())->method('hydrate')->with(
+            ProfileCreated::class,
+            ['profileId' => '1', 'email' => 'info@patchlevel.de'],
+        )
             ->willReturn($expected);
 
         $normalizer = new ObjectNormalizer(ProfileCreated::class);
@@ -174,6 +178,28 @@ public function testAutoDetectMissingTypeBecauseNull(): void
         $normalizer->getClassName();
     }
 
+    public function testGeneric(): void
+    {
+        $hydrator = $this->createMock(Hydrator::class);
+
+        $normalizer = new ObjectNormalizer();
+        $normalizer->setHydrator($hydrator);
+        $normalizer->handleType(Type::generic(Type::object(ProfileCreated::class)));
+
+        self::assertEquals(ProfileCreated::class, $normalizer->getClassName());
+    }
+
+    public function testTemplate(): void
+    {
+        $hydrator = $this->createMock(Hydrator::class);
+
+        $normalizer = new ObjectNormalizer();
+        $normalizer->setHydrator($hydrator);
+        $normalizer->handleType(Type::template('T', Type::object(ProfileCreated::class)));
+
+        self::assertEquals(ProfileCreated::class, $normalizer->getClassName());
+    }
+
     public function testSerialize(): void
     {
         $hydrator = $this->createMock(Hydrator::class);