PHPLIB-107: Do not throw when dropping nonexistent collection

src/Operation/DropCollection.php

@@ -4,6 +4,7 @@
 
 use MongoDB\Driver\Command;
 use MongoDB\Driver\Server;
+use MongoDB\Driver\Exception\RuntimeException as DriverRuntimeException;
 use MongoDB\Exception\RuntimeException;
 
 /**
@@ -40,7 +41,16 @@ public function __construct($databaseName, $collectionName)
      */
     public function execute(Server $server)
     {
-        $cursor = $server->executeCommand($this->databaseName, new Command(array('drop' => $this->collectionName)));
+        try {
+            $cursor = $server->executeCommand($this->databaseName, new Command(array('drop' => $this->collectionName)));
+        } catch (DriverRuntimeException $e) {
+            if ($e->getMessage() === 'ns not found') {
+                $result = (object) ['ok' => 0, 'errmsg' => 'ns not found'];
+            }
+
+            throw $e;
+        }
+
         $result = current($cursor->toArray());
 
         if (empty($result->ok)) {

tests/ClientFunctionalTest.php

@@ -59,6 +59,7 @@ public function testListDatabases()
      * the given name is found, it will be passed to the callback, which may
      * perform additional assertions.
      *
+     * @param string $databaseName
      * @param callable $callback
      */
     private function assertDatabaseExists($databaseName, $callback = null)
@@ -78,7 +79,7 @@ private function assertDatabaseExists($databaseName, $callback = null)
             }
         }
 
-        $this->assertNotNull($foundDatabase, sprintf('Found %s database on the server', $databaseName));
+        $this->assertNotNull($foundDatabase, sprintf('Database %s does not exist on the server', $databaseName));
 
         if ($callback !== null) {
             call_user_func($callback, $foundDatabase);

tests/Operation/DropCollectionFunctionalTest.php

@@ -0,0 +1,60 @@
+<?php
+
+namespace MongoDB\Tests\Operation;
+
+use MongoDB\Driver\Server;
+use MongoDB\Operation\DropCollection;
+use MongoDB\Operation\ListCollections;
+
+class DropCollectionFunctionalTest extends FunctionalTestCase
+{
+    public function testDropExistingCollection()
+    {
+        $writeResult = $this->manager->executeInsert($this->getNamespace(), array('x' => 1));
+        $this->assertEquals(1, $writeResult->getInsertedCount());
+
+        $server = $this->getPrimaryServer();
+        $operation = new DropCollection($this->getDatabaseName(), $this->getCollectionName());
+        $operation->execute($server);
+
+        $this->assertCollectionDoesNotExist($server, $this->getDatabaseName(), $this->getCollectionName());
+    }
+
+    /**
+     * @depends testDropExistingCollection
+     */
+    public function testDropNonexistentCollection()
+    {
+        $server = $this->getPrimaryServer();
+
+        $this->assertCollectionDoesNotExist($server, $this->getDatabaseName(), $this->getCollectionName());
+
+        $operation = new DropCollection($this->getDatabaseName(), $this->getCollectionName());
+        $operation->execute($server);
+    }
+
+    /**
+     * Asserts that a collection with the given name does not exist on the
+     * server.
+     *
+     * @param Server $server
+     * @param string $databaseName
+     * @param string $collectionName
+     */
+    private function assertCollectionDoesNotExist(Server $server, $databaseName, $collectionName)
+    {
+        $operation = new ListCollections($databaseName);
+        $collections = $operation->execute($server);
+
+        $foundCollection = null;
+
+        foreach ($collections as $collection) {
+            if ($collection->getName() === $collectionName) {
+                $foundCollection = $collection;
+                break;
+            }
+        }
+
+        $this->assertNull($foundCollection, sprintf('Collection %s exists on the server', $collectionName));
+    }
+}

tests/Operation/DropDatabaseFunctionalTest.php

@@ -0,0 +1,58 @@
+<?php
+
+namespace MongoDB\Tests\Operation;
+
+use MongoDB\Driver\Server;
+use MongoDB\Operation\DropDatabase;
+use MongoDB\Operation\ListDatabases;
+
+class DropDatabaseFunctionalTest extends FunctionalTestCase
+{
+    public function testDropExistingDatabase()
+    {
+        $writeResult = $this->manager->executeInsert($this->getNamespace(), array('x' => 1));
+        $this->assertEquals(1, $writeResult->getInsertedCount());
+
+        $server = $this->getPrimaryServer();
+        $operation = new DropDatabase($this->getDatabaseName());
+        $operation->execute($server);
+
+        $this->assertDatabaseDoesNotExist($server, $this->getDatabaseName());
+    }
+
+    /**
+     * @depends testDropExistingDatabase
+     */
+    public function testDropNonexistentDatabase()
+    {
+        $server = $this->getPrimaryServer();
+
+        $this->assertDatabaseDoesNotExist($server, $this->getDatabaseName());
+
+        $operation = new DropDatabase($this->getDatabaseName());
+        $operation->execute($server);
+    }
+
+    /**
+     * Asserts that a database with the given name does not exist on the server.
+     *
+     * @param Server $server
+     * @param string $databaseName
+     */
+    private function assertDatabaseDoesNotExist(Server $server, $databaseName)
+    {
+        $operation = new ListDatabases();
+        $databases = $operation->execute($server);
+
+        $foundDatabase = null;
+
+        foreach ($databases as $database) {
+            if ($database->getName() === $databaseName) {
+                $foundDatabase = $database;
+                break;
+            }
+        }
+
+        $this->assertNull($foundDatabase, sprintf('Database %s exists on the server', $databaseName));
+    }
+}

tests/Operation/FunctionalTestCase.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace MongoDB\Tests\Operation;
+
+use MongoDB\Driver\ReadPreference;
+use MongoDB\Tests\FunctionalTestCase as BaseFunctionalTestCase;
+
+/**
+ * Base class for Operation functional tests.
+ */
+abstract class FunctionalTestCase extends BaseFunctionalTestCase
+{
+    public function getPrimaryServer()
+    {
+        return $this->manager->selectServer(new ReadPreference(ReadPreference::RP_PRIMARY));
+    }
+}