PHPLIB-761: Disable client persistence when creating clients in test runners (mongodb#905)

Replacing old random ids for new clients with special flag "disableClientPersistence" to maintain tests same behavior.

Author: aleksandr-rudo

tests/SpecTests/Context.php

@@ -15,7 +15,6 @@
 use function array_keys;
 use function getenv;
 use function implode;
-use function mt_rand;
 use function uniqid;
 
 /**
@@ -239,12 +238,10 @@ public static function fromTransactions(stdClass $test, $databaseName, $collecti
 
         $clientOptions = isset($test->clientOptions) ? (array) $test->clientOptions : [];
 
-        /* Transaction spec tests expect a new client for each test so that
-         * txnNumber values are deterministic. Append a random option to avoid
-         * re-using a previously persisted libmongoc client object. */
-        $clientOptions += ['p' => mt_rand()];
+        // Transaction spec tests expect a new client for each test so that txnNumber values are deterministic.
+        $driverOptions = ['disableClientPersistence' => true];
 
-        $o->client = FunctionalTestCase::createTestClient(FunctionalTestCase::getUri($useMultipleMongoses), $clientOptions);
+        $o->client = FunctionalTestCase::createTestClient(FunctionalTestCase::getUri($useMultipleMongoses), $clientOptions, $driverOptions);
 
         $session0Options = isset($test->sessionOptions->session0) ? (array) $test->sessionOptions->session0 : [];
         $session1Options = isset($test->sessionOptions->session1) ? (array) $test->sessionOptions->session1 : [];

tests/UnifiedSpecTests/Context.php

@@ -294,10 +294,8 @@ private function createClient(string $id, stdClass $o): void
             }
         }
 
-        /* TODO: Remove this once PHPC-1645 is implemented. Each client needs
-         * its own libmongoc client to facilitate txnNumber assertions. */
-        static $i = 0;
-        $driverOptions = isset($observeEvents) ? ['i' => $i++] : [];
+        // Transaction tests expect a new client for each test so that txnNumber values are deterministic.
+        $driverOptions = isset($observeEvents) ? ['disableClientPersistence' => true] : [];
 
         if ($serverApi !== null) {
             assertIsObject($serverApi);