Merge pull request #128

doctrine · Sep 2, 2013 · 97b70b4 · 97b70b4
2 parents 6afee47 + d13aab0
commit 97b70b4
Show file tree

Hide file tree

Showing 9 changed files with 1,160 additions and 359 deletions.
diff --git a/lib/Doctrine/MongoDB/Collection.php b/lib/Doctrine/MongoDB/Collection.php
@@ -176,7 +176,7 @@ public function batchInsert(array &$a, array $options = array())
      * @param array   $query
      * @param integer $limit
      * @param integer $skip
-     * @return ArrayIterator
+     * @return integer
      */
     public function count(array $query = array(), $limit = 0, $skip = 0)
     {
@@ -1159,6 +1159,7 @@ protected function doNear($near, array $query, array $options)
         $command = array();
         $command['geoNear'] = $this->getMongoCollection()->getName();
         $command['near'] = $near;
+        $command['spherical'] = isset($near['type']);
         $command['query'] = (object) $query;
         $command = array_merge($command, $options);