Merge pull request #96 from alcaeus/fix-count-cursor-closed

Fix error when counting a closed cursor

CHANGELOG-1.0.md

@@ -6,6 +6,18 @@ This changelog references the relevant changes done in minor version updates.
 1.0.2 (????-??-??)
 ------------------
 
+All issues and pull requests under this release may be found under the
+[1.0.3](https://github.com/alcaeus/mongo-php-adapter/issues?q=milestone%3A1.0.3)
+milestone.
+
+ * [#96](https://github.com/alcaeus/mongo-php-adapter/pull/96) fixes errors when
+ calling `count` on a cursor that has been iterated fully. The fix removes a
+ performance improvement when calling `count` on a cursor that has been opened.
+ `MongoCursor::count` now always re-issues a `count` command to the server.
+
+1.0.2 (2016-04-08)
+------------------
+
 All issues and pull requests under this release may be found under the
 [1.0.2](https://github.com/alcaeus/mongo-php-adapter/issues?q=milestone%3A1.0.2)
 milestone.

lib/Mongo/MongoCursor.php

@@ -135,10 +135,6 @@ public function awaitData($wait = true)
      */
     public function count($foundOnly = false)
     {
-        if ($foundOnly && $this->cursor !== null) {
-            return iterator_count($this->ensureIterator());
-        }
-
         $optionNames = ['hint', 'maxTimeMS'];
         if ($foundOnly) {
             $optionNames = array_merge($optionNames, ['limit', 'skip']);

tests/Alcaeus/MongoDbAdapter/Mongo/MongoCursorTest.php

@@ -60,6 +60,18 @@ public function testCountCannotConnect()
         $cursor->count();
     }
 
+    public function testCountAfterIteration()
+    {
+        $this->prepareData();
+
+        $collection = $this->getCollection();
+        $cursor = $collection->find(['foo' => 'bar']);
+
+        // Ensure the generator is consumed and thus closed
+        iterator_to_array($cursor);
+        $this->assertSame(2, $cursor->count(true));
+    }
+
     public function testNextStartsWithFirstItem()
     {
         $this->prepareData();