Merge pull request #470

Author: kvwalker

src/Operation/MapReduce.php

@@ -121,7 +121,7 @@ class MapReduce implements Executable
      *    applied to the returned Cursor (it is not sent to the server).
      *
      *  * verbose (boolean): Specifies whether to include the timing information
-     *    in the result information. The default is true.
+     *    in the result information.
      *
      *  * writeConcern (MongoDB\Driver\WriteConcern): Write concern. This only
      *    applies when results are output to a collection.
@@ -143,10 +143,6 @@ public function __construct($databaseName, $collectionName, JavascriptInterface
             throw InvalidArgumentException::invalidType('$out', $out, 'string or array or object');
         }
 
-        $options += [
-            'verbose' => true,
-        ];
-
         if (isset($options['bypassDocumentValidation']) && ! is_bool($options['bypassDocumentValidation'])) {
             throw InvalidArgumentException::invalidType('"bypassDocumentValidation" option', $options['bypassDocumentValidation'], 'boolean');
         }

tests/Collection/CollectionFunctionalTest.php

@@ -201,7 +201,6 @@ public function testMapReduce()
 
         $this->assertGreaterThanOrEqual(0, $result->getExecutionTimeMS());
         $this->assertNotEmpty($result->getCounts());
-        $this->assertNotEmpty($result->getTiming());
     }
 
     /**

tests/Operation/MapReduceFunctionalTest.php

@@ -90,6 +90,22 @@ public function testResult()
         $operation = new MapReduce($this->getDatabaseName(), $this->getCollectionName(), $map, $reduce, $out);
         $result = $operation->execute($this->getPrimaryServer());
 
+        $this->assertInstanceOf('MongoDB\MapReduceResult', $result);
+        $this->assertGreaterThanOrEqual(0, $result->getExecutionTimeMS());
+        $this->assertNotEmpty($result->getCounts());
+    }
+
+    public function testResultIncludesTimingWithVerboseOption()
+    {
+        $this->createFixtures(3);
+
+        $map = new Javascript('function() { emit(this.x, this.y); }');
+        $reduce = new Javascript('function(key, values) { return Array.sum(values); }');
+        $out = ['inline' => 1];
+
+        $operation = new MapReduce($this->getDatabaseName(), $this->getCollectionName(), $map, $reduce, $out, ['verbose' => true]);
+        $result = $operation->execute($this->getPrimaryServer());
+
         $this->assertInstanceOf('MongoDB\MapReduceResult', $result);
         $this->assertGreaterThanOrEqual(0, $result->getExecutionTimeMS());
         $this->assertNotEmpty($result->getCounts());