Merge pull request #13

Author: jmikola

composer.json

@@ -13,7 +13,8 @@
         "ext-mongodb": ">=0.6.0"
     },
     "autoload": {
-        "psr-4": { "MongoDB\\": "src/" }
+        "psr-4": { "MongoDB\\": "src/" },
+        "files": [ "src/functions.php" ]
     },
     "extra": {
         "branch-alias": {

src/Client.php

@@ -7,9 +7,9 @@
 use MongoDB\Driver\Manager;
 use MongoDB\Driver\ReadPreference;
 use MongoDB\Driver\WriteConcern;
-use MongoDB\Exception\UnexpectedValueException;
 use MongoDB\Model\DatabaseInfoIterator;
-use MongoDB\Model\DatabaseInfoLegacyIterator;
+use MongoDB\Operation\DropDatabase;
+use MongoDB\Operation\ListDatabases;
 
 class Client
 {
@@ -37,45 +37,29 @@ public function __construct($uri, array $options = array(), array $driverOptions
     /**
      * Drop a database.
      *
-     * @see http://docs.mongodb.org/manual/reference/command/dropDatabase/
      * @param string $databaseName
-     * @return Cursor
+     * @return object Command result document
      */
     public function dropDatabase($databaseName)
     {
-        $databaseName = (string) $databaseName;
-        $command = new Command(array('dropDatabase' => 1));
-        $readPreference = new ReadPreference(ReadPreference::RP_PRIMARY);
+        $operation = new DropDatabase($databaseName);
+        $server = $this->manager->selectServer(new ReadPreference(ReadPreference::RP_PRIMARY));
 
-        return $this->manager->executeCommand($databaseName, $command, $readPreference);
+        return $operation->execute($server);
     }
 
     /**
      * List databases.
      *
-     * @see http://docs.mongodb.org/manual/reference/command/listDatabases/
+     * @see ListDatabases::__construct() for supported options
      * @return DatabaseInfoIterator
-     * @throws UnexpectedValueException if the command result is malformed
      */
-    public function listDatabases()
+    public function listDatabases(array $options = array())
     {
-        $command = new Command(array('listDatabases' => 1));
+        $operation = new ListDatabases($options);
+        $server = $this->manager->selectServer(new ReadPreference(ReadPreference::RP_PRIMARY));
 
-        $cursor = $this->manager->executeCommand('admin', $command);
-        $cursor->setTypeMap(array('document' => 'array'));
-        $result = current($cursor->toArray());
-
-        if ( ! isset($result['databases']) || ! is_array($result['databases'])) {
-            throw new UnexpectedValueException('listDatabases command did not return a "databases" array');
-        }
-
-        /* Return an Iterator instead of an array in case listDatabases is
-         * eventually changed to return a command cursor, like the collection
-         * and index enumeration commands. This makes the "totalSize" command
-         * field inaccessible, but users can manually invoke the command if they
-         * need that value.
-         */
-        return new DatabaseInfoLegacyIterator($result['databases']);
+        return $operation->execute($server);
     }
 
     /**