Merge branch 'mongocursor-key'

Merges alcaeus#40.

* mongocursor-key:
  Fix: MongoCursor uses _id as key if present

Author: alcaeus

lib/Alcaeus/MongoDbAdapter/AbstractCursor.php

@@ -277,7 +277,7 @@ protected function ensureIterator()
      * @param \Traversable $traversable
      * @return \Generator
      */
-    private function wrapTraversable(\Traversable $traversable)
+    protected function wrapTraversable(\Traversable $traversable)
     {
         foreach ($traversable as $key => $value) {
             yield $key => $value;

lib/Mongo/MongoCursor.php

@@ -426,6 +426,20 @@ protected function ensureCursor()
         return $this->cursor;
     }
 
+    /**
+     * @param \Traversable $traversable
+     * @return \Generator
+     */
+    protected function wrapTraversable(\Traversable $traversable)
+    {
+        foreach ($traversable as $key => $value) {
+            if (isset($value->_id) && ($value->_id instanceof \MongoDB\BSON\ObjectID || !is_object($value->_id))) {
+                $key = (string) $value->_id;
+            }
+            yield $key => $value;
+        }
+    }
+
     /**
      * @return array
      */

tests/Alcaeus/MongoDbAdapter/MongoCommandCursorTest.php

@@ -35,7 +35,7 @@ public function testInfo()
         $this->assertEquals($expected, $cursor->info());
 
         // Ensure cursor started iterating
-        iterator_to_array($cursor);
+        $array = iterator_to_array($cursor);
 
         $expected['started_iterating'] = true;
         $expected += [
@@ -49,5 +49,11 @@ public function testInfo()
         ];
 
         $this->assertEquals($expected, $cursor->info());
+
+        $i = 0;
+        foreach ($array as $key => $value) {
+            $this->assertEquals($i, $key);
+            $i++;
+        }
     }
 }

tests/Alcaeus/MongoDbAdapter/MongoCursorTest.php

@@ -19,9 +19,10 @@ public function testCursorConvertsTypes()
         $this->assertCount(2, $cursor);
 
         $iterated = 0;
-        foreach ($cursor as $item) {
+        foreach ($cursor as $key => $item) {
             $iterated++;
             $this->assertInstanceOf('MongoId', $item['_id']);
+            $this->assertEquals($key, (string) $item['_id']);
             $this->assertSame('bar', $item['foo']);
         }