Merge pull request #15 from sunrise-php/release/v2.4.0

v2.4.0
sunrise-php · Apr 11, 2022 · 28c7e46 · 28c7e46
2 parents d57b175 + cdc337b
commit 28c7e46
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 0 deletions.
diff --git a/src/Hydrator.php b/src/Hydrator.php
@@ -273,6 +273,10 @@ private function hydrateProperty(
         ReflectionNamedType $type,
         $value
     ) : void {
+        if ('' === $value && 'string' !== $type->getName()) {
+            $value = null;
+        }
+
         if (null === $value) {
             $this->hydratePropertyWithNull($object, $class, $property, $type);
             return;

diff --git a/tests/HydratorTest.php b/tests/HydratorTest.php
@@ -347,4 +347,22 @@ public function testHydratePropertyWithInvalidInterval() : void
             'duration' => 'fuuu',
         ]);
     }
+
+    public function testHydratePropertyWithEmptyStringIntegerNumber() : void
+    {
+        $object = (new Hydrator)->hydrate(Fixtures\ObjectWithNullableIntegerProperty::class, [
+            'value' => '',
+        ]);
+
+        $this->assertNull($object->value);
+    }
+
+    public function testHydratePropertyWithEmptyString() : void
+    {
+        $object = (new Hydrator)->hydrate(Fixtures\ObjectWithStringProperty::class, [
+            'value' => '',
+        ]);
+
+        $this->assertSame('', $object->value);
+    }
 }
diff --git a/tests/fixtures/ObjectWithNullableIntegerProperty.php b/tests/fixtures/ObjectWithNullableIntegerProperty.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Sunrise\Hydrator\Tests\Fixtures;
+
+final class ObjectWithNullableIntegerProperty
+{
+    public ?int $value;
+}