PHPC-934: Fixed tests for MongoDB 3.6

Author: derickr

tests/manager/manager-executeCommand_error-002.phpt

@@ -36,5 +36,5 @@ Expected 'readPreference' option to be 'MongoDB\Driver\ReadPreference', object g
 OK: Got MongoDB\Driver\Exception\InvalidArgumentException
 Unknown option 'unknown'
 OK: Got MongoDB\Driver\Exception\InvalidArgumentException
-Unknown option 'writeConcern'
+Expected 'writeConcern' option to be 'MongoDB\Driver\WriteConcern', string given
 ===DONE===

tests/server/server-executeBulkWrite-004.phpt

@@ -10,13 +10,6 @@ require_once __DIR__ . "/../utils/basic.inc";
 $manager = new MongoDB\Driver\Manager(REPLICASET);
 $server = $manager->selectServer(new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_SECONDARY));
 
-$bulk = new MongoDB\Driver\BulkWrite();
-$bulk->insert(array('wc' => 0));
-
-$result = $server->executeBulkWrite(NS, $bulk, new MongoDB\Driver\WriteConcern(0));
-var_dump($result->isAcknowledged());
-var_dump($result->getInsertedCount());
-
 $writeConcerns = array(1, 2, MongoDB\Driver\WriteConcern::MAJORITY);
 
 foreach ($writeConcerns as $wc) {
@@ -32,8 +25,6 @@ foreach ($writeConcerns as $wc) {
 ===DONE===
 <?php exit(0); ?>
 --EXPECT--
-bool(false)
-NULL
 OK: Got MongoDB\Driver\Exception\RuntimeException
 not master
 OK: Got MongoDB\Driver\Exception\RuntimeException

tests/server/server-executeBulkWrite-007.phpt

@@ -10,13 +10,6 @@ require_once __DIR__ . "/../utils/basic.inc";
 $manager = new MongoDB\Driver\Manager(REPLICASET);
 $server = $manager->selectServer(new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_SECONDARY));
 
-$bulk = new MongoDB\Driver\BulkWrite();
-$bulk->insert(['wc' => 0]);
-
-$result = $server->executeBulkWrite(NS, $bulk, new MongoDB\Driver\WriteConcern(0));
-var_dump($result->isAcknowledged());
-var_dump($result->getInsertedCount());
-
 $writeConcerns = [1, 2, MongoDB\Driver\WriteConcern::MAJORITY];
 
 foreach ($writeConcerns as $wc) {
@@ -36,8 +29,6 @@ foreach ($writeConcerns as $wc) {
 ===DONE===
 <?php exit(0); ?>
 --EXPECT--
-bool(false)
-NULL
 OK: Got MongoDB\Driver\Exception\RuntimeException
 not master
 OK: Got MongoDB\Driver\Exception\RuntimeException

tests/server/server-executeCommand-002.phpt

@@ -18,10 +18,11 @@ $result = current($cursor->toArray());
 
 printf("Set profile level to 2 successfully: %s\n", (empty($result->ok) ? 'no' : 'yes'));
 
-$command = new MongoDB\Driver\Command(array(
+$command = new MongoDB\Driver\Command([
     'aggregate' => COLLECTION_NAME,
-    'pipeline' => array(array('$match' => array('x' => 1))),
-));
+    'pipeline' => [ [ '$match' => [ 'x' => 1 ] ] ],
+    'cursor' => (object) [],
+]);
 $secondary->executeCommand(DATABASE_NAME, $command, $rp);
 
 $query = new MongoDB\Driver\Query(
@@ -64,6 +65,9 @@ object(stdClass)#%d (%d) {
       }
     }
   }
+  ["cursor"]=>
+  object(stdClass)#16 (0) {
+  }%A
 }
 Set profile level to 0 successfully: yes
 ===DONE===

tests/server/server-executeCommand-003.phpt

@@ -28,7 +28,7 @@ array(1) {
   [0]=>
   object(stdClass)#%d (%d) {
     ["ok"]=>
-    float(1)
+    float(1)%A
   }
 }
 ===DONE===

tests/server/server-executeCommand_error-001.phpt

@@ -38,5 +38,5 @@ Expected 'readPreference' option to be 'MongoDB\Driver\ReadPreference', object g
 OK: Got MongoDB\Driver\Exception\InvalidArgumentException
 Unknown option 'unknown'
 OK: Got MongoDB\Driver\Exception\InvalidArgumentException
-Unknown option 'writeConcern'
+Expected 'writeConcern' option to be 'MongoDB\Driver\WriteConcern', string given
 ===DONE===

tests/server/server-executeQuery-006.phpt

@@ -37,7 +37,8 @@ $query = new MongoDB\Driver\Query(
 $cursor = $secondary->executeQuery(DATABASE_NAME . '.system.profile', $query, $rp);
 $profileEntry = current($cursor->toArray());
 
-var_dump($profileEntry->query);
+var_dump($profileEntry->command->find);
+var_dump($profileEntry->command->filter);
 
 $command = new MongoDB\Driver\Command(array('profile' => 0));
 $cursor = $secondary->executeCommand(DATABASE_NAME, $command);
@@ -50,14 +51,10 @@ printf("Set profile level to 0 successfully: %s\n", (empty($result->ok) ? 'no' :
 <?php exit(0); ?>
 --EXPECTF--
 Set profile level to 2 successfully: yes
-object(stdClass)#%d (%d) {
-  ["find"]=>
-  string(%d) "%s"
-  ["filter"]=>
-  object(stdClass)#%d (1) {
-    ["x"]=>
-    int(1)
-  }
+string(%d) "%s"
+object(stdClass)#%d (1) {
+  ["x"]=>
+  int(1)
 }
 Set profile level to 0 successfully: yes
 ===DONE===