Extra DropCollection operation class

src/Collection.php

@@ -18,6 +18,7 @@ use MongoDB\Operation\Aggregate;
 use MongoDB\Operation\CreateIndexes;
 use MongoDB\Operation\Count;
 use MongoDB\Operation\Distinct;
+use MongoDB\Operation\DropCollection;
 use MongoDB\Operation\FindOneAndDelete;
 use MongoDB\Operation\FindOneAndReplace;
 use MongoDB\Operation\FindOneAndUpdate;
@@ -352,15 +353,14 @@ class Collection
     /**
      * Drop this collection.
      *
-     * @see http://docs.mongodb.org/manual/reference/command/drop/
-     * @return Cursor
+     * @return object Command result document
      */
     public function drop()
     {
-        $command = new Command(array('drop' => $this->collname));
-        $readPreference = new ReadPreference(ReadPreference::RP_PRIMARY);
+        $operation = new DropCollection($this->dbname, $this->collname);
+        $server = $this->manager->selectServer(new ReadPreference(ReadPreference::RP_PRIMARY));
 
-        return $this->manager->executeCommand($this->dbname, $command, $readPreference);
+        return $operation->execute($server);
     }
 
     /**

src/Database.php

@@ -12,6 +12,7 @@ use MongoDB\Driver\Server;
 use MongoDB\Driver\WriteConcern;
 use MongoDB\Exception\InvalidArgumentException;
 use MongoDB\Model\CollectionInfoIterator;
+use MongoDB\Operation\DropCollection;
 use MongoDB\Operation\DropDatabase;
 use MongoDB\Operation\ListCollections;
 
@@ -85,17 +86,15 @@ class Database
     /**
      * Drop a collection within this database.
      *
-     * @see http://docs.mongodb.org/manual/reference/command/drop/
      * @param string $collectionName
-     * @return Cursor
+     * @return object Command result document
      */
     public function dropCollection($collectionName)
     {
-        $collectionName = (string) $collectionName;
-        $command = new Command(array('drop' => $collectionName));
-        $readPreference = new ReadPreference(ReadPreference::RP_PRIMARY);
+        $operation = new DropCollection($this->databaseName, $collectionName);
+        $server = $this->manager->selectServer(new ReadPreference(ReadPreference::RP_PRIMARY));
 
-        return $this->manager->executeCommand($this->databaseName, $command, $readPreference);
+        return $operation->execute($server);
     }
 
     /**

src/Operation/DropCollection.php

+<?php
+
+namespace MongoDB\Operation;
+
+use MongoDB\Driver\Command;
+use MongoDB\Driver\Server;
+use MongoDB\Exception\RuntimeException;
+
+/**
+ * Operation for the drop command.
+ *
+ * @api
+ * @see MongoDB\Collection::drop()
+ * @see MongoDB\Database::dropCollection()
+ * @see http://docs.mongodb.org/manual/reference/command/drop/
+ */
+class DropCollection implements Executable
+{
+    private $databaseName;
+    private $collectionName;
+
+    /**
+     * Constructs a drop command.
+     *
+     * @param string $databaseName   Database name
+     * @param string $collectionName Collection name
+     */
+    public function __construct($databaseName, $collectionName)
+    {
+        $this->databaseName = (string) $databaseName;
+        $this->collectionName = (string) $collectionName;
+    }
+
+    /**
+     * Execute the operation.
+     *
+     * @see Executable::execute()
+     * @param Server $server
+     * @return object Command result document
+     */
+    public function execute(Server $server)
+    {
+        $cursor = $server->executeCommand($this->databaseName, new Command(array('drop' => $this->collectionName)));
+        $result = current($cursor->toArray());
+
+        if (empty($result['ok'])) {
+            throw new RuntimeException(isset($result['errmsg']) ? $result['errmsg'] : 'Unknown error');
+        }
+
+        return $result;
+    }
+}