Added support for \DateTime in date property

ORM/Manager.php

@@ -156,6 +156,9 @@ private function convertToArray($object, $getters)
 
                 $value = $newValue;
             }
+            if ($value instanceof \DateTime) {
+                $value = $value->format(\DateTime::ISO8601);
+            }
 
             if ($value) {
                 $document[$field] = $value;

Result/Converter.php

@@ -59,7 +59,12 @@ public function convertToDocument($rawData)
         $data = isset($rawData['_source']) ? $rawData['_source'] : array_map('reset', $rawData['fields']);
 
         /** @var DocumentInterface $object */
-        $object = $this->assignArrayToObject($data, new $metadata['namespace'](), $metadata['setters']);
+        $object = $this->assignArrayToObject(
+            $data,
+            new $metadata['namespace'](),
+            array_merge_recursive($metadata['properties'], $metadata['setters'])
+        );
+
         isset($rawData['_id']) && $object->setId($rawData['_id']);
         isset($rawData['_score']) && $object->setScore($rawData['_score']);
         isset($rawData['highlight']) && $object->setHighlight(new DocumentHighlight($rawData['highlight']));
@@ -90,6 +95,10 @@ public function assignArrayToObject(array $array, $object, array $setters)
                 $value = new ObjectIterator($this, $value, $setter);
             }
 
+            if ($setter['type'] === 'date') {
+                $value = \DateTime::createFromFormat(\DateTime::ISO8601, $value);
+            }
+
             if ($setter['exec']) {
                 $object->{$setter['name']}($value);
             } else {

Tests/Functional/ORM/ManagerTest.php

@@ -80,14 +80,41 @@ public function testPersistSpecialFields()
         /** @var Manager $manager */
         $manager = $this->getManager();
 
-        $product = new Comment();
-        $product->setId('testId');
-        $product->setTtl(500000);
-        $product->setScore('1.0');
-        $product->setParent('parentId');
-        $product->userName = 'testUser';
+        $comment = new Comment();
+        $comment->setId('testId');
+        $comment->setTtl(500000);
+        $comment->setScore('1.0');
+        $comment->setParent('parentId');
+        $comment->userName = 'testUser';
+
+        $manager->persist($comment);
+        $manager->commit();
 
-        $manager->persist($product);
+        $repository = $manager->getRepository('AcmeTestBundle:Comment');
+        $search = $repository->createSearch();
+        $results = $repository->execute($search);
+        /** @var DocumentInterface $actualProduct */
+        $actualProduct = $results[0];
+
+        $this->assertEquals($comment->getId(), $actualProduct->getId());
+        $this->assertEquals($comment->getParent(), $actualProduct->getParent());
+        $this->assertLessThan($comment->getTtl(), $actualProduct->getTtl());
+    }
+
+    /**
+     * Tests if DateTime object is being parsed.
+     */
+    public function testPersistDateField()
+    {
+        /** @var Manager $manager */
+        $manager = $this->getManager();
+
+        $comment = new Comment();
+        $comment->setId('testId');
+        $comment->setParent('parentId');
+        $comment->setCreatedAt(new \DateTime('2100-01-02 03:04:05.889342'));
+
+        $manager->persist($comment);
         $manager->commit();
 
         $repository = $manager->getRepository('AcmeTestBundle:Comment');
@@ -96,8 +123,6 @@ public function testPersistSpecialFields()
         /** @var DocumentInterface $actualProduct */
         $actualProduct = $results[0];
 
-        $this->assertEquals($product->getId(), $actualProduct->getId());
-        $this->assertEquals($product->getParent(), $actualProduct->getParent());
-        $this->assertLessThan($product->getTtl(), $actualProduct->getTtl());
+        $this->assertGreaterThan(time(), $actualProduct->getCreatedAt()->getTimestamp());
     }
 }

Tests/Unit/Mapping/MetadataCollectorTest.php

@@ -168,6 +168,9 @@ public function testGet()
                         'userName' => [
                             'type' => 'string',
                         ],
+                        'createdAt' => [
+                            'type' => 'date'
+                        ]
                     ],
                 ],
             ],

Tests/Unit/Result/DocumentIteratorTest.php

@@ -87,6 +87,11 @@ public function testIteration($rawData)
                         'name' => 'header',
                     ]
                 ],
+                'properties' => [
+                    'header' => [
+                        'type' => 'string'
+                    ]
+                ],
                 'namespace' => 'ONGR\ElasticsearchBundle\Tests\app\fixture\Acme\TestBundle\Document\Content',
             ],
         ];

Tests/app/fixture/Acme/TestBundle/Document/Comment.php

@@ -30,4 +30,35 @@ class Comment implements DocumentInterface
      * @ES\Property(type="string", name="userName")
      */
     public $userName;
+
+    /**
+     * @var \DateTime
+     *
+     * @ES\Property(name="createdAt", type="date")
+     */
+    private $createdAt;
+
+    /**
+     * Constructor.
+     */
+    public function __construct()
+    {
+        $this->createdAt = new \DateTime();
+    }
+
+    /**
+     * @return \DateTime
+     */
+    public function getCreatedAt()
+    {
+        return $this->createdAt;
+    }
+
+    /**
+     * @param \DateTime $createdAt
+     */
+    public function setCreatedAt(\DateTime $createdAt)
+    {
+        $this->createdAt = $createdAt;
+    }
 }