Add exceptions to MongoCursor

Author: Olivier Lechevalier

lib/Mongo/MongoCursor.php

@@ -14,6 +14,7 @@
  */
 
 use Alcaeus\MongoDbAdapter\AbstractCursor;
+use Alcaeus\MongoDbAdapter\ExceptionConverter;
 use MongoDB\Driver\Cursor;
 use MongoDB\Driver\ReadPreference;
 use MongoDB\Operation\Find;
@@ -139,8 +140,12 @@ public function count($foundOnly = false)
         }
 
         $options = $this->getOptions($optionNames) + $this->options;
+        try {
+            $count = $this->collection->count($this->query, $options);
+        } catch (\MongoDB\Driver\Exception\Exception $e) {
+            ExceptionConverter::toLegacy($e);
+        }
 
-        $count = $this->collection->count($this->query, $options);
         return $count;
     }
 
@@ -154,7 +159,12 @@ protected function doQuery()
     {
         $options = $this->getOptions() + $this->options;
 
-        $this->cursor = $this->collection->find($this->query, $options);
+        try {
+            $this->cursor = $this->collection->find($this->query, $options);
+        } catch (\MongoDB\Driver\Exception\Exception $e) {
+            ExceptionConverter::toLegacy($e);
+        }
+
     }
 
     /**

tests/Alcaeus/MongoDbAdapter/MongoCursorTest.php

@@ -38,6 +38,16 @@ public function testCount()
         $this->assertSame(1, $cursor->count(true));
     }
 
+    public function testCountCannotConnect()
+    {
+        $client = $this->getClient([], 'mongodb://localhost:28888');
+        $cursor = $client->selectCollection('mongo-php-adapter', 'test')->find();
+
+        $this->setExpectedException('MongoConnectionException');
+
+        $cursor->count();
+    }
+
     /**
      * @dataProvider getCursorOptions
      */