Added ability to return documents without the id as the key in Cursor…

…::toArray()
doctrine · Nov 20, 2012 · 36915a3 · 36915a3
1 parent 807f9cc
commit 36915a3
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/lib/Doctrine/MongoDB/Cursor.php b/lib/Doctrine/MongoDB/Cursor.php
@@ -317,11 +317,11 @@ public function valid()
         return $this->mongoCursor->valid();
     }
 
-    public function toArray()
+    public function toArray($useKeys = true)
     {
         $cursor = $this;
-        return $this->retry(function() use ($cursor) {
-            return iterator_to_array($cursor);
+        return $this->retry(function() use ($cursor, $useKeys) {
+            return iterator_to_array($cursor, $useKeys);
         }, true);
     }
 

diff --git a/tests/Doctrine/MongoDB/Tests/CursorTest.php b/tests/Doctrine/MongoDB/Tests/CursorTest.php
@@ -61,4 +61,21 @@ public function testGetSingleResultReturnsNull()
         $cursor = $collection->createQueryBuilder()->getQuery()->execute();
         $this->assertNull($cursor->getSingleResult());
     }
+
+    public function testToArray()
+    {
+        $this->assertEquals(
+            array(
+                (string) $this->doc1['_id'] => $this->doc1,
+                (string) $this->doc2['_id'] => $this->doc2,
+                (string) $this->doc3['_id'] => $this->doc3
+            ),
+            $this->cursor->toArray()
+        );
+    }
+
+    public function testToArrayWithoutKeys()
+    {
+        $this->assertEquals(array($this->doc1, $this->doc2, $this->doc3), $this->cursor->toArray(false));
+    }
 }