From bc8208aa0a9b3cb5d909e67746b07a83cd3f7e8d Mon Sep 17 00:00:00 2001 From: Jeremy Mikola Date: Tue, 28 Jan 2025 16:28:22 -0500 Subject: [PATCH 1/3] PHPC-2489: Deprecate passing WriteConcern and ReadPreference objects to execute methods --- src/phongo_util.c | 2 ++ .../manager/manager-executeBulkWrite-015.phpt | 23 ++++++++++++++++++ tests/manager/manager-executeCommand-003.phpt | 4 ++++ tests/manager/manager-executeQuery-004.phpt | 4 ++++ tests/server/server-executeBulkWrite-010.phpt | 24 +++++++++++++++++++ tests/server/server-executeCommand-005.phpt | 4 ++++ tests/server/server-executeQuery-010.phpt | 4 ++++ 7 files changed, 65 insertions(+) create mode 100644 tests/manager/manager-executeBulkWrite-015.phpt create mode 100644 tests/server/server-executeBulkWrite-010.phpt diff --git a/src/phongo_util.c b/src/phongo_util.c index 3088c15bf..3c3c639fd 100644 --- a/src/phongo_util.c +++ b/src/phongo_util.c @@ -92,6 +92,8 @@ zval* php_phongo_prep_legacy_option(zval* options, const char* key, bool* alloca Z_ADDREF_P(options); *allocated = true; + php_error_docref(NULL, E_DEPRECATED, "Passing the \"%s\" option directly is deprecated and will be removed in ext-mongodb 2.0", key); + return new_options; } diff --git a/tests/manager/manager-executeBulkWrite-015.phpt b/tests/manager/manager-executeBulkWrite-015.phpt new file mode 100644 index 000000000..4f6754820 --- /dev/null +++ b/tests/manager/manager-executeBulkWrite-015.phpt @@ -0,0 +1,23 @@ +--TEST-- +MongoDB\Driver\Manager::executeBulkWrite() explicit WriteConcern argument is deprecated +--SKIPIF-- + + + +--FILE-- +insert(['_id' => 1]); +$manager->executeBulkWrite(NS, $bulk, new MongoDB\Driver\WriteConcern(0)); + +?> +===DONE=== + +--EXPECTF-- +Deprecated: MongoDB\Driver\Manager::executeBulkWrite(): Passing the "writeConcern" option directly is deprecated and will be removed in ext-mongodb 2.0%s +===DONE=== diff --git a/tests/manager/manager-executeCommand-003.phpt b/tests/manager/manager-executeCommand-003.phpt index 289d564af..788a4896b 100644 --- a/tests/manager/manager-executeCommand-003.phpt +++ b/tests/manager/manager-executeCommand-003.phpt @@ -32,10 +32,14 @@ echo "is_secondary: ", $cursor->getServer()->isSecondary() ? 'true' : 'false', " --EXPECTF-- Testing primary: + +Deprecated: MongoDB\Driver\Manager::executeCommand(): Passing the "readPreference" option directly is deprecated and will be removed in ext-mongodb 2.0%s is_primary: true is_secondary: false Testing secondary: + +Deprecated: MongoDB\Driver\Manager::executeCommand(): Passing the "readPreference" option directly is deprecated and will be removed in ext-mongodb 2.0%s is_primary: false is_secondary: true diff --git a/tests/manager/manager-executeQuery-004.phpt b/tests/manager/manager-executeQuery-004.phpt index 80e8a243d..362a9fc85 100644 --- a/tests/manager/manager-executeQuery-004.phpt +++ b/tests/manager/manager-executeQuery-004.phpt @@ -37,10 +37,14 @@ echo "is_secondary: ", $cursor->getServer()->isSecondary() ? 'true' : 'false', " --EXPECTF-- Testing primary: + +Deprecated: MongoDB\Driver\Manager::executeQuery(): Passing the "readPreference" option directly is deprecated and will be removed in ext-mongodb 2.0%s is_primary: true is_secondary: false Testing secondary: + +Deprecated: MongoDB\Driver\Manager::executeQuery(): Passing the "readPreference" option directly is deprecated and will be removed in ext-mongodb 2.0%s is_primary: false is_secondary: true diff --git a/tests/server/server-executeBulkWrite-010.phpt b/tests/server/server-executeBulkWrite-010.phpt new file mode 100644 index 000000000..16af463c4 --- /dev/null +++ b/tests/server/server-executeBulkWrite-010.phpt @@ -0,0 +1,24 @@ +--TEST-- +MongoDB\Driver\Server::executeBulkWrite() explicit WriteConcern argument is deprecated +--SKIPIF-- + + + +--FILE-- +selectServer(); + +$bulk = new MongoDB\Driver\BulkWrite(); +$bulk->insert(['_id' => 1]); +$server->executeBulkWrite(NS, $bulk, new MongoDB\Driver\WriteConcern(0)); + +?> +===DONE=== + +--EXPECTF-- +Deprecated: MongoDB\Driver\Server::executeBulkWrite(): Passing the "writeConcern" option directly is deprecated and will be removed in ext-mongodb 2.0%s +===DONE=== diff --git a/tests/server/server-executeCommand-005.phpt b/tests/server/server-executeCommand-005.phpt index 20cca0c58..6f24e31da 100644 --- a/tests/server/server-executeCommand-005.phpt +++ b/tests/server/server-executeCommand-005.phpt @@ -35,10 +35,14 @@ echo "is_secondary: ", $cursor->getServer()->isSecondary() ? 'true' : 'false', " --EXPECTF-- Testing primary: + +Deprecated: MongoDB\Driver\Server::executeCommand(): Passing the "readPreference" option directly is deprecated and will be removed in ext-mongodb 2.0%s is_primary: true is_secondary: false Testing secondary: + +Deprecated: MongoDB\Driver\Server::executeCommand(): Passing the "readPreference" option directly is deprecated and will be removed in ext-mongodb 2.0%s is_primary: false is_secondary: true diff --git a/tests/server/server-executeQuery-010.phpt b/tests/server/server-executeQuery-010.phpt index 1a85b4bf4..b2488658d 100644 --- a/tests/server/server-executeQuery-010.phpt +++ b/tests/server/server-executeQuery-010.phpt @@ -40,10 +40,14 @@ echo "is_secondary: ", $cursor->getServer()->isSecondary() ? 'true' : 'false', " --EXPECTF-- Testing primary: + +Deprecated: MongoDB\Driver\Server::executeQuery(): Passing the "readPreference" option directly is deprecated and will be removed in ext-mongodb 2.0%s is_primary: true is_secondary: false Testing secondary: + +Deprecated: MongoDB\Driver\Server::executeQuery(): Passing the "readPreference" option directly is deprecated and will be removed in ext-mongodb 2.0%s is_primary: false is_secondary: true From 1e55f8d7b6cf956044573127867faab2b39b3c89 Mon Sep 17 00:00:00 2001 From: Jeremy Mikola Date: Tue, 28 Jan 2025 16:15:03 -0500 Subject: [PATCH 2/3] Prefer writeConcern and readPreference options for execute methods --- tests/bulk/write-0002.phpt | 2 +- tests/manager/manager-executeBulkWrite_error-003.phpt | 2 +- tests/readPreference/bug0146-001.phpt | 2 +- tests/replicaset/bug0155.phpt | 2 +- tests/replicaset/readconcern-001.phpt | 2 +- tests/replicaset/writeconcernerror-001.phpt | 2 +- tests/replicaset/writeconcernerror-002.phpt | 2 +- tests/replicaset/writeresult-getserver-001.phpt | 2 +- tests/replicaset/writeresult-getserver-002.phpt | 2 +- tests/server/server-executeBulkWrite-002.phpt | 2 +- tests/server/server-executeBulkWrite-003.phpt | 2 +- tests/server/server-executeBulkWrite-004.phpt | 2 +- tests/server/server-executeBulkWrite-005.phpt | 2 +- tests/server/server-executeCommand-002.phpt | 4 ++-- tests/server/server-executeCommand-003.phpt | 2 +- tests/server/server-executeQuery-006.phpt | 4 ++-- tests/server/server-executeQuery-008.phpt | 4 ++-- tests/standalone/bug0545.phpt | 4 ++-- tests/standalone/manager-as-singleton.phpt | 2 +- tests/standalone/write-error-001.phpt | 2 +- tests/standalone/writeresult-isacknowledged-003.phpt | 2 +- tests/writeConcernError/writeconcernerror-debug-001.phpt | 2 +- tests/writeConcernError/writeconcernerror-getcode-001.phpt | 2 +- tests/writeConcernError/writeconcernerror-getmessage-001.phpt | 2 +- tests/writeResult/writeresult-debug-002.phpt | 2 +- tests/writeResult/writeresult-getdeletedcount-002.phpt | 2 +- tests/writeResult/writeresult-getinsertedcount-002.phpt | 2 +- tests/writeResult/writeresult-getmatchedcount-002.phpt | 2 +- tests/writeResult/writeresult-getmodifiedcount-002.phpt | 2 +- tests/writeResult/writeresult-getupsertedcount-002.phpt | 2 +- tests/writeResult/writeresult-getwriteconcernerror-001.phpt | 2 +- tests/writeResult/writeresult-isacknowledged-001.phpt | 2 +- 32 files changed, 36 insertions(+), 36 deletions(-) diff --git a/tests/bulk/write-0002.phpt b/tests/bulk/write-0002.phpt index 44a3b47a1..0ccdf53d9 100644 --- a/tests/bulk/write-0002.phpt +++ b/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); diff --git a/tests/manager/manager-executeBulkWrite_error-003.phpt b/tests/manager/manager-executeBulkWrite_error-003.phpt index dd92c2590..613479a72 100644 --- a/tests/manager/manager-executeBulkWrite_error-003.phpt +++ b/tests/manager/manager-executeBulkWrite_error-003.phpt @@ -14,7 +14,7 @@ $bulk = new MongoDB\Driver\BulkWrite(); $bulk->insert(array('_id' => 1, 'x' => 1)); try { - $manager->executeBulkWrite(NS, $bulk, new MongoDB\Driver\WriteConcern(30)); + $manager->executeBulkWrite(NS, $bulk, ['writeConcern' => new MongoDB\Driver\WriteConcern(30)]); } catch (MongoDB\Driver\Exception\BulkWriteException $e) { printf("BulkWriteException: %s\n", $e->getMessage()); diff --git a/tests/readPreference/bug0146-001.phpt b/tests/readPreference/bug0146-001.phpt index 563e01700..a4433867a 100644 --- a/tests/readPreference/bug0146-001.phpt +++ b/tests/readPreference/bug0146-001.phpt @@ -26,7 +26,7 @@ $rps = [ foreach($rps as $r) { $rp = new MongoDB\Driver\ReadPreference($r); - $cursor = $manager->executeQuery(NS, new MongoDB\Driver\Query(array("my" => "query")), $rp); + $cursor = $manager->executeQuery(NS, new MongoDB\Driver\Query(['my' => 'query']), ['readPreference' => $rp]); var_dump($cursor); } diff --git a/tests/replicaset/bug0155.phpt b/tests/replicaset/bug0155.phpt index 347e4b4f0..36d7ad78e 100644 --- a/tests/replicaset/bug0155.phpt +++ b/tests/replicaset/bug0155.phpt @@ -15,7 +15,7 @@ $bulk = new MongoDB\Driver\BulkWrite(); $bulk->insert(array('example' => 'document')); try { - $manager->executeBulkWrite(NS, $bulk, $wc); + $manager->executeBulkWrite(NS, $bulk, ['writeConcern' => $wc]); } catch(MongoDB\Driver\Exception\BulkWriteException $e) { var_dump($e->getWriteResult()->getWriteConcernError()); } diff --git a/tests/replicaset/readconcern-001.phpt b/tests/replicaset/readconcern-001.phpt index 2c699d1ec..2840535f4 100644 --- a/tests/replicaset/readconcern-001.phpt +++ b/tests/replicaset/readconcern-001.phpt @@ -15,7 +15,7 @@ $wc = new MongoDB\Driver\WriteConcern(MongoDB\Driver\WriteConcern::MAJORITY); $bulk = new MongoDB\Driver\BulkWrite(); $bulk->insert(['_id' => 1, 'x' => 1]); $bulk->insert(['_id' => 2, 'x' => 2]); -$manager->executeBulkWrite(NS, $bulk, $wc); +$manager->executeBulkWrite(NS, $bulk, ['writeConcern' => $wc]); $rc = new MongoDB\Driver\ReadConcern(MongoDB\Driver\ReadConcern::LOCAL); $query = new MongoDB\Driver\Query(['x' => 2], ['readConcern' => $rc]); diff --git a/tests/replicaset/writeconcernerror-001.phpt b/tests/replicaset/writeconcernerror-001.phpt index c839db2bb..892224c34 100644 --- a/tests/replicaset/writeconcernerror-001.phpt +++ b/tests/replicaset/writeconcernerror-001.phpt @@ -15,7 +15,7 @@ $bulk->insert(array("my" => "value")); $w = new MongoDB\Driver\WriteConcern(30, 100); try { - $retval = $manager->executeBulkWrite(NS, $bulk, $w); + $retval = $manager->executeBulkWrite(NS, $bulk, ['writeConcern' => $w]); } catch(MongoDB\Driver\Exception\BulkWriteException $e) { $server = $e->getWriteResult()->getServer(); $server->getPort(); diff --git a/tests/replicaset/writeconcernerror-002.phpt b/tests/replicaset/writeconcernerror-002.phpt index 39c038646..5fe8224a5 100644 --- a/tests/replicaset/writeconcernerror-002.phpt +++ b/tests/replicaset/writeconcernerror-002.phpt @@ -21,7 +21,7 @@ $bulk->update(array("foo" => "bar"), array('$set' => array("foo" => "baz")), arr $w = new MongoDB\Driver\WriteConcern(30); try { - $retval = $manager->executeBulkWrite(NS, $bulk, $w); + $retval = $manager->executeBulkWrite(NS, $bulk, ['writeConcern' => $w]); } catch(MongoDB\Driver\Exception\BulkWriteException $e) { printWriteResult($e->getWriteResult(), false); } diff --git a/tests/replicaset/writeresult-getserver-001.phpt b/tests/replicaset/writeresult-getserver-001.phpt index 93db60e4a..345190536 100644 --- a/tests/replicaset/writeresult-getserver-001.phpt +++ b/tests/replicaset/writeresult-getserver-001.phpt @@ -30,7 +30,7 @@ var_dump($server == $server2); $rp = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::SECONDARY); /* Fetch a secondary */ -$server3 = $manager->executeQuery(NS, new MongoDB\Driver\Query(array()), $rp)->getServer(); +$server3 = $manager->executeQuery(NS, new MongoDB\Driver\Query([]), ['readPreference' => $rp])->getServer(); var_dump($server == $server3); var_dump($server->getPort(), $server3->getPort()); diff --git a/tests/replicaset/writeresult-getserver-002.phpt b/tests/replicaset/writeresult-getserver-002.phpt index 562de0a97..2a4d5ddd2 100644 --- a/tests/replicaset/writeresult-getserver-002.phpt +++ b/tests/replicaset/writeresult-getserver-002.phpt @@ -33,7 +33,7 @@ var_dump($server == $server2); $rp = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::SECONDARY); /* Fetch a secondary */ -$server3 = $manager->executeQuery(NS, new MongoDB\Driver\Query(array()), $rp)->getServer(); +$server3 = $manager->executeQuery(NS, new MongoDB\Driver\Query([]), ['readPreference' => $rp])->getServer(); var_dump($server == $server3); var_dump($server->getPort(), $server3->getPort()); diff --git a/tests/server/server-executeBulkWrite-002.phpt b/tests/server/server-executeBulkWrite-002.phpt index 02ea0770e..9f65bd810 100644 --- a/tests/server/server-executeBulkWrite-002.phpt +++ b/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()); } diff --git a/tests/server/server-executeBulkWrite-003.phpt b/tests/server/server-executeBulkWrite-003.phpt index a31074f85..6ae75d0f6 100644 --- a/tests/server/server-executeBulkWrite-003.phpt +++ b/tests/server/server-executeBulkWrite-003.phpt @@ -18,7 +18,7 @@ foreach ($writeConcerns as $wc) { $bulk = new MongoDB\Driver\BulkWrite(); $bulk->insert(array('wc' => $wc)); - $result = $server->executeBulkWrite(NS, $bulk, new MongoDB\Driver\WriteConcern($wc)); + $result = $server->executeBulkWrite(NS, $bulk, ['writeConcern' => new MongoDB\Driver\WriteConcern($wc)]); var_dump($result->isAcknowledged()); var_dump($result->getInsertedCount()); } diff --git a/tests/server/server-executeBulkWrite-004.phpt b/tests/server/server-executeBulkWrite-004.phpt index d4398bdc1..bdd8b9979 100644 --- a/tests/server/server-executeBulkWrite-004.phpt +++ b/tests/server/server-executeBulkWrite-004.phpt @@ -21,7 +21,7 @@ foreach ($writeConcerns as $wc) { $bulk->insert(array('wc' => $wc)); echo throws(function() use ($server, $bulk, $wc) { - $server->executeBulkWrite(NS, $bulk, new MongoDB\Driver\WriteConcern($wc)); + $server->executeBulkWrite(NS, $bulk, ['writeConcern' => new MongoDB\Driver\WriteConcern($wc)]); }, "MongoDB\Driver\Exception\RuntimeException"), "\n"; } diff --git a/tests/server/server-executeBulkWrite-005.phpt b/tests/server/server-executeBulkWrite-005.phpt index 3a954dbf4..13035102b 100644 --- a/tests/server/server-executeBulkWrite-005.phpt +++ b/tests/server/server-executeBulkWrite-005.phpt @@ -23,7 +23,7 @@ foreach ($writeConcerns as $wc) { $bulk = new MongoDB\Driver\BulkWrite(); $bulk->insert(array('wc' => $wc)); - $result = $server->executeBulkWrite('local.' . COLLECTION_NAME, $bulk, new MongoDB\Driver\WriteConcern($wc)); + $result = $server->executeBulkWrite('local.' . COLLECTION_NAME, $bulk, ['writeConcern' => new MongoDB\Driver\WriteConcern($wc)]); var_dump($result->isAcknowledged()); var_dump($result->getInsertedCount()); } diff --git a/tests/server/server-executeCommand-002.phpt b/tests/server/server-executeCommand-002.phpt index 065c3a88d..edfdf647b 100644 --- a/tests/server/server-executeCommand-002.phpt +++ b/tests/server/server-executeCommand-002.phpt @@ -25,7 +25,7 @@ $command = new MongoDB\Driver\Command([ 'pipeline' => [ [ '$match' => [ 'x' => 1 ] ] ], 'cursor' => (object) [], ]); -$secondary->executeCommand(DATABASE_NAME, $command, $rp); +$secondary->executeCommand(DATABASE_NAME, $command, ['readPreference' => $rp]); $query = new MongoDB\Driver\Query( array( @@ -37,7 +37,7 @@ $query = new MongoDB\Driver\Query( 'limit' => 1, ) ); -$cursor = $secondary->executeQuery(DATABASE_NAME . '.system.profile', $query, $rp); +$cursor = $secondary->executeQuery(DATABASE_NAME . '.system.profile', $query, ['readPreference' => $rp]); $profileEntry = current($cursor->toArray()); var_dump($profileEntry->command); diff --git a/tests/server/server-executeCommand-003.phpt b/tests/server/server-executeCommand-003.phpt index 36b0dde74..047b18e0c 100644 --- a/tests/server/server-executeCommand-003.phpt +++ b/tests/server/server-executeCommand-003.phpt @@ -17,7 +17,7 @@ $secondary = $manager->selectServer($secondaryRp); * no effect when directly querying a server, since the secondaryOk flag is always * set for hinted commands. */ $primaryRp = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::PRIMARY); -$cursor = $secondary->executeCommand(DATABASE_NAME, new MongoDB\Driver\Command(array('ping' => 1)), $primaryRp); +$cursor = $secondary->executeCommand(DATABASE_NAME, new MongoDB\Driver\Command(array('ping' => 1)), ['readPreference' => $primaryRp]); var_dump($cursor->toArray()); diff --git a/tests/server/server-executeQuery-006.phpt b/tests/server/server-executeQuery-006.phpt index 90a714b26..be1d75cf8 100644 --- a/tests/server/server-executeQuery-006.phpt +++ b/tests/server/server-executeQuery-006.phpt @@ -24,7 +24,7 @@ if (empty($result->ok)) { exit("Could not set profile level\n"); } -$secondary->executeQuery(NS, new MongoDB\Driver\Query(array("x" => 1)), $rp); +$secondary->executeQuery(NS, new MongoDB\Driver\Query(['x' => 1]), ['readPreference' => $rp]); $query = new MongoDB\Driver\Query( array( @@ -36,7 +36,7 @@ $query = new MongoDB\Driver\Query( 'limit' => 1, ) ); -$cursor = $secondary->executeQuery(DATABASE_NAME . '.system.profile', $query, $rp); +$cursor = $secondary->executeQuery(DATABASE_NAME . '.system.profile', $query, ['readPreference' => $rp]); $profileEntry = current($cursor->toArray()); if (! isset( $profileEntry->command )) { diff --git a/tests/server/server-executeQuery-008.phpt b/tests/server/server-executeQuery-008.phpt index 9d2f915ac..b34f83422 100644 --- a/tests/server/server-executeQuery-008.phpt +++ b/tests/server/server-executeQuery-008.phpt @@ -21,7 +21,7 @@ $dataBearingNodes = count(array_filter($manager->getServers(), function (MongoDB $bulk = new \MongoDB\Driver\BulkWrite; $bulk->insert(['_id' => 1, 'x' => 1]); -$primary->executeBulkWrite(NS, $bulk, new MongoDB\Driver\WriteConcern($dataBearingNodes)); +$primary->executeBulkWrite(NS, $bulk, ['writeConcern' => new MongoDB\Driver\WriteConcern($dataBearingNodes)]); $secondaryRp = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::SECONDARY); $secondary = $manager->selectServer($secondaryRp); @@ -29,7 +29,7 @@ $secondary = $manager->selectServer($secondaryRp); /* Note: this is testing that the read preference (even a conflicting one) has * no effect when directly querying a server, since the secondaryOk flag is always * set for hinted queries. */ -$cursor = $secondary->executeQuery(NS, new MongoDB\Driver\Query(['x' => 1]), $primaryRp); +$cursor = $secondary->executeQuery(NS, new MongoDB\Driver\Query(['x' => 1]), ['readPreference' => $primaryRp]); var_dump($cursor->toArray()); diff --git a/tests/standalone/bug0545.phpt b/tests/standalone/bug0545.phpt index fef846365..ab292c437 100644 --- a/tests/standalone/bug0545.phpt +++ b/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) diff --git a/tests/standalone/manager-as-singleton.phpt b/tests/standalone/manager-as-singleton.phpt index 4cdd333de..8978710e3 100644 --- a/tests/standalone/manager-as-singleton.phpt +++ b/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)]); } } diff --git a/tests/standalone/write-error-001.phpt b/tests/standalone/write-error-001.phpt index 530af2fb9..12f3359f2 100644 --- a/tests/standalone/write-error-001.phpt +++ b/tests/standalone/write-error-001.phpt @@ -20,7 +20,7 @@ $w = 2; $wtimeout = 1000; $writeConcern = new \MongoDB\Driver\WriteConcern($w, $wtimeout); echo throws(function() use($bulk, $writeConcern, $manager) { - $result = $manager->executeBulkWrite(NS, $bulk, $writeConcern); + $result = $manager->executeBulkWrite(NS, $bulk, ['writeConcern' => $writeConcern]); }, "MongoDB\Driver\Exception\BulkWriteException"), "\n"; ?> diff --git a/tests/standalone/writeresult-isacknowledged-003.phpt b/tests/standalone/writeresult-isacknowledged-003.phpt index e30e53312..5d679910e 100644 --- a/tests/standalone/writeresult-isacknowledged-003.phpt +++ b/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); diff --git a/tests/writeConcernError/writeconcernerror-debug-001.phpt b/tests/writeConcernError/writeconcernerror-debug-001.phpt index a164aa8d8..c9761436f 100644 --- a/tests/writeConcernError/writeconcernerror-debug-001.phpt +++ b/tests/writeConcernError/writeconcernerror-debug-001.phpt @@ -15,7 +15,7 @@ $bulk->insert(['x' => 1]); try { /* We assume that the replica set does not have 12 nodes */ - $manager->executeBulkWrite(NS, $bulk, new MongoDB\Driver\WriteConcern(12)); + $manager->executeBulkWrite(NS, $bulk, ['writeConcern' => new MongoDB\Driver\WriteConcern(12)]); } catch(MongoDB\Driver\Exception\BulkWriteException $e) { var_dump($e->getWriteResult()->getWriteConcernError()); } diff --git a/tests/writeConcernError/writeconcernerror-getcode-001.phpt b/tests/writeConcernError/writeconcernerror-getcode-001.phpt index e34dc95a9..fb4c682e9 100644 --- a/tests/writeConcernError/writeconcernerror-getcode-001.phpt +++ b/tests/writeConcernError/writeconcernerror-getcode-001.phpt @@ -15,7 +15,7 @@ $bulk->insert(['x' => 1]); try { /* We assume that the replica set does not have 12 nodes */ - $manager->executeBulkWrite(NS, $bulk, new MongoDB\Driver\WriteConcern(12)); + $manager->executeBulkWrite(NS, $bulk, ['writeConcern' => new MongoDB\Driver\WriteConcern(12)]); } catch(MongoDB\Driver\Exception\BulkWriteException $e) { var_dump($e->getWriteResult()->getWriteConcernError()->getCode()); } diff --git a/tests/writeConcernError/writeconcernerror-getmessage-001.phpt b/tests/writeConcernError/writeconcernerror-getmessage-001.phpt index 4f578ac36..27d4e16c1 100644 --- a/tests/writeConcernError/writeconcernerror-getmessage-001.phpt +++ b/tests/writeConcernError/writeconcernerror-getmessage-001.phpt @@ -15,7 +15,7 @@ $bulk->insert(['x' => 1]); try { /* We assume that the replica set does not have 12 nodes */ - $manager->executeBulkWrite(NS, $bulk, new MongoDB\Driver\WriteConcern(12)); + $manager->executeBulkWrite(NS, $bulk, ['writeConcern' => new MongoDB\Driver\WriteConcern(12)]); } catch(MongoDB\Driver\Exception\BulkWriteException $e) { var_dump($e->getWriteResult()->getWriteConcernError()->getMessage()); } diff --git a/tests/writeResult/writeresult-debug-002.phpt b/tests/writeResult/writeresult-debug-002.phpt index b2e4fce86..eea6ea523 100644 --- a/tests/writeResult/writeresult-debug-002.phpt +++ b/tests/writeResult/writeresult-debug-002.phpt @@ -22,7 +22,7 @@ $bulk->insert(['_id' => 3]); try { /* We assume that the replica set does not have 30 nodes */ - $result = $manager->executeBulkWrite(NS, $bulk, new MongoDB\Driver\WriteConcern(30)); + $result = $manager->executeBulkWrite(NS, $bulk, ['writeConcern' => new MongoDB\Driver\WriteConcern(30)]); } catch (MongoDB\Driver\Exception\BulkWriteException $e) { var_dump($e->getWriteResult()); } diff --git a/tests/writeResult/writeresult-getdeletedcount-002.phpt b/tests/writeResult/writeresult-getdeletedcount-002.phpt index a3008f22c..394f8c7dc 100644 --- a/tests/writeResult/writeresult-getdeletedcount-002.phpt +++ b/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()); diff --git a/tests/writeResult/writeresult-getinsertedcount-002.phpt b/tests/writeResult/writeresult-getinsertedcount-002.phpt index 4f671b36d..480498da4 100644 --- a/tests/writeResult/writeresult-getinsertedcount-002.phpt +++ b/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()); diff --git a/tests/writeResult/writeresult-getmatchedcount-002.phpt b/tests/writeResult/writeresult-getmatchedcount-002.phpt index 75b93c704..153cca2e3 100644 --- a/tests/writeResult/writeresult-getmatchedcount-002.phpt +++ b/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()); diff --git a/tests/writeResult/writeresult-getmodifiedcount-002.phpt b/tests/writeResult/writeresult-getmodifiedcount-002.phpt index a27e99c19..43f7d2e4e 100644 --- a/tests/writeResult/writeresult-getmodifiedcount-002.phpt +++ b/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()); diff --git a/tests/writeResult/writeresult-getupsertedcount-002.phpt b/tests/writeResult/writeresult-getupsertedcount-002.phpt index af42f26b6..a2b986355 100644 --- a/tests/writeResult/writeresult-getupsertedcount-002.phpt +++ b/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()); diff --git a/tests/writeResult/writeresult-getwriteconcernerror-001.phpt b/tests/writeResult/writeresult-getwriteconcernerror-001.phpt index 73fd56e72..0952a93f9 100644 --- a/tests/writeResult/writeresult-getwriteconcernerror-001.phpt +++ b/tests/writeResult/writeresult-getwriteconcernerror-001.phpt @@ -15,7 +15,7 @@ $bulk->insert(['x' => 1]); try { /* We assume that the replica set does not have 12 nodes */ - $result = $manager->executeBulkWrite(NS, $bulk, new MongoDB\Driver\WriteConcern(12)); + $result = $manager->executeBulkWrite(NS, $bulk, ['writeConcern' => new MongoDB\Driver\WriteConcern(12)]); } catch (MongoDB\Driver\Exception\BulkWriteException $e) { var_dump($e->getWriteResult()->getWriteConcernError()); } diff --git a/tests/writeResult/writeresult-isacknowledged-001.phpt b/tests/writeResult/writeresult-isacknowledged-001.phpt index 5f0d1a41c..4405a449b 100644 --- a/tests/writeResult/writeresult-isacknowledged-001.phpt +++ b/tests/writeResult/writeresult-isacknowledged-001.phpt @@ -19,7 +19,7 @@ foreach ($wcs as $wc) { $bulk = new MongoDB\Driver\BulkWrite; $bulk->insert(['x' => 1]); - $result = $manager->executeBulkWrite(NS, $bulk, $wc); + $result = $manager->executeBulkWrite(NS, $bulk, ['writeConcern' => $wc]); var_dump($result->isAcknowledged()); } From a9e5f8c3db74139c3ba3edc1bd11d68542943989 Mon Sep 17 00:00:00 2001 From: Jeremy Mikola Date: Wed, 29 Jan 2025 14:50:02 -0500 Subject: [PATCH 3/3] Correctly use Server method in server-executeQuery-010.phpt The original test incorrectly called the Manager method. This dates back to 87fbd007f0ee6348ed218c872c135e9a52e9c282. --- tests/server/server-executeQuery-010.phpt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/server/server-executeQuery-010.phpt b/tests/server/server-executeQuery-010.phpt index b2488658d..7eb3d74f4 100644 --- a/tests/server/server-executeQuery-010.phpt +++ b/tests/server/server-executeQuery-010.phpt @@ -24,14 +24,14 @@ $secondary = $manager->selectServer($secondaryRp); echo "Testing primary:\n"; $query = new MongoDB\Driver\Query(['x' => 3], ['projection' => ['y' => 1]]); -$cursor = $manager->executeQuery(NS, $query, $primaryRp); +$cursor = $primary->executeQuery(NS, $query, $primaryRp); echo "is_primary: ", $cursor->getServer()->isPrimary() ? 'true' : 'false', "\n"; echo "is_secondary: ", $cursor->getServer()->isSecondary() ? 'true' : 'false', "\n\n"; echo "Testing secondary:\n"; $query = new MongoDB\Driver\Query(['x' => 3], ['projection' => ['y' => 1]]); -$cursor = $manager->executeQuery(NS, $query, $secondaryRp); +$cursor = $secondary->executeQuery(NS, $query, $secondaryRp); echo "is_primary: ", $cursor->getServer()->isPrimary() ? 'true' : 'false', "\n"; echo "is_secondary: ", $cursor->getServer()->isSecondary() ? 'true' : 'false', "\n\n";