Merged pull request #566

Author: derickr

src/Operation/CountDocuments.php

@@ -152,8 +152,15 @@ public function execute(Server $server)
         }
 
         $cursor = $server->executeReadCommand($this->databaseName, new Command($this->createCommandDocument()), $this->createOptions());
-        $result = current($cursor->toArray());
+        $allResults = $cursor->toArray();
 
+        /* If there are no documents to count, the aggregation pipeline has no items to group, and
+         * hence the result is an empty array (PHPLIB-376) */
+        if (count($allResults) == 0) {
+            return 0;
+        }
+
+        $result = current($allResults);
         if ( ! isset($result->n) || ! (is_integer($result->n) || is_float($result->n))) {
             throw new UnexpectedValueException('count command did not return a numeric "n" value');
         }

tests/Operation/CountDocumentsFunctionalTest.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace MongoDB\Tests\Operation;
+
+use MongoDB\Operation\CountDocuments;
+use MongoDB\Operation\InsertMany;
+use stdClass;
+
+class CountDocumentsFunctionalTest extends FunctionalTestCase
+{
+    public function testEmptyCollection()
+    {
+        $operation = new CountDocuments($this->getDatabaseName(), $this->getCollectionName(), []);
+        $this->assertSame(0, $operation->execute($this->getPrimaryServer()));
+    }
+
+    public function testNonEmptyCollection()
+    {
+        $insertMany = new InsertMany($this->getDatabaseName(), $this->getCollectionName(), [
+            ['x' => 1],
+            ['x' => 2],
+            ['y' => 3],
+            ['z' => 4],
+        ]);
+        $insertMany->execute($this->getPrimaryServer());
+
+        $operation = new CountDocuments($this->getDatabaseName(), $this->getCollectionName(), []);
+        $this->assertSame(4, $operation->execute($this->getPrimaryServer()));
+    }
+}

tests/Operation/CountFunctionalTest.php

@@ -55,7 +55,7 @@ public function testHintOption()
 
         foreach ($hintsUsingSparseIndex as $hint) {
             $operation = new Count($this->getDatabaseName(), $this->getCollectionName(), $filter, ['hint' => $hint]);
-            $this->assertEquals(2, $operation->execute($this->getPrimaryServer()));
+            $this->assertSame(2, $operation->execute($this->getPrimaryServer()));
         }
 
         $hintsNotUsingSparseIndex = [
@@ -66,7 +66,7 @@ public function testHintOption()
 
         foreach ($hintsNotUsingSparseIndex as $hint) {
             $operation = new Count($this->getDatabaseName(), $this->getCollectionName(), $filter, ['hint' => $hint]);
-            $this->assertEquals(3, $operation->execute($this->getPrimaryServer()));
+            $this->assertSame(3, $operation->execute($this->getPrimaryServer()));
         }
     }