Merge pull request #38 from sunrise-php/release/v3.11.0

v3.11.0
sunrise-php · Sep 17, 2024 · df8d6f7 · df8d6f7
2 parents f122aab + b3cd960
commit df8d6f7
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 4 deletions.
diff --git a/src/Hydrator.php b/src/Hydrator.php
@@ -83,16 +83,17 @@ class Hydrator implements HydratorInterface
      * Constructor of the class
      *
      * @param array<string, mixed> $context
+     * @param list<TypeConverterInterface> $typeConverters
      */
-    public function __construct(array $context = [])
+    public function __construct(array $context = [], array $typeConverters = [])
     {
         $this->context = $context;
 
         $this->annotationReader = PHP_MAJOR_VERSION >= 8 ?
             new BuiltinAnnotationReader() :
             new NullAnnotationReader();
 
-        $this->addTypeConverter(...self::defaultTypeConverters());
+        $this->addTypeConverter(...self::defaultTypeConverters(), ...$typeConverters);
     }
 
     /**

diff --git a/tests/HydratorTest.php b/tests/HydratorTest.php
@@ -27,6 +27,7 @@
 use Sunrise\Hydrator\HydratorInterface;
 use Sunrise\Hydrator\Type;
 use Sunrise\Hydrator\TypeConverter\TimestampTypeConverter;
+use Sunrise\Hydrator\TypeConverterInterface;
 
 use function date;
 use function get_class;
@@ -86,6 +87,31 @@ public function testStdClassWithAssociationProperty(): void
         $this->assertSame('foo', $object->value->value);
     }
 
+    public function testCreateHydratorWithTypeConverters(): void
+    {
+        $object = new class {
+            public \Closure $foo;
+        };
+
+        $typeConverter = $this->createMock(TypeConverterInterface::class);
+
+        $typeConverter->method('castValue')->willReturnCallback(
+            static function ($value, Type $type, array $path, array $context): Generator {
+                if ($type->getName() === \Closure::class) {
+                    yield static function () use ($value) {
+                        return $value;
+                    };
+                }
+            }
+        );
+
+        $this->createHydrator([], [$typeConverter])->hydrate($object, [
+            'foo' => 'bar',
+        ]);
+
+        $this->assertSame('bar', ($object->foo)());
+    }
+
     /**
      * @group boolean
      * @dataProvider strictBooleanDataProvider
@@ -3068,9 +3094,9 @@ public function uuidDataProvider(): Generator
         yield [['value' => '207ddb61-c300-4368-9f26-33d0a99eac00'], '207ddb61-c300-4368-9f26-33d0a99eac00'];
     }
 
-    private function createHydrator(array $context = []): HydratorInterface
+    private function createHydrator(array $context = [], array $typeConverters = []): HydratorInterface
     {
-        $hydrator = new Hydrator($context);
+        $hydrator = new Hydrator($context, $typeConverters);
         if (PHP_VERSION_ID < 80000) {
             $hydrator->useDefaultAnnotationReader();
         }