Apply review

Author: GromNaN

tests/Collection/FunctionalTestCase.php

@@ -17,8 +17,6 @@ public function setUp(): void
     {
         parent::setUp();
 
-        $this->collection = new Collection($this->manager, $this->getDatabaseName(), $this->getCollectionName());
-
-        $this->dropCollection($this->getDatabaseName(), $this->getCollectionName());
+        $this->collection = $this->dropCollection($this->getDatabaseName(), $this->getCollectionName());
     }
 }

tests/DocumentationExamplesTest.php

@@ -11,7 +11,6 @@
 use MongoDB\Driver\Exception\CommandException;
 use MongoDB\Driver\Exception\Exception;
 use MongoDB\Driver\ReadPreference;
-use MongoDB\Driver\WriteConcern;
 use MongoDB\Tests\SpecTests\ClientSideEncryptionSpecTest;
 
 use function base64_decode;
@@ -1570,19 +1569,13 @@ public function testSnapshotQueries(): void
             $this->markTestSkipped('Snapshot read concern is only supported with replicasets');
         }
 
-        $this->dropCollection('pets', 'cats');
-        $this->dropCollection('pets', 'dogs');
-        $this->dropCollection('retail', 'sales');
-
-        $client = static::createTestClient();
-
-        $catsCollection = $client->selectCollection('pets', 'cats');
+        $catsCollection = $this->dropCollection('pets', 'cats');
         $catsCollection->insertMany([
             ['name' => 'Whiskers', 'color' => 'white', 'adoptable' => true],
             ['name' => 'Garfield', 'color' => 'orange', 'adoptable' => false],
         ]);
 
-        $dogsCollection = $client->selectCollection('pets', 'dogs');
+        $dogsCollection = $this->dropCollection('pets', 'dogs');
         $dogsCollection->insertMany([
             ['name' => 'Toto', 'color' => 'black',  'adoptable' => true],
             ['name' => 'Milo', 'color' => 'black', 'adoptable' => false],
@@ -1597,6 +1590,8 @@ public function testSnapshotQueries(): void
             $this->waitForSnapshot('pets', 'dogs');
         }
 
+        $client = static::createTestClient();
+
         ob_start();
 
         // Start Snapshot Query Example 1
@@ -1628,10 +1623,7 @@ public function testSnapshotQueries(): void
 
         $this->assertSame(3, $adoptablePetsCount);
 
-        $catsCollection->drop();
-        $dogsCollection->drop();
-
-        $salesCollection = $client->selectCollection('retail', 'sales');
+        $salesCollection = $this->dropCollection('retail', 'sales');
         $salesCollection->insertMany([
             ['shoeType' => 'boot', 'price' => 30, 'saleDate' => new UTCDateTime()],
         ]);
@@ -1670,8 +1662,6 @@ public function testSnapshotQueries(): void
         // End Snapshot Query Example 2
 
         $this->assertSame(1, $totalDailySales);
-
-        $salesCollection->drop();
     }
 
     /** @doesNotPerformAssertions */

tests/FunctionalTestCase.php

@@ -20,6 +20,7 @@
 use stdClass;
 use UnexpectedValueException;
 
+use function array_intersect_key;
 use function call_user_func;
 use function count;
 use function current;
@@ -266,14 +267,19 @@ public static function getModuleInfo(string $row): ?string
      * A majority write concern is applied by default to ensure that the
      * transaction can acquire the required locks.
      * See: https://www.mongodb.com/docs/manual/core/transactions/#transactions-and-operations
+     *
+     * @param array $options CreateCollection options
      */
     protected function createCollection(string $databaseName, string $collectionName, array $options = []): Collection
     {
+        // @see https://jira.mongodb.org/browse/PHPLIB-1145
         if (isset($options['encryptedFields'])) {
             throw new InvalidArgumentException('The "encryptedFields" option is not supported by createCollection(). Time to refactor!');
         }
 
-        $collection = $this->dropCollection($databaseName, $collectionName, $options);
+        // Pass only relevant options to drop the collection in case it already exists
+        $dropOptions = array_intersect_key($options, ['writeConcern' => 1, 'encryptedFields' => 1]);
+        $collection = $this->dropCollection($databaseName, $collectionName, $dropOptions);
 
         $options += ['writeConcern' => new WriteConcern(WriteConcern::MAJORITY)];
         $operation = new CreateCollection($databaseName, $collectionName, $options);
@@ -288,10 +294,12 @@ protected function createCollection(string $databaseName, string $collectionName
      * A majority write concern is applied by default to ensure that the
      * transaction can acquire the required locks.
      * See: https://www.mongodb.com/docs/manual/core/transactions/#transactions-and-operations
+     *
+     * @param array $options Collection::dropCollection() options
      */
     protected function dropCollection(string $databaseName, string $collectionName, array $options = []): Collection
     {
-        $collection = new Collection($this->manager, $databaseName, $collectionName, $options);
+        $collection = new Collection($this->manager, $databaseName, $collectionName);
         $this->collectionsToCleanup[] = [$collection, $options];
 
         $options += ['writeConcern' => new WriteConcern(WriteConcern::MAJORITY)];

tests/Model/IndexInfoFunctionalTest.php

@@ -14,8 +14,7 @@ public function setUp(): void
     {
         parent::setUp();
 
-        $this->dropCollection($this->getDatabaseName(), $this->getCollectionName());
-        $this->collection = new Collection($this->manager, $this->getDatabaseName(), $this->getCollectionName());
+        $this->collection = $this->dropCollection($this->getDatabaseName(), $this->getCollectionName());
     }
 
     public function testIs2dSphere(): void