add innerNormalizer methods & rename className methods

DavidBadura · DavidBadura · commit 4b8f1007d56a · 2026-04-08T16:05:16.000+02:00
diff --git a/src/Normalizer/ArrayNormalizer.php b/src/Normalizer/ArrayNormalizer.php
@@ -101,4 +101,9 @@ public function handleType(Type|null $type): void
 
         $this->normalizer->handleType($type->getCollectionValueType());
     }
+
+    public function innerNormalizer(): Normalizer
+    {
+        return $this->normalizer;
+    }
 }
diff --git a/src/Normalizer/ArrayShapeNormalizer.php b/src/Normalizer/ArrayShapeNormalizer.php
@@ -120,4 +120,10 @@ public function handleType(Type|null $type): void
             $normalizer->handleType($shape[$field]['type']);
         }
     }
+
+    /** @return array<array-key, Normalizer> */
+    public function innerNormalizers(): array
+    {
+        return $this->normalizerMap;
+    }
 }
diff --git a/src/Normalizer/EnumNormalizer.php b/src/Normalizer/EnumNormalizer.php
@@ -6,6 +6,7 @@
 
 use Attribute;
 use BackedEnum;
+use Deprecated;
 use ReflectionType;
 use Symfony\Component\TypeInfo\Type;
 use Symfony\Component\TypeInfo\Type\BackedEnumType;
@@ -30,7 +31,7 @@ public function normalize(mixed $value): mixed
             return null;
         }
 
-        $enum = $this->getEnum();
+        $enum = $this->className();
 
         if (!$value instanceof $enum) {
             throw InvalidArgument::withWrongType($enum . '|null', $value);
@@ -49,7 +50,7 @@ public function denormalize(mixed $value): BackedEnum|null
             throw InvalidArgument::withWrongType('string|int|null', $value);
         }
 
-        $enum = $this->getEnum();
+        $enum = $this->className();
 
         try {
             return $enum::from($value);
@@ -86,7 +87,14 @@ public function handleType(Type|null $type): void
     }
 
     /** @return class-string<BackedEnum> */
+    #[Deprecated('Use `className()` method instead')]
     public function getEnum(): string
+    {
+        return $this->className();
+    }
+
+    /** @return class-string<BackedEnum> */
+    public function className(): string
     {
         if ($this->enum === null) {
             throw InvalidType::missingType();
diff --git a/src/Normalizer/ObjectNormalizer.php b/src/Normalizer/ObjectNormalizer.php
@@ -5,6 +5,7 @@
 namespace Patchlevel\Hydrator\Normalizer;
 
 use Attribute;
+use Deprecated;
 use Patchlevel\Hydrator\Hydrator;
 use Patchlevel\Hydrator\HydratorWithContext;
 use ReflectionType;
@@ -42,7 +43,7 @@ public function normalize(mixed $value, array $context = []): array|null
             return null;
         }
 
-        $className = $this->getClassName();
+        $className = $this->className();
 
         if (!$value instanceof $className) {
             throw InvalidArgument::withWrongType($className . '|null', $value);
@@ -70,7 +71,7 @@ public function denormalize(mixed $value, array $context = []): object|null
             throw InvalidArgument::withWrongType('array<string, mixed>|null', $value);
         }
 
-        $className = $this->getClassName();
+        $className = $this->className();
 
         if ($this->hydrator instanceof HydratorWithContext) {
             return $this->hydrator->hydrate($className, $value, $context);
@@ -120,7 +121,14 @@ public function handleType(Type|null $type): void
     }
 
     /** @return class-string */
+    #[Deprecated('Use `className()` method instead')]
     public function getClassName(): string
+    {
+        return $this->className();
+    }
+
+    /** @return class-string */
+    public function className(): string
     {
         if ($this->className === null) {
             throw InvalidType::missingType();
diff --git a/tests/Unit/Normalizer/ArrayNormalizerTest.php b/tests/Unit/Normalizer/ArrayNormalizerTest.php
@@ -161,4 +161,12 @@ public function testPassHydrator(): void
         $normalizer = new ArrayNormalizer($normalizer);
         $normalizer->setHydrator($hydrator);
     }
+
+    public function testInnerNormalizer(): void
+    {
+        $innerNormalizer = $this->createMock(Normalizer::class);
+        $normalizer = new ArrayNormalizer($innerNormalizer);
+
+        self::assertSame($innerNormalizer, $normalizer->innerNormalizer());
+    }
 }
diff --git a/tests/Unit/Normalizer/ArrayShapeNormalizerTest.php b/tests/Unit/Normalizer/ArrayShapeNormalizerTest.php
@@ -161,4 +161,12 @@ public function testPassHydrator(): void
         $normalizer = new ArrayShapeNormalizer(['foo' => $normalizer]);
         $normalizer->setHydrator($hydrator);
     }
+
+    public function testInnerNormalizers(): void
+    {
+        $innerNormalizer = $this->createMock(Normalizer::class);
+        $normalizer = new ArrayShapeNormalizer(['foo' => $innerNormalizer]);
+
+        self::assertSame(['foo' => $innerNormalizer], $normalizer->innerNormalizers());
+    }
 }
diff --git a/tests/Unit/Normalizer/EnumNormalizerTest.php b/tests/Unit/Normalizer/EnumNormalizerTest.php
@@ -69,23 +69,23 @@ public function testAutoDetect(): void
         $normalizer = new EnumNormalizer();
         $normalizer->handleReflectionType($this->reflectionType(AutoTypeDto::class, 'status'));
 
-        self::assertEquals(Status::class, $normalizer->getEnum());
+        self::assertEquals(Status::class, $normalizer->className());
     }
 
     public function testAutoDetectOverrideNotPossible(): void
     {
         $normalizer = new EnumNormalizer(AnotherEnum::class);
         $normalizer->handleReflectionType($this->reflectionType(AutoTypeDto::class, 'status'));
 
-        self::assertEquals(AnotherEnum::class, $normalizer->getEnum());
+        self::assertEquals(AnotherEnum::class, $normalizer->className());
     }
 
     public function testAutoDetectMissingType(): void
     {
         $this->expectException(InvalidType::class);
 
         $normalizer = new EnumNormalizer();
-        $normalizer->getEnum();
+        $normalizer->className();
     }
 
     public function testAutoDetectMissingTypeBecauseNull(): void
@@ -95,7 +95,7 @@ public function testAutoDetectMissingTypeBecauseNull(): void
         $normalizer = new EnumNormalizer();
         $normalizer->handleReflectionType(null);
 
-        $normalizer->getEnum();
+        $normalizer->className();
     }
 
     /** @param class-string $class */
diff --git a/tests/Unit/Normalizer/ObjectNormalizerTest.php b/tests/Unit/Normalizer/ObjectNormalizerTest.php
@@ -189,7 +189,7 @@ public function testAutoDetect(): void
         $normalizer->setHydrator($hydrator);
         $normalizer->handleReflectionType($this->reflectionType(AutoTypeDto::class, 'profileCreated'));
 
-        self::assertEquals(ProfileCreated::class, $normalizer->getClassName());
+        self::assertEquals(ProfileCreated::class, $normalizer->className());
     }
 
     public function testAutoDetectOverrideNotPossible(): void
@@ -200,7 +200,7 @@ public function testAutoDetectOverrideNotPossible(): void
         $normalizer->setHydrator($hydrator);
         $normalizer->handleReflectionType($this->reflectionType(AutoTypeDto::class, 'profileCreated'));
 
-        self::assertEquals(AutoTypeDto::class, $normalizer->getClassName());
+        self::assertEquals(AutoTypeDto::class, $normalizer->className());
     }
 
     public function testAutoDetectMissingType(): void
@@ -212,7 +212,7 @@ public function testAutoDetectMissingType(): void
         $normalizer = new ObjectNormalizer();
         $normalizer->setHydrator($hydrator);
 
-        $normalizer->getClassName();
+        $normalizer->className();
     }
 
     public function testAutoDetectMissingTypeBecauseNull(): void
@@ -225,7 +225,7 @@ public function testAutoDetectMissingTypeBecauseNull(): void
         $normalizer->setHydrator($hydrator);
         $normalizer->handleReflectionType(null);
 
-        $normalizer->getClassName();
+        $normalizer->className();
     }
 
     public function testGeneric(): void
@@ -236,7 +236,7 @@ public function testGeneric(): void
         $normalizer->setHydrator($hydrator);
         $normalizer->handleType(Type::generic(Type::object(ProfileCreated::class)));
 
-        self::assertEquals(ProfileCreated::class, $normalizer->getClassName());
+        self::assertEquals(ProfileCreated::class, $normalizer->className());
     }
 
     public function testTemplate(): void
@@ -247,7 +247,7 @@ public function testTemplate(): void
         $normalizer->setHydrator($hydrator);
         $normalizer->handleType(Type::template('T', Type::object(ProfileCreated::class)));
 
-        self::assertEquals(ProfileCreated::class, $normalizer->getClassName());
+        self::assertEquals(ProfileCreated::class, $normalizer->className());
     }
 
     public function testSerialize(): void

Original file line number	Diff line number	Diff line change
`@@ -101,4 +101,9 @@ public function handleType(Type\|null $type): void`
`101`	`101`
`102`	`102`	`$this->normalizer->handleType($type->getCollectionValueType());`
`103`	`103`	`}`
	`104`	`+`
	`105`	`+ public function innerNormalizer(): Normalizer`
	`106`	`+ {`
	`107`	`+ return $this->normalizer;`
	`108`	`+ }`
`104`	`109`	`}`
Original file line number	Diff line number	Diff line change
`@@ -120,4 +120,10 @@ public function handleType(Type\|null $type): void`
`120`	`120`	`$normalizer->handleType($shape[$field]['type']);`
`121`	`121`	`}`
`122`	`122`	`}`
	`123`	`+`
	`124`	`+ /** @return array<array-key, Normalizer> */`
	`125`	`+ public function innerNormalizers(): array`
	`126`	`+ {`
	`127`	`+ return $this->normalizerMap;`
	`128`	`+ }`
`123`	`129`	`}`
Original file line number	Diff line number	Diff line change
`@@ -161,4 +161,12 @@ public function testPassHydrator(): void`
`161`	`161`	`$normalizer = new ArrayNormalizer($normalizer);`
`162`	`162`	`$normalizer->setHydrator($hydrator);`
`163`	`163`	`}`
	`164`	`+`
	`165`	`+ public function testInnerNormalizer(): void`
	`166`	`+ {`
	`167`	`+ $innerNormalizer = $this->createMock(Normalizer::class);`
	`168`	`+ $normalizer = new ArrayNormalizer($innerNormalizer);`
	`169`	`+`
	`170`	`+ self::assertSame($innerNormalizer, $normalizer->innerNormalizer());`
	`171`	`+ }`
`164`	`172`	`}`
Original file line number	Diff line number	Diff line change
`@@ -69,23 +69,23 @@ public function testAutoDetect(): void`
`69`	`69`	`$normalizer = new EnumNormalizer();`
`70`	`70`	`$normalizer->handleReflectionType($this->reflectionType(AutoTypeDto::class, 'status'));`
`71`	`71`
`72`		`- self::assertEquals(Status::class, $normalizer->getEnum());`
	`72`	`+ self::assertEquals(Status::class, $normalizer->className());`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`public function testAutoDetectOverrideNotPossible(): void`
`76`	`76`	`{`
`77`	`77`	`$normalizer = new EnumNormalizer(AnotherEnum::class);`
`78`	`78`	`$normalizer->handleReflectionType($this->reflectionType(AutoTypeDto::class, 'status'));`
`79`	`79`
`80`		`- self::assertEquals(AnotherEnum::class, $normalizer->getEnum());`
	`80`	`+ self::assertEquals(AnotherEnum::class, $normalizer->className());`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`public function testAutoDetectMissingType(): void`
`84`	`84`	`{`
`85`	`85`	`$this->expectException(InvalidType::class);`
`86`	`86`
`87`	`87`	`$normalizer = new EnumNormalizer();`
`88`		`- $normalizer->getEnum();`
	`88`	`+ $normalizer->className();`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`public function testAutoDetectMissingTypeBecauseNull(): void`
`@@ -95,7 +95,7 @@ public function testAutoDetectMissingTypeBecauseNull(): void`
`95`	`95`	`$normalizer = new EnumNormalizer();`
`96`	`96`	`$normalizer->handleReflectionType(null);`
`97`	`97`
`98`		`- $normalizer->getEnum();`
	`98`	`+ $normalizer->className();`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`/** @param class-string $class */`