Prefer writeConcern and readPreference options for execute methods

Author: jmikola

tests/bulk/write-0002.phpt

@@ -21,7 +21,7 @@ $w = 1;
 $wtimeout = 1000;
 $writeConcern = new \MongoDB\Driver\WriteConcern($w, $wtimeout);
 var_dump($insertBulk);
-$result = $manager->executeBulkWrite(NS, $insertBulk, $writeConcern);
+$result = $manager->executeBulkWrite(NS, $insertBulk, ['writeConcern' => $writeConcern]);
 var_dump($insertBulk);
 
 assert($result instanceof \MongoDB\Driver\WriteResult);

tests/server/server-executeBulkWrite-002.phpt

@@ -17,7 +17,7 @@ foreach ($writeConcerns as $writeConcern) {
     $bulk = new MongoDB\Driver\BulkWrite();
     $bulk->insert(array('wc' => $writeConcern));
 
-    $result = $primary->executeBulkWrite(NS, $bulk, new MongoDB\Driver\WriteConcern($writeConcern));
+    $result = $primary->executeBulkWrite(NS, $bulk, ['writeConcern' => new MongoDB\Driver\WriteConcern($writeConcern)]);
     var_dump($result->isAcknowledged());
     var_dump($result->getInsertedCount());
 }

tests/standalone/bug0545.phpt

@@ -57,7 +57,7 @@ $page1->content = 'Lorem ipsum';
 $book->pages[] = $page1;
 $bulk = new MongoDB\Driver\BulkWrite;
 $bulk->insert($book);
-$result = $manager->executeBulkWrite(NS, $bulk, $wc);
+$result = $manager->executeBulkWrite(NS, $bulk, ['writeConcern' => $wc]);
 printf("Inserted %d document(s)\n", $result->getInsertedCount());
 
 // Read
@@ -72,7 +72,7 @@ $page2->content = 'Dolor sit amet';
 $bookAfterInsert->pages[] = $page2;
 $bulk = new MongoDB\Driver\BulkWrite;
 $bulk->update(['title' => $bookAfterInsert->title], $bookAfterInsert);
-$result = $manager->executeBulkWrite(NS, $bulk, $wc);
+$result = $manager->executeBulkWrite(NS, $bulk, ['writeConcern' => $wc]);
 printf("Modified %d document(s)\n", $result->getModifiedCount());
 
 // Read (again)

tests/standalone/manager-as-singleton.phpt

@@ -30,7 +30,7 @@ class Database {
     }
 
     public function query($scheme, $query) {
-        return $this->Database->executeQuery($scheme, $query, new ReadPreference(ReadPreference::PRIMARY));
+        return $this->Database->executeQuery($scheme, $query, ['readPreference' => new ReadPreference(ReadPreference::PRIMARY)]);
     }
 }
 

tests/standalone/writeresult-isacknowledged-003.phpt

@@ -12,7 +12,7 @@ $manager = create_test_manager();
 
 $bulk = new \MongoDB\Driver\BulkWrite;
 $bulk->insert(array('x' => 2));
-$result = $manager->executeBulkWrite(NS, $bulk, new MongoDB\Driver\WriteConcern(0));
+$result = $manager->executeBulkWrite(NS, $bulk, ['writeConcern' => new MongoDB\Driver\WriteConcern(0)]);
 
 printf("WriteResult::isAcknowledged(): %s\n", $result->isAcknowledged() ? 'true' : 'false');
 var_dump($result);

tests/writeResult/writeresult-getdeletedcount-002.phpt

@@ -17,7 +17,7 @@ $bulk->update(['x' => 2], ['$set' => ['y' => 1]], ['upsert' => true]);
 $bulk->update(['x' => 3], ['$set' => ['y' => 2]], ['upsert' => true]);
 $bulk->delete(['x' => 1]);
 
-$result = $manager->executeBulkWrite(NS, $bulk, new MongoDB\Driver\WriteConcern(0));
+$result = $manager->executeBulkWrite(NS, $bulk, ['writeConcern' => new MongoDB\Driver\WriteConcern(0)]);
 
 var_dump($result->getDeletedCount());
 

tests/writeResult/writeresult-getinsertedcount-002.phpt

@@ -17,7 +17,7 @@ $bulk->update(['x' => 2], ['$set' => ['y' => 1]], ['upsert' => true]);
 $bulk->update(['x' => 3], ['$set' => ['y' => 2]], ['upsert' => true]);
 $bulk->delete(['x' => 1]);
 
-$result = $manager->executeBulkWrite(NS, $bulk, new MongoDB\Driver\WriteConcern(0));
+$result = $manager->executeBulkWrite(NS, $bulk, ['writeConcern' => new MongoDB\Driver\WriteConcern(0)]);
 
 var_dump($result->getInsertedCount());
 

tests/writeResult/writeresult-getmatchedcount-002.phpt

@@ -17,7 +17,7 @@ $bulk->update(['x' => 2], ['$set' => ['y' => 1]], ['upsert' => true]);
 $bulk->update(['x' => 3], ['$set' => ['y' => 2]], ['upsert' => true]);
 $bulk->delete(['x' => 1]);
 
-$result = $manager->executeBulkWrite(NS, $bulk, new MongoDB\Driver\WriteConcern(0));
+$result = $manager->executeBulkWrite(NS, $bulk, ['writeConcern' => new MongoDB\Driver\WriteConcern(0)]);
 
 var_dump($result->getMatchedCount());
 

tests/writeResult/writeresult-getmodifiedcount-002.phpt

@@ -17,7 +17,7 @@ $bulk->update(['x' => 2], ['$set' => ['y' => 1]], ['upsert' => true]);
 $bulk->update(['x' => 3], ['$set' => ['y' => 2]], ['upsert' => true]);
 $bulk->delete(['x' => 1]);
 
-$result = $manager->executeBulkWrite(NS, $bulk, new MongoDB\Driver\WriteConcern(0));
+$result = $manager->executeBulkWrite(NS, $bulk, ['writeConcern' => new MongoDB\Driver\WriteConcern(0)]);
 
 var_dump($result->getModifiedCount());
 

tests/writeResult/writeresult-getupsertedcount-002.phpt

@@ -17,7 +17,7 @@ $bulk->update(['x' => 2], ['$set' => ['y' => 1]], ['upsert' => true]);
 $bulk->update(['x' => 3], ['$set' => ['y' => 2]], ['upsert' => true]);
 $bulk->delete(['x' => 1]);
 
-$result = $manager->executeBulkWrite(NS, $bulk, new MongoDB\Driver\WriteConcern(0));
+$result = $manager->executeBulkWrite(NS, $bulk, ['writeConcern' => new MongoDB\Driver\WriteConcern(0)]);
 
 var_dump($result->getUpsertedCount());