Unit tests for Count operation and allow array/object $filter

Author: jmikola

src/Collection.php

@@ -124,11 +124,11 @@ public function bulkWrite(array $operations, array $options = array())
      * Gets the number of documents matching the filter.
      *
      * @see Count::__construct() for supported options
-     * @param array $filter  Query by which to filter documents
-     * @param array $options Command options
+     * @param array|object $filter  Query by which to filter documents
+     * @param array        $options Command options
      * @return integer
      */
-    public function count(array $filter = array(), array $options = array())
+    public function count($filter = array(), array $options = array())
     {
         $operation = new Count($this->dbname, $this->collname, $filter, $options);
         $server = $this->manager->selectServer(new ReadPreference(ReadPreference::RP_PRIMARY));

src/Operation/Count.php

@@ -45,8 +45,12 @@ class Count implements Executable
      * @param array  $options        Command options
      * @throws InvalidArgumentException
      */
-    public function __construct($databaseName, $collectionName, array $filter = array(), array $options = array())
+    public function __construct($databaseName, $collectionName, $filter = array(), array $options = array())
     {
+        if ( ! is_array($filter) && ! is_object($filter)) {
+            throw new InvalidArgumentTypeException('$filter', $filter, 'array or object');
+        }
+
         if (isset($options['hint'])) {
             if (is_array($options['hint']) || is_object($options['hint'])) {
                 $options['hint'] = \MongoDB\generate_index_name($options['hint']);

tests/Operation/CountTest.php

@@ -0,0 +1,54 @@
+<?php
+
+namespace MongoDB\Tests\Operation;
+
+use MongoDB\Operation\Count;
+
+class CountTest extends TestCase
+{
+    /**
+     * @expectedException MongoDB\Exception\InvalidArgumentTypeException
+     * @dataProvider provideInvalidDocumentValues
+     */
+    public function testConstructorFilterArgumentTypeCheck($filter)
+    {
+        new Count($this->getDatabaseName(), $this->getCollectionName(), $filter);
+    }
+
+    /**
+     * @expectedException MongoDB\Exception\InvalidArgumentTypeException
+     * @dataProvider provideInvalidConstructorOptions
+     */
+    public function testConstructorOptionTypeChecks(array $options)
+    {
+        new Count($this->getDatabaseName(), $this->getCollectionName(), array(), $options);
+    }
+
+    public function provideInvalidConstructorOptions()
+    {
+        $options = array();
+
+        foreach ($this->getInvalidHintValues() as $value) {
+            $options[][] = array('hint' => $value);
+        }
+
+        foreach ($this->getInvalidIntegerValues() as $value) {
+            $options[][] = array('limit' => $value);
+        }
+
+        foreach ($this->getInvalidIntegerValues() as $value) {
+            $options[][] = array('maxTimeMS' => $value);
+        }
+
+        foreach ($this->getInvalidIntegerValues() as $value) {
+            $options[][] = array('skip' => $value);
+        }
+
+        return $options;
+    }
+
+    private function getInvalidHintValues()
+    {
+        return array(123, 3.14, true);
+    }
+}