Updated with latest changes from doctrine/DoctrineModule

Author: michalbundyra

src/DoctrineObject.php

@@ -252,6 +252,23 @@ protected function extractByReference($object)
         return $data;
     }
 
+    /**
+     * Converts a value for hydration
+     * Apply strategies first, then the type conversions
+     *
+     * @inheritdoc
+     */
+    public function hydrateValue($name, $value, $data = null)
+    {
+        $value = parent::hydrateValue($name, $value, $data);
+
+        if (is_null($value) && $this->isNullable($name)) {
+            return null;
+        }
+
+        return $this->handleTypeConversions($value, $this->metadata->getTypeOfField($name));
+    }
+
     /**
      * Hydrate the object using a by-value logic (this means that it uses the entity API, in this
      * case, setters)
@@ -272,7 +289,6 @@ protected function hydrateByValue(array $data, $object)
 
         foreach ($data as $field => $value) {
             $field = $this->computeHydrateFieldName($field);
-            $value = $this->handleTypeConversions($value, $metadata->getTypeOfField($field));
             $setter = 'set' . Inflector::classify($field);
 
             if ($metadata->hasAssociation($field)) {
@@ -334,7 +350,6 @@ protected function hydrateByReference(array $data, $object)
                 continue;
             }
 
-            $value = $this->handleTypeConversions($value, $metadata->getTypeOfField($field));
             $reflProperty = $refl->getProperty($field);
             $reflProperty->setAccessible(true);
 
@@ -511,6 +526,10 @@ function ($item) {
      */
     protected function handleTypeConversions($value, $typeOfField)
     {
+        if (is_null($value)) {
+            return null;
+        }
+
         switch ($typeOfField) {
             case 'boolean':
                 $value = (bool) $value;
@@ -604,6 +623,28 @@ function ($value) {
         return false;
     }
 
+    /**
+     * Check the field is nullable
+     *
+     * @param $name
+     * @return bool
+     */
+    private function isNullable($name)
+    {
+        //TODO: need update after updating isNullable method of Doctrine\ORM\Mapping\ClassMetadata
+        if ($this->metadata->hasField($name)) {
+            return method_exists($this->metadata, 'isNullable') && $this->metadata->isNullable($name);
+        }
+
+        if ($this->metadata->hasAssociation($name) && method_exists($this->metadata, 'getAssociationMapping')) {
+            $mapping = $this->metadata->getAssociationMapping($name);
+
+            return false !== $mapping && isset($mapping['nullable']) && $mapping['nullable'];
+        }
+
+        return false;
+    }
+
     /**
      * Applies the naming strategy if there is one set
      *

test/Assets/ByValueDifferentiatorEntity.php

@@ -0,0 +1,48 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZendTest\Doctrine\Hydrator\Assets;
+
+class ByValueDifferentiatorEntity
+{
+    /**
+     * @var int
+     */
+    protected $id;
+
+    /**
+     * @var string
+     */
+    protected $field;
+
+    public function setId($id)
+    {
+        $this->id = $id;
+    }
+
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    public function setField($field, $modifyValue = true)
+    {
+        // Modify the value to illustrate the difference between by value and by reference
+        if ($modifyValue) {
+            $this->field = "From setter: $field";
+        } else {
+            $this->field = $field;
+        }
+    }
+
+    public function getField($modifyValue = true)
+    {
+        // Modify the value to illustrate the difference between by value and by reference
+        if ($modifyValue) {
+            return "From getter: $this->field";
+        } else {
+            return $this->field;
+        }
+    }
+}

test/Assets/ContextEntity.php

@@ -12,7 +12,7 @@ class OneToOneEntity
     protected $id;
 
     /**
-     * @var SimpleEntity
+     * @var ByValueDifferentiatorEntity
      */
     protected $toOne;
 
@@ -27,7 +27,7 @@ public function getId()
         return $this->id;
     }
 
-    public function setToOne(SimpleEntity $entity = null, $modifyValue = true)
+    public function setToOne(ByValueDifferentiatorEntity $entity = null, $modifyValue = true)
     {
         // Modify the value to illustrate the difference between by value and by reference
         if ($modifyValue && $entity !== null) {

test/Assets/OneToOneEntity.php

@@ -12,7 +12,7 @@ class OneToOneEntityNotNullable
     protected $id;
 
     /**
-     * @var SimpleEntity
+     * @var ByValueDifferentiatorEntity
      */
     protected $toOne;
 
@@ -27,7 +27,7 @@ public function getId()
         return $this->id;
     }
 
-    public function setToOne(SimpleEntity $entity, $modifyValue = true)
+    public function setToOne(ByValueDifferentiatorEntity $entity, $modifyValue = true)
     {
         // Modify the value to illustrate the difference between by value and by reference
         if ($modifyValue) {

test/Assets/OneToOneEntityNotNullable.php

@@ -26,23 +26,13 @@ public function getId()
         return $this->id;
     }
 
-    public function setField($field, $modifyValue = true)
+    public function setField($field)
     {
-        // Modify the value to illustrate the difference between by value and by reference
-        if ($modifyValue) {
-            $this->field = "From setter: $field";
-        } else {
-            $this->field = $field;
-        }
+        $this->field = $field;
     }
 
-    public function getField($modifyValue = true)
+    public function getField()
     {
-        // Modify the value to illustrate the difference between by value and by reference
-        if ($modifyValue) {
-            return "From getter: $this->field";
-        } else {
-            return $this->field;
-        }
+        return $this->field;
     }
 }