Skip to content

Commit 4acca26

Browse files
bjoribjori
committed
This is a Manager, not MongoClient
1 parent a9823e7 commit 4acca26

File tree

11 files changed

+23
-23
lines changed

11 files changed

+23
-23
lines changed

‎tests/batch/write-0001.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ MongoDB\Driver\Write\Batch: #001 Variety Batch
66
<?php
77
require_once "tests/utils/basic.inc";
88

9-
$mc = new MongoDB\Driver\Manager(MONGODB_URI);
9+
$manager = new MongoDB\Driver\Manager(MONGODB_URI);
1010

1111
$batch = new MongoDB\Driver\WriteBatch;
1212
var_dump($batch);
@@ -23,7 +23,7 @@ $batch->update(array("foo" => "bar"), array('$set' => array("foo" => "baz")), ar
2323

2424
var_dump($batch);
2525

26-
$retval = $mc->executeWriteBatch(NS, $batch);
26+
$retval = $manager->executeWriteBatch(NS, $batch);
2727

2828
var_dump($batch);
2929

‎tests/batch/write-0002.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ MongoDB\Driver\Write\Batch: #002 Get the generated ID
66
<?php
77
require_once "tests/utils/basic.inc";
88

9-
$mm = new MongoDB\Driver\Manager(MONGODB_URI);
9+
$manager = new MongoDB\Driver\Manager(MONGODB_URI);
1010

1111
$hannes = array("name" => "Hannes", "country" => "USA", "gender" => "male");
1212
$hayley = array("name" => "Hayley", "country" => "USA", "gender" => "female");
@@ -20,7 +20,7 @@ $w = 1;
2020
$wtimeout = 1000;
2121
$writeConcern = new \MongoDB\Driver\WriteConcern($w, $wtimeout);
2222
var_dump($insertBatch);
23-
$result = $mm->executeWriteBatch("db.collection", $insertBatch, $writeConcern);
23+
$result = $manager->executeWriteBatch("db.collection", $insertBatch, $writeConcern);
2424
var_dump($insertBatch);
2525

2626
assert($result instanceof \MongoDB\Driver\WriteResult);

‎tests/connect/standalone-auth-0001.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ $database = "admin";
1212

1313
$parsed = parse_url(MONGODB_STANDALONE_AUTH_URI);
1414
$dsn = sprintf("mongodb://%s:%s@%s:%d/%s", $username, $password, $parsed["host"], $parsed["port"], $database);
15-
$mc = new MongoDB\Driver\Manager($dsn);
15+
$manager = new MongoDB\Driver\Manager($dsn);
1616

1717
$batch = new MongoDB\Driver\WriteBatch;
1818

@@ -24,7 +24,7 @@ $batch->delete(array("my" => "value", "foo" => "bar"), array("limit" => 1));
2424

2525
$batch->update(array("foo" => "bar"), array('$set' => array("foo" => "baz")), array("limit" => 1, "upsert" => 0));
2626

27-
$retval = $mc->executeWriteBatch(NS, $batch);
27+
$retval = $manager->executeWriteBatch(NS, $batch);
2828

2929
printf("Inserted: %d\n", getInsertCount($retval));
3030
printf("Deleted: %d\n", getDeletedCount($retval));

‎tests/connect/standalone-ssl-0001.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ require_once "tests/utils/basic.inc";
88

99
$dsn = sprintf("%s/?ssl=true", MONGODB_STANDALONE_SSL_URI);
1010

11-
$mc = new MongoDB\Driver\Manager($dsn);
11+
$manager = new MongoDB\Driver\Manager($dsn);
1212

1313
$batch = new MongoDB\Driver\WriteBatch;
1414

@@ -20,7 +20,7 @@ $batch->delete(array("my" => "value", "foo" => "bar"), array("limit" => 1));
2020

2121
$batch->update(array("foo" => "bar"), array('$set' => array("foo" => "baz")), array("limit" => 1, "upsert" => 0));
2222

23-
$retval = $mc->executeWriteBatch(NS, $batch);
23+
$retval = $manager->executeWriteBatch(NS, $batch);
2424

2525
printf("Inserted: %d\n", getInsertCount($retval));
2626
printf("Deleted: %d\n", getDeletedCount($retval));

‎tests/connect/standalone-ssl-0002.phpt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,21 +44,21 @@ $opts = array(
4444
);
4545
$context = stream_context_create($opts);
4646

47-
$mc = new MongoDB\Driver\Manager($dsn, array(), array("context" => $context));
47+
$manager = new MongoDB\Driver\Manager($dsn, array(), array("context" => $context));
4848

4949

50-
echo throws(function() use($mc) {
50+
echo throws(function() use($manager) {
5151
$batch = new MongoDB\Driver\WriteBatch;
5252
$batch->insert(array("my" => "value"));
53-
$retval = $mc->executeWriteBatch(NS, $batch);
53+
$retval = $manager->executeWriteBatch(NS, $batch);
5454
}, "MongoDB\\Driver\\SSLConnectionException", "executeWriteBatch"), "\n";
5555

5656

5757
echo "Changing to server\n";
5858
stream_context_set_option($context, "ssl", "CN_match", "server");
5959
$batch = new MongoDB\Driver\WriteBatch;
6060
$batch->insert(array("my" => "value"));
61-
$retval = $mc->executeWriteBatch(NS, $batch);
61+
$retval = $manager->executeWriteBatch(NS, $batch);
6262
printf("Inserted: %d\n", $retval->getInsertedCount());
6363

6464

‎tests/readPreference/001.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ MongoDB\Driver\ReadPreference#001
66
<?php
77
require_once "tests/utils/basic.inc";
88

9-
$mc = new MongoDB\Driver\Manager(MONGODB_URI);
9+
$manager = new MongoDB\Driver\Manager(MONGODB_URI);
1010

1111

1212
$rp = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_PRIMARY);

‎tests/readPreference/002.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ MongoDB\Driver\ReadPreference#002: PHPC-146
66
<?php
77
require_once "tests/utils/basic.inc";
88

9-
$mc = new MongoDB\Driver\Manager(MONGODB_URI);
10-
$mc->executeInsert(NS, array("my" => "document"));
9+
$manager = new MongoDB\Driver\Manager(MONGODB_URI);
10+
$manager->executeInsert(NS, array("my" => "document"));
1111
$rps = array(
1212
MongoDB\Driver\ReadPreference::RP_PRIMARY,
1313
MongoDB\Driver\ReadPreference::RP_PRIMARY_PREFERRED,
@@ -17,7 +17,7 @@ $rps = array(
1717
);
1818
foreach($rps as $r) {
1919
$rp = new MongoDB\Driver\ReadPreference($r);
20-
$cursor = $mc->executeQuery(NS, new MongoDB\Driver\Query(array("my" => "query")), $rp);
20+
$cursor = $manager->executeQuery(NS, new MongoDB\Driver\Query(array("my" => "query")), $rp);
2121
var_dump($cursor);
2222
}
2323

‎tests/replicaset/writeconcern-error.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ WriteConcernError: Populate WriteConcernError on WriteConcern errors
66
<?php
77
require_once "tests/utils/basic.inc";
88

9-
$mc = new MongoDB\Driver\Manager(MONGODB_REPLICASET_URI);
9+
$manager = new MongoDB\Driver\Manager(MONGODB_REPLICASET_URI);
1010

1111
$batch = new MongoDB\Driver\WriteBatch;
1212

1313
$batch->insert(array("my" => "value"));
1414

1515
$w = new MongoDB\Driver\WriteConcern(30, 100);
16-
$retval = $mc->executeWriteBatch(NS, $batch, $w);
16+
$retval = $manager->executeWriteBatch(NS, $batch, $w);
1717

1818
printWriteResult($retval);
1919
?>

‎tests/replicaset/writeconcernerror-0001.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ WriteConcernError: Access write counts and WriteConcern reason
66
<?php
77
require_once "tests/utils/basic.inc";
88

9-
$mc = new MongoDB\Driver\Manager(MONGODB_REPLICASET_URI);
9+
$manager = new MongoDB\Driver\Manager(MONGODB_REPLICASET_URI);
1010

1111
$batch = new MongoDB\Driver\WriteBatch;
1212

@@ -19,7 +19,7 @@ $batch->delete(array("my" => "value", "foo" => "bar"), array("limit" => 1));
1919
$batch->update(array("foo" => "bar"), array('$set' => array("foo" => "baz")), array("limit" => 1, "upsert" => 0));
2020

2121
$w = new MongoDB\Driver\WriteConcern(30, 100);
22-
$retval = $mc->executeWriteBatch(NS, $batch, $w);
22+
$retval = $manager->executeWriteBatch(NS, $batch, $w);
2323

2424
printWriteResult($retval);
2525
?>

‎tests/utils/tools.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,11 @@ function CLEANUP() {
6565
return;
6666
}
6767
try {
68-
$mc = new MongoDB\Driver\Manager(MONGODB_CLEANUP_URI);
68+
$manager = new MongoDB\Driver\Manager(MONGODB_CLEANUP_URI);
6969
$cmd = new MongoDB\Driver\Command(array("drop" => COLLECTION_NAME));
7070
$rp = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_PRIMARY);
7171
try {
72-
$mc->executeCommand(DATABASE_NAME, $cmd, $rp);
72+
$manager->executeCommand(DATABASE_NAME, $cmd, $rp);
7373
} catch(Exception $e) {
7474
do {
7575
/* ns not found */

0 commit comments

Comments
 (0)