Merge branch '1.12.x' into 2.0.x

DavidBadura · DavidBadura · commit b7391cf80a36 · 2025-11-16T14:36:46.000+01:00
diff --git a/.github/workflows/backward-compatibility-check.yml b/.github/workflows/backward-compatibility-check.yml
@@ -22,12 +22,12 @@ jobs:
 
     steps:
       - name: "Checkout"
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
 
       - name: "Install PHP"
-        uses: "shivammathur/setup-php@2.34.1"
+        uses: "shivammathur/setup-php@2.35.5"
         with:
           coverage: "pcov"
           php-version: "${{ matrix.php-version }}"
diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
@@ -22,15 +22,15 @@ jobs:
 
     steps:
       - name: "Install PHP"
-        uses: "shivammathur/setup-php@2.34.1"
+        uses: "shivammathur/setup-php@2.35.5"
         with:
           coverage: "pcov"
           php-version: "${{ matrix.php-version }}"
           ini-values: memory_limit=-1
           extensions: pdo_sqlite
 
       - name: "Checkout base"
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           ref: ${{ github.base_ref }}
 
@@ -42,7 +42,7 @@ jobs:
         run: "vendor/bin/phpbench run tests/Benchmark --progress=none --report=default --tag=base"
 
       - name: "Checkout"
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           clean: false
 
@@ -60,7 +60,7 @@ jobs:
           cat bench.txt >> $GITHUB_ENV
           echo 'EOF' >> $GITHUB_ENV
 
-      - uses: actions/github-script@v7
+      - uses: actions/github-script@v8
         with:
           script: |
             // Get the existing comments.
diff --git a/.github/workflows/coding-standard.yml b/.github/workflows/coding-standard.yml
@@ -26,10 +26,10 @@ jobs:
 
         steps:
             - name: "Checkout"
-              uses: actions/checkout@v4
+              uses: actions/checkout@v5
 
             - name: "Install PHP"
-              uses: "shivammathur/setup-php@2.34.1"
+              uses: "shivammathur/setup-php@2.35.5"
               with:
                   coverage: "pcov"
                   php-version: "${{ matrix.php-version }}"
diff --git a/.github/workflows/mutation-tests-diff.yml b/.github/workflows/mutation-tests-diff.yml
@@ -22,12 +22,12 @@ jobs:
 
         steps:
             - name: "Checkout"
-              uses: actions/checkout@v4
+              uses: actions/checkout@v5
               with:
                   fetch-depth: 0
 
             - name: "Install PHP"
-              uses: "shivammathur/setup-php@2.34.1"
+              uses: "shivammathur/setup-php@2.35.5"
               with:
                   coverage: "pcov"
                   php-version: "${{ matrix.php-version }}"
diff --git a/.github/workflows/mutation-tests.yml b/.github/workflows/mutation-tests.yml
@@ -26,10 +26,10 @@ jobs:
 
         steps:
             - name: "Checkout"
-              uses: actions/checkout@v4
+              uses: actions/checkout@v5
 
             - name: "Install PHP"
-              uses: "shivammathur/setup-php@2.34.1"
+              uses: "shivammathur/setup-php@2.35.5"
               with:
                   coverage: "pcov"
                   php-version: "${{ matrix.php-version }}"
diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml
@@ -26,10 +26,10 @@ jobs:
 
         steps:
             - name: "Checkout"
-              uses: actions/checkout@v4
+              uses: actions/checkout@v5
 
             - name: "Install PHP"
-              uses: "shivammathur/setup-php@2.34.1"
+              uses: "shivammathur/setup-php@2.35.5"
               with:
                   coverage: "pcov"
                   php-version: "${{ matrix.php-version }}"
diff --git a/.github/workflows/psalm.yml b/.github/workflows/psalm.yml
@@ -26,10 +26,10 @@ jobs:
 
         steps:
             - name: "Checkout"
-              uses: actions/checkout@v4
+              uses: actions/checkout@v5
 
             - name: "Install PHP"
-              uses: "shivammathur/setup-php@2.34.1"
+              uses: "shivammathur/setup-php@2.35.5"
               with:
                   coverage: "pcov"
                   php-version: "${{ matrix.php-version }}"
diff --git a/.github/workflows/release-on-milestone-closed-triggering-release-event.yml b/.github/workflows/release-on-milestone-closed-triggering-release-event.yml
@@ -18,7 +18,7 @@ jobs:
 
         steps:
             - name: "Checkout"
-              uses: actions/checkout@v4
+              uses: actions/checkout@v5
 
             - name: "Release"
               uses: "laminas/automatic-releases@v1"
diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml
@@ -35,10 +35,10 @@ jobs:
                       operating-system: "windows-latest"
         steps:
             - name: "Checkout"
-              uses: actions/checkout@v4
+              uses: actions/checkout@v5
 
             - name: "Install PHP"
-              uses: "shivammathur/setup-php@2.34.1"
+              uses: "shivammathur/setup-php@2.35.5"
               with:
                   coverage: "pcov"
                   php-version: "${{ matrix.php-version }}"
diff --git a/baseline.xml b/baseline.xml
diff --git a/src/Metadata/AttributeMetadataFactory.php b/src/Metadata/AttributeMetadataFactory.php
@@ -24,8 +24,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;
@@ -377,6 +379,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());
 
diff --git a/src/Normalizer/ObjectNormalizer.php b/src/Normalizer/ObjectNormalizer.php
@@ -7,8 +7,10 @@
 use Attribute;
 use Patchlevel\Hydrator\Hydrator;
 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;
 
@@ -77,6 +79,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;
         }
diff --git a/tests/Unit/Fixture/ProfileCreatedWithGeneric.php b/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,
+    ) {
+    }
+}
diff --git a/tests/Unit/Fixture/Wrapper.php b/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,
+    ) {
+    }
+}
diff --git a/tests/Unit/Metadata/AttributeMetadataFactoryTest.php b/tests/Unit/Metadata/AttributeMetadataFactoryTest.php
diff --git a/tests/Unit/Normalizer/ObjectNormalizerTest.php b/tests/Unit/Normalizer/ObjectNormalizerTest.php
