Add CustomType class to let use convertToPHPValue method instead of closureToPHP (no reflection)

lib/Doctrine/ODM/MongoDB/Hydrator/HydratorFactory.php

@@ -234,6 +234,7 @@ private function generateHydratorClass(ClassMetadata $class, $hydratorClassName,
         if (isset(\$data['%1\$s']) || (! empty(\$this->class->fieldMappings['%2\$s']['nullable']) && array_key_exists('%1\$s', \$data))) {
             \$value = \$data['%1\$s'];
             if (\$value !== null) {
+                \$typeIdentifier = \$this->class->fieldMappings['%2\$s']['type'];
                 %3\$s
             } else {
                 \$return = null;

lib/Doctrine/ODM/MongoDB/Types/CustomType.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace Doctrine\ODM\MongoDB\Types;
+
+class CustomType extends Type
+{
+    /**
+     * @return string Redirects to the method convertToPHPValue from child class
+     */
+    final public function closureToPHP()
+    {
+        $fqcn = self::class;
+
+        return sprintf('
+            $type = \%s::getType($typeIdentifier);
+            $return = $type->convertToPHPValue($value);', $fqcn);
+    }
+}

tests/Doctrine/ODM/MongoDB/Tests/Functional/CustomTypeTest.php

@@ -3,6 +3,7 @@
 namespace Doctrine\ODM\MongoDB\Tests\Functional;
 
 use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM;
+use Doctrine\ODM\MongoDB\Types\CustomType;
 use Doctrine\ODM\MongoDB\Types\Type;
 
 class CustomTypeTest extends \Doctrine\ODM\MongoDB\Tests\BaseTest
@@ -40,7 +41,7 @@ public function testConvertToDatabaseValueExpectsArray()
     }
 }
 
-class DateCollectionType extends Type
+class DateCollectionType extends CustomType
 {
     // Note: this method is called by PersistenceBuilder
     public function convertToDatabaseValue($value)
@@ -62,37 +63,28 @@ public function convertToDatabaseValue($value)
         return $value;
     }
 
-    // Note: this method is never called for non-identifier fields
     public function convertToPHPValue($value)
     {
-        if ($value === null) {
-            return null;
-        }
-
-        if (!is_array($value)) {
-            throw new CustomTypeException('Array expected.');
-        }
-
-        $converter = Type::getType('date');
-
-        $value = array_map(function($date) use ($converter) {
-            return $converter->convertToPHPValue($date);
-        }, array_values($value));
-
-        return $value;
+        return array_map(
+            function ($v) {
+                if ($v instanceof \MongoDate) {
+                    $date = new \DateTime();
+                    $date->setTimestamp($v->sec);
+
+                    return $date;
+                } else {
+                    return new \DateTime($v);
+                }
+            },
+            $value
+        );
     }
 
     // Note: this method is never called
     public function closureToMongo()
     {
         return '$return = array_map(function($v) { if ($v instanceof \DateTime) { $v = $v->getTimestamp(); } else if (is_string($v)) { $v = strtotime($v); } return new \MongoDate($v); }, $value);';
     }
-
-    // Note: this code ends up in the generated hydrator class (via HydratorFactory)
-    public function closureToPHP()
-    {
-        return '$return = array_map(function($v) { if ($v instanceof \MongoDate) { $date = new \DateTime(); $date->setTimestamp($v->sec); return $date; } else { return new \DateTime($v); } }, $value);';
-    }
 }
 
 class CustomTypeException extends \Exception