Address code review feedback

Author: alcaeus

tests/FunctionalTestCase.php

@@ -4,12 +4,14 @@
 
 use InvalidArgumentException;
 use MongoDB\BSON\ObjectId;
+use MongoDB\Client;
 use MongoDB\Driver\Command;
 use MongoDB\Driver\Exception\CommandException;
 use MongoDB\Driver\Manager;
 use MongoDB\Driver\Query;
 use MongoDB\Driver\ReadPreference;
 use MongoDB\Driver\Server;
+use MongoDB\Driver\ServerApi;
 use MongoDB\Driver\WriteConcern;
 use MongoDB\Operation\CreateCollection;
 use MongoDB\Operation\DatabaseCommand;
@@ -21,6 +23,7 @@
 use function count;
 use function current;
 use function explode;
+use function getenv;
 use function implode;
 use function is_array;
 use function is_object;
@@ -62,6 +65,16 @@ private function doTearDown()
         parent::tearDown();
     }
 
+    public static function createTestClient(string $uri = null, array $options = [], array $driverOptions = []) : Client
+    {
+        return new Client($uri ?? static::getUri(), $options, static::appendServerApiOption($driverOptions));
+    }
+
+    public static function createTestManager(string $uri = null, array $options = [], array $driverOptions = []) : Manager
+    {
+        return new Manager($uri ?? static::getUri(), $options, static::appendServerApiOption($driverOptions));
+    }
+
     public static function getUri($allowMultipleMongoses = false)
     {
         $uri = parent::getUri();
@@ -267,19 +280,6 @@ protected function getPrimaryServer()
         return $this->manager->selectServer(new ReadPreference(ReadPreference::RP_PRIMARY));
     }
 
-    protected function getServerParameters()
-    {
-        $cursor = $this->manager->executeCommand(
-            'admin',
-            new Command(['getParameter' => '*']),
-            new ReadPreference(ReadPreference::RP_PRIMARY)
-        );
-
-        $cursor->rewind();
-
-        return $cursor->current();
-    }
-
     protected function getServerVersion(ReadPreference $readPreference = null)
     {
         $cursor = $this->manager->executeCommand(
@@ -441,6 +441,15 @@ protected function skipIfTransactionsAreNotSupported()
         }
     }
 
+    private static function appendServerApiOption(array $driverOptions) : array
+    {
+        if (getenv('API_VERSION') && ! isset($driverOptions['serverApi'])) {
+            $driverOptions['serverApi'] = new ServerApi(getenv('API_VERSION'));
+        }
+
+        return $driverOptions;
+    }
+
     /**
      * Disables any fail points that were configured earlier in the test.
      *

tests/TestCase.php

@@ -3,11 +3,8 @@
 namespace MongoDB\Tests;
 
 use InvalidArgumentException;
-use MongoDB\Client;
-use MongoDB\Driver\Manager;
 use MongoDB\Driver\ReadConcern;
 use MongoDB\Driver\ReadPreference;
-use MongoDB\Driver\ServerApi;
 use MongoDB\Driver\WriteConcern;
 use MongoDB\Model\BSONArray;
 use MongoDB\Model\BSONDocument;
@@ -44,16 +41,6 @@ public static function getUri()
         return getenv('MONGODB_URI') ?: 'mongodb://127.0.0.1:27017';
     }
 
-    public static function createTestClient(string $uri = null, array $options = [], array $driverOptions = []) : Client
-    {
-        return new Client($uri ?? static::getUri(), $options, static::appendServerApiOption($driverOptions));
-    }
-
-    public static function createTestManager(string $uri = null, array $options = [], array $driverOptions = []) : Manager
-    {
-        return new Manager($uri ?? static::getUri(), $options, static::appendServerApiOption($driverOptions));
-    }
-
     /**
      * Asserts that a document has expected values for some fields.
      *
@@ -315,15 +302,6 @@ protected function wrapValuesForDataProvider(array $values)
         }, $values);
     }
 
-    private static function appendServerApiOption(array $driverOptions) : array
-    {
-        if (getenv('API_VERSION') && ! isset($driverOptions['serverApi'])) {
-            $driverOptions['serverApi'] = new ServerApi(getenv('API_VERSION'));
-        }
-
-        return $driverOptions;
-    }
-
     /**
      * Normalizes a BSON document or array for use with assertEquals().
      *

tests/UnifiedSpecTests/Context.php

@@ -258,6 +258,7 @@ private function createClient(string $id, stdClass $o)
         $driverOptions = isset($observeEvents) ? ['i' => $i++] : [];
 
         if ($serverApi !== null) {
+            assertIsObject($serverApi);
             $driverOptions['serverApi'] = new ServerApi(
                 $serverApi->version,
                 $serverApi->strict ?? null,

tests/UnifiedSpecTests/UnifiedSpecTest.php

@@ -4,6 +4,7 @@
 
 use Exception;
 use MongoDB\Collection;
+use MongoDB\Driver\Command;
 use MongoDB\Driver\Exception\ServerException;
 use MongoDB\Driver\ReadPreference;
 use MongoDB\Driver\Server;
@@ -347,6 +348,19 @@ private function getCachedTopology()
         return $cachedTopology;
     }
 
+    private function getServerParameters()
+    {
+        $cursor = $this->manager->executeCommand(
+            'admin',
+            new Command(['getParameter' => '*']),
+            new ReadPreference(ReadPreference::RP_PRIMARY)
+        );
+
+        $cursor->rewind();
+
+        return $cursor->current();
+    }
+
     /**
      * Checks is a test format schema version is supported.
      *