Merge pull request #12 from cyganm/patch-1

#11 Add null support to hydrateProperties
pmill · Jan 14, 2020 · 5ea4554 · 5ea4554
2 parents 2bd7a42 + 962e94f
commit 5ea4554
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/src/ArrayHydrator.php b/src/ArrayHydrator.php
@@ -118,7 +118,7 @@ protected function hydrateProperties($entity, $data)
         foreach ($metaData->fieldNames as $fieldName) {
             $dataKey = $this->hydrateBy === self::HYDRATE_BY_FIELD ? $fieldName : $metaData->getColumnName($fieldName);
 
-            if (isset($data[$dataKey]) && !in_array($fieldName, $skipFields, true)) {
+            if (array_key_exists($dataKey, $data) && !in_array($fieldName, $skipFields, true)) {
                 $value = $data[$dataKey];
 
                 if (array_key_exists('type', $metaData->fieldMappings[$fieldName])) {

diff --git a/tests/unit/ArrayHydratorTest.php b/tests/unit/ArrayHydratorTest.php
@@ -189,6 +189,26 @@ public function testHydrateAll()
         $this->assertEquals(5, $permissions[4]->getId());
     }
 
+    public function testHydrateNullValues()
+    {
+        $data = [
+            'name'  => null,
+            'email' => null,
+        ];
+
+        $user = new Fixture\User;
+        /** @var Fixture\User $user */
+        $user = $this->hydrator->hydrate($user, $data);
+        $user->setName('name');
+        $user->setEmail('email');
+
+        $this->assertEquals('name', $user->getName());
+        $this->assertEquals('email', $user->getEmail());
+        $user = $this->hydrator->hydrate($user, $data);
+        $this->assertNull($user->getName());
+        $this->assertNull($user->getEmail());
+    }
+
     /**
      * @expectedException \Exception
      */