Merge pull request #979 from jmikola/tools-cleanup

Make use of use statements

Author: jmikola

tests/utils/tools.php

@@ -1,9 +1,14 @@
 <?php
 
+use MongoDB\Driver\BulkWrite;
 use MongoDB\Driver\Command;
 use MongoDB\Driver\Manager;
 use MongoDB\Driver\ReadPreference;
 use MongoDB\Driver\Server;
+use MongoDB\Driver\WriteConcern;
+use MongoDB\Driver\WriteConcernError;
+use MongoDB\Driver\WriteError;
+use MongoDB\Driver\WriteResult;
 use MongoDB\Driver\Exception\ConnectionException;
 use MongoDB\Driver\Exception\RuntimeException;
 
@@ -53,7 +58,7 @@ function drop_collection($uri, $databaseName, $collectionName)
         $server->executeCommand(
             $databaseName,
             $command,
-            [ 'writeConcern' => new \MongoDB\Driver\WriteConcern( \MongoDB\Driver\WriteConcern::MAJORITY ) ]
+            ['writeConcern' => new WriteConcern(WriteConcern::MAJORITY)]
         );
     } catch (RuntimeException $e) {
         if ($e->getMessage() !== 'ns not found') {
@@ -162,11 +167,11 @@ function get_server_storage_engine($uri)
 /**
  * Helper to return the version of a specific server.
  *
- * @param MongoDB\Driver\Server $server
+ * @param Server $server
  * @return string
  * @throws RuntimeException
  */
-function get_server_version_from_server(MongoDB\Driver\Server $server)
+function get_server_version_from_server(Server $server)
 {
     $command = new Command(['buildInfo' => 1]);
     $cursor = $server->executeCommand('admin', $command);
@@ -432,15 +437,15 @@ function SLOW() {
     }
 }
 
-function loadFixtures(\MongoDB\Driver\Manager $manager, $dbname = DATABASE_NAME, $collname = COLLECTION_NAME, $filename = null)
+function loadFixtures(Manager $manager, $dbname = DATABASE_NAME, $collname = COLLECTION_NAME, $filename = null)
 {
     if (!$filename) {
         $filename = "compress.zlib://" . __DIR__ . "/" . "PHONGO-FIXTURES.json.gz";
     }
 
-    $bulk = new MongoDB\Driver\BulkWrite(['ordered' => false]);
+    $bulk = new BulkWrite(['ordered' => false]);
 
-    $server = $manager->selectServer(new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_PRIMARY));
+    $server = $manager->selectServer(new ReadPreference(ReadPreference::RP_PRIMARY));
 
     $data = file_get_contents($filename);
     $array = json_decode($data);
@@ -573,12 +578,13 @@ function throws($function, $exceptionname, $infunction = null) {
     }
     echo "FAILED: Expected $exceptionname thrown, but no exception thrown!\n";
 }
-function printServer(MongoDB\Driver\Server $server)
+
+function printServer(Server $server)
 {
     printf("server: %s:%d\n", $server->getHost(), $server->getPort());
 }
 
-function printWriteResult(MongoDB\Driver\WriteResult $result, $details = true)
+function printWriteResult(WriteResult $result, $details = true)
 {
     printServer($result->getServer());
 
@@ -601,7 +607,7 @@ function printWriteResult(MongoDB\Driver\WriteResult $result, $details = true)
     }
 }
 
-function printWriteConcernError(MongoDB\Driver\WriteConcernError $error = null, $details)
+function printWriteConcernError(WriteConcernError $error = null, $details)
 {
     if ($error) {
         /* This stuff is generated by the server, no need for us to test it */
@@ -617,7 +623,7 @@ function printWriteConcernError(MongoDB\Driver\WriteConcernError $error = null,
     }
 }
 
-function printWriteError(MongoDB\Driver\WriteError $error)
+function printWriteError(WriteError $error)
 {
     var_dump($error);
     printf("writeError[%d].message: %s\n", $error->getIndex(), $error->getMessage());
@@ -646,7 +652,7 @@ function def($arr) {
     }
 }
 
-function configureFailPoint(MongoDB\Driver\Manager $manager, $failPoint, $mode, array $data = [])
+function configureFailPoint(Manager $manager, $failPoint, $mode, array $data = [])
 {
     $doc = array(
         'configureFailPoint' => $failPoint,
@@ -656,11 +662,11 @@ function configureFailPoint(MongoDB\Driver\Manager $manager, $failPoint, $mode,
         $doc['data'] = $data;
     }
 
-    $cmd = new MongoDB\Driver\Command($doc);
+    $cmd = new Command($doc);
     $manager->executeCommand('admin', $cmd);
 }
 
-function failMaxTimeMS(MongoDB\Driver\Manager $manager)
+function failMaxTimeMS(Manager $manager)
 {
     configureFailPoint($manager, 'maxTimeAlwaysTimeOut', [ 'times' => 1 ]);
 }
@@ -694,7 +700,7 @@ function fromJSON($var) {
 
 /* Note: this fail point may terminate the mongod process, so you may want to
  * use this in conjunction with a throwaway server. */
-function failGetMore(MongoDB\Driver\Manager $manager)
+function failGetMore(Manager $manager)
 {
     /* We need to do version detection here */
     $primary = $manager->selectServer(new ReadPreference('primary'));