Merge pull request #5 from m0ppers/master

arrays vs. documents

Author: jsteemann

lib/triagens/ArangoDb/Cursor.php

@@ -104,11 +104,19 @@ public function __construct(Connection $connection, array $data, array $options)
     $this->_hasMore = (bool) $data[self::ENTRY_HASMORE];
 
     $this->_options = $options;
-    $this->_result = $this->sanitize((array) $data[self::ENTRY_RESULT]);
+    $this->_result = array();
+    $this->addDocumentsFromArray((array) $data[self::ENTRY_RESULT]);
     $this->updateLength();
 
     $this->rewind();
   }
+
+  private function addDocumentsFromArray(array $data)
+  {
+    foreach ($this->sanitize($data) as $row) {
+      $this->_result[] = Document::createFromArray($row);
+    }
+  }
 
   /**
    * Explicitly delete the cursor
@@ -254,7 +262,7 @@ private function fetchOutstanding() {
     $data = $response->getJson();
 
     $this->_hasMore = (bool) $data[self::ENTRY_HASMORE];
-    $this->_result = array_merge($this->_result, $this->sanitize((array) $data[self::ENTRY_RESULT]));
+    $this->addDocumentsFromArray($data[self::ENTRY_RESULT]);
 
     if (!$this->_hasMore) {
       // we have fetch the complete result set and can unset the id now