Skip to content

Commit c912818

Browse files
committed
Use $manager->selectServer() default primary
1 parent 26c1d13 commit c912818

File tree

7 files changed

+21
-20
lines changed

7 files changed

+21
-20
lines changed

rector.php

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,20 @@
1010
__DIR__ . '/src',
1111
__DIR__ . '/tests',
1212
__DIR__ . '/tools',
13-
__FILE__,
1413
]);
1514

16-
// ReadPreference::RP_* constants are deprecated in favor of the string constants
15+
/**
16+
* ReadPreference::RP_* constants are deprecated in favor of the string constants
17+
*
18+
* @see https://jira.mongodb.org/browse/PHPC-1489
19+
* @see https://jira.mongodb.org/browse/PHPC-1021
20+
*/
1721
$rectorConfig->ruleWithConfiguration(RenameClassConstFetchRector::class, [
18-
new RenameClassConstFetch('MongoDB\Driver\ReadPreference', 'RP_PRIMARY', 'PRIMARY'),
19-
new RenameClassConstFetch('MongoDB\Driver\ReadPreference', 'RP_PRIMARY_PREFERRED', 'PRIMARY_PREFERRED'),
20-
new RenameClassConstFetch('MongoDB\Driver\ReadPreference', 'RP_SECONDARY', 'SECONDARY'),
21-
new RenameClassConstFetch('MongoDB\Driver\ReadPreference', 'RP_SECONDARY_PREFERRED', 'SECONDARY_PREFERRED'),
22-
new RenameClassConstFetch('MongoDB\Driver\ReadPreference', 'RP_NEAREST', 'NEAREST'),
22+
new RenameClassConstFetch(MongoDB\Driver\ReadPreference::class, 'RP_PRIMARY', 'PRIMARY'),
23+
new RenameClassConstFetch(MongoDB\Driver\ReadPreference::class, 'RP_PRIMARY_PREFERRED', 'PRIMARY_PREFERRED'),
24+
new RenameClassConstFetch(MongoDB\Driver\ReadPreference::class, 'RP_SECONDARY', 'SECONDARY'),
25+
new RenameClassConstFetch(MongoDB\Driver\ReadPreference::class, 'RP_SECONDARY_PREFERRED', 'SECONDARY_PREFERRED'),
26+
new RenameClassConstFetch(MongoDB\Driver\ReadPreference::class, 'RP_NEAREST', 'NEAREST'),
2327
]);
2428

2529
// define sets of rules

tests/FunctionalTestCase.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ protected function getFeatureCompatibilityVersion(?ReadPreference $readPreferenc
305305

306306
protected function getPrimaryServer()
307307
{
308-
return $this->manager->selectServer(new ReadPreference(ReadPreference::PRIMARY));
308+
return $this->manager->selectServer();
309309
}
310310

311311
protected function getServerVersion(?ReadPreference $readPreference = null)
@@ -611,7 +611,7 @@ private static function getUriWithoutMultipleMongoses(): string
611611
}
612612

613613
$manager = static::createTestManager($uri);
614-
if ($manager->selectServer(new ReadPreference(ReadPreference::PRIMARY))->getType() !== Server::TYPE_MONGOS) {
614+
if ($manager->selectServer()->getType() !== Server::TYPE_MONGOS) {
615615
return $uri;
616616
}
617617

tests/Operation/FindAndModifyFunctionalTest.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
use MongoDB\BSON\PackedArray;
77
use MongoDB\Driver\BulkWrite;
88
use MongoDB\Driver\Exception\CommandException;
9-
use MongoDB\Driver\ReadPreference;
109
use MongoDB\Driver\WriteConcern;
1110
use MongoDB\Exception\UnsupportedException;
1211
use MongoDB\Model\BSONArray;
@@ -115,7 +114,7 @@ public function provideUpdatePipelines(): array
115114
public function testManagerReadConcernIsOmitted(): void
116115
{
117116
$manager = static::createTestManager(null, ['readConcernLevel' => 'majority']);
118-
$server = $manager->selectServer(new ReadPreference(ReadPreference::PRIMARY));
117+
$server = $manager->selectServer();
119118

120119
(new CommandObserver())->observe(
121120
function () use ($server): void {

tests/Operation/WatchFunctionalTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ public function testNextResumesAfterConnectionException(): void
165165
* a socket timeout that is less than the change stream's maxAwaitTimeMS
166166
* option. */
167167
$manager = static::createTestManager(null, ['socketTimeoutMS' => 50]);
168-
$primaryServer = $manager->selectServer(new ReadPreference(ReadPreference::PRIMARY));
168+
$primaryServer = $manager->selectServer();
169169

170170
$operation = new Watch($manager, $this->getDatabaseName(), $this->getCollectionName(), [], $this->defaultOptions);
171171
$changeStream = $operation->execute($primaryServer);

tests/SpecTests/PrimaryStepDownSpecTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ public function testGetMoreIteration(): void
208208
$totalConnectionsCreated = $this->getTotalConnectionsCreated();
209209

210210
// Send a {replSetStepDown: 5, force: true} command to the current primary and verify that the command succeeded
211-
$primary = $this->client->getManager()->selectServer(new ReadPreference(ReadPreference::PRIMARY));
211+
$primary = $this->client->getManager()->selectServer();
212212

213213
$success = false;
214214
$attempts = 0;
@@ -267,7 +267,7 @@ private function dropAndRecreateCollection(): void
267267

268268
private function getTotalConnectionsCreated(?Server $server = null)
269269
{
270-
$server = $server ?: $this->client->getManager()->selectServer(new ReadPreference(ReadPreference::PRIMARY));
270+
$server = $server ?: $this->client->getManager()->selectServer();
271271

272272
$cursor = $server->executeCommand(
273273
$this->getDatabaseName(),
@@ -292,7 +292,7 @@ private function waitForPrimaryReelection(): void
292292

293293
return;
294294
} catch (DriverException $e) {
295-
$this->client->getManager()->selectServer(new ReadPreference(ReadPreference::PRIMARY));
295+
$this->client->getManager()->selectServer();
296296

297297
return;
298298
}

tests/SpecTests/TransactionsSpecTest.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
use MongoDB\BSON\Timestamp;
77
use MongoDB\Driver\Command;
88
use MongoDB\Driver\Exception\ServerException;
9-
use MongoDB\Driver\ReadPreference;
109
use MongoDB\Driver\Server;
1110
use stdClass;
1211

@@ -324,7 +323,7 @@ private static function killAllSessions(): void
324323
}
325324

326325
$manager = static::createTestManager();
327-
$primary = $manager->selectServer(new ReadPreference(ReadPreference::PRIMARY));
326+
$primary = $manager->selectServer();
328327

329328
$servers = $primary->getType() === Server::TYPE_MONGOS
330329
? $manager->getServers()

tests/UnifiedSpecTests/UnifiedTestRunner.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
use MongoDB\Collection;
66
use MongoDB\Driver\Exception\ServerException;
7-
use MongoDB\Driver\ReadPreference;
87
use MongoDB\Driver\Server;
98
use MongoDB\Model\BSONArray;
109
use MongoDB\Operation\DatabaseCommand;
@@ -279,7 +278,7 @@ private function getPrimaryServer(): Server
279278
{
280279
$manager = $this->internalClient->getManager();
281280

282-
return $manager->selectServer(new ReadPreference(ReadPreference::PRIMARY));
281+
return $manager->selectServer();
283282
}
284283

285284
private function getServerVersion(): string
@@ -438,7 +437,7 @@ private function killAllSessions(): void
438437
}
439438

440439
$manager = $this->internalClient->getManager();
441-
$primary = $manager->selectServer(new ReadPreference(ReadPreference::PRIMARY));
440+
$primary = $manager->selectServer();
442441
$servers = $primary->getType() === Server::TYPE_MONGOS ? $manager->getServers() : [$primary];
443442

444443
foreach ($servers as $server) {

0 commit comments

Comments
 (0)