Keep options to drop encrypted collection on tearDown

Author: GromNaN

tests/DocumentationExamplesTest.php

@@ -1853,19 +1853,18 @@ public function testQueryableEncryption(): void
             $this->markTestSkipped('Automatic encryption requires MongoDB Enterprise');
         }
 
-        // Ensure the collection is dropped by tearDown()
-        $this->dropCollection($this->getDatabaseName(), $this->getCollectionName());
-
         // Fetch names for the database and collection under test
         $collectionName = $this->getCollectionName();
         $databaseName = $this->getDatabaseName();
         $namespace = $this->getNamespace();
 
-        /* Create a client without auto encryption. Drop existing data in both the keyvault and database under test.
-         * The latter is necessary to clean up any internal collections for queryable encryption. */
+        /* Create a client without auto encryption. Drop existing data in both the
+         * keyvault and the collection under test, the "encryptedFields" option
+         * is necessary to clean up any internal collections for queryable
+         * encryption, assuming they use their default names */
         $client = static::createTestClient();
-        $client->selectDatabase('keyvault')->drop(['writeConcern' => new WriteConcern(WriteConcern::MAJORITY)]);
-        $client->selectDatabase($databaseName)->drop(['writeConcern' => new WriteConcern(WriteConcern::MAJORITY)]);
+        $this->dropCollection('keyvault', 'datakeys');
+        $this->dropCollection($databaseName, $collectionName, ['encryptedFields' => []]);
 
         /* Although ClientEncryption can be constructed directly, the library
          * provides a helper to do so. With this method, the keyVaultClient will

tests/FunctionalTestCase.php

@@ -54,7 +54,7 @@ abstract class FunctionalTestCase extends TestCase
     /** @var array */
     private $configuredFailPoints = [];
 
-    /** @var Collection[] */
+    /** @var array{int,{Collection,array}} */
     private $collectionsToCleanup = [];
 
     public function setUp(): void
@@ -271,6 +271,10 @@ protected function createCollection(string $databaseName, string $collectionName
     {
         $collection = $this->dropCollection($databaseName, $collectionName, $options);
 
+        if (isset($options['encryptedFields'])) {
+            throw new InvalidArgumentException('The "encryptedFields" option is not supported by createCollection(). Time to refactor!');
+        }
+
         $operation = new CreateCollection($databaseName, $collectionName, $options);
         $operation->execute($this->getPrimaryServer());
 
@@ -288,16 +292,17 @@ protected function dropCollection(string $databaseName, string $collectionName,
     {
         $options += ['writeConcern' => new WriteConcern(WriteConcern::MAJORITY)];
         $collection = new Collection($this->manager, $databaseName, $collectionName, $options);
-        $this->collectionsToCleanup[] = $collection;
         $collection->drop();
 
+        $this->collectionsToCleanup[] = [$collection, $options];
+
         return $collection;
     }
 
     private function cleanupCollections(): void
     {
-        foreach ($this->collectionsToCleanup as $collection) {
-            $collection->drop();
+        foreach ($this->collectionsToCleanup as [$collection, $options]) {
+            $collection->drop($options);
         }
 
         $this->collectionsToCleanup = [];