Skip to content

Commit 9dfbb60

Browse files
alcaeusalcaeus
committed
Use getCollection and getDatabase methods
1 parent 5c32677 commit 9dfbb60

File tree

9 files changed

+19
-19
lines changed

9 files changed

+19
-19
lines changed

‎benchmark/BaseBench.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,15 +68,15 @@ public function clearDatabase(): void
6868
return;
6969
}
7070

71-
$collections = $client->selectDatabase(self::DATABASE_NAME)->listCollections();
71+
$collections = $client->getDatabase(self::DATABASE_NAME)->listCollections();
7272

7373
foreach ($collections as $collection) {
7474
// See https://jira.mongodb.org/browse/SERVER-16541
7575
if ($collection->getName() === 'system.indexes') {
7676
continue;
7777
}
7878

79-
$client->selectCollection(self::DATABASE_NAME, $collection->getName())->drop();
79+
$client->getCollection(self::DATABASE_NAME, $collection->getName())->drop();
8080
}
8181
}
8282

‎lib/Doctrine/ODM/MongoDB/DocumentManager.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ public function getDocumentDatabase(string $className): Database
322322
$db = $metadata->getDatabase();
323323
$db = $db ?: $this->config->getDefaultDB();
324324
$db = $db ?: 'doctrine';
325-
$this->documentDatabases[$className] = $this->client->selectDatabase($db);
325+
$this->documentDatabases[$className] = $this->client->getDatabase($db);
326326

327327
return $this->documentDatabases[$className];
328328
}
@@ -364,7 +364,7 @@ public function getDocumentCollection(string $className): Collection
364364
$options['readPreference'] = new ReadPreference($metadata->readPreference, $metadata->readPreferenceTags);
365365
}
366366

367-
$this->documentCollections[$className] = $db->selectCollection($collectionName, $options);
367+
$this->documentCollections[$className] = $db->getCollection($collectionName, $options);
368368
}
369369

370370
return $this->documentCollections[$className];

‎lib/Doctrine/ODM/MongoDB/Id/IncrementGenerator.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public function generate(DocumentManager $dm, object $document)
5656

5757
$key = $this->key ?: $dm->getDocumentCollection($className)->getCollectionName();
5858
$collectionName = $this->collection ?: 'doctrine_increment_ids';
59-
$collection = $db->selectCollection($collectionName);
59+
$collection = $db->getCollection($collectionName);
6060

6161
/*
6262
* Unable to use '$inc' and '$setOnInsert' together due to known bug.

‎lib/Doctrine/ODM/MongoDB/SchemaManager.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -956,7 +956,7 @@ public function ensureDocumentSharding(string $documentName, ?WriteConcern $writ
956956
public function enableShardingForDbByDocumentName(string $documentName): void
957957
{
958958
$dbName = $this->dm->getDocumentDatabase($documentName)->getDatabaseName();
959-
$adminDb = $this->dm->getClient()->selectDatabase('admin');
959+
$adminDb = $this->dm->getClient()->getDatabase('admin');
960960

961961
try {
962962
$adminDb->command(['enableSharding' => $dbName]);
@@ -976,7 +976,7 @@ private function runShardCollectionCommand(string $documentName, ?WriteConcern $
976976
$class = $this->dm->getClassMetadata($documentName);
977977
$dbName = $this->dm->getDocumentDatabase($documentName)->getDatabaseName();
978978
$shardKey = $class->getShardKey();
979-
$adminDb = $this->dm->getClient()->selectDatabase('admin');
979+
$adminDb = $this->dm->getClient()->getDatabase('admin');
980980

981981
$shardKeyPart = [];
982982
foreach ($shardKey['keys'] as $key => $order) {

‎tests/Doctrine/ODM/MongoDB/Tests/BaseTestCase.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,15 +65,15 @@ public function tearDown(): void
6565
return;
6666
}
6767

68-
$collections = $client->selectDatabase(DOCTRINE_MONGODB_DATABASE)->listCollections();
68+
$collections = $client->getDatabase(DOCTRINE_MONGODB_DATABASE)->listCollections();
6969

7070
foreach ($collections as $collection) {
7171
// See https://jira.mongodb.org/browse/SERVER-16541
7272
if (preg_match('#^system\.#', $collection->getName())) {
7373
continue;
7474
}
7575

76-
$client->selectCollection(DOCTRINE_MONGODB_DATABASE, $collection->getName())->drop();
76+
$client->getCollection(DOCTRINE_MONGODB_DATABASE, $collection->getName())->drop();
7777
}
7878
}
7979

@@ -137,7 +137,7 @@ protected static function createTestDocumentManager(): DocumentManager
137137

138138
protected function getServerVersion(): string
139139
{
140-
$result = $this->dm->getClient()->selectDatabase(DOCTRINE_MONGODB_DATABASE)->command(['buildInfo' => 1], ['typeMap' => DocumentManager::CLIENT_TYPEMAP])->toArray()[0];
140+
$result = $this->dm->getClient()->getDatabase(DOCTRINE_MONGODB_DATABASE)->command(['buildInfo' => 1], ['typeMap' => DocumentManager::CLIENT_TYPEMAP])->toArray()[0];
141141

142142
return $result['version'];
143143
}

‎tests/Doctrine/ODM/MongoDB/Tests/Events/TransactionalLifecycleEventsTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public function setUp(): void
2525

2626
public function tearDown(): void
2727
{
28-
$this->dm->getClient()->selectDatabase('admin')->command([
28+
$this->dm->getClient()->getDatabase('admin')->command([
2929
'configureFailPoint' => 'failCommand',
3030
'mode' => 'off',
3131
]);
@@ -188,7 +188,7 @@ protected static function createTestDocumentManager(): DocumentManager
188188

189189
private function createFailPoint(string $failCommand): void
190190
{
191-
$this->dm->getClient()->selectDatabase('admin')->command([
191+
$this->dm->getClient()->getDatabase('admin')->command([
192192
'configureFailPoint' => 'failCommand',
193193
'mode' => ['times' => 1],
194194
'data' => [

‎tests/Doctrine/ODM/MongoDB/Tests/Id/IncrementGeneratorTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public function testIdGeneratorWithStartingValue(): void
1717
$generator = new IncrementGenerator();
1818
$generator->setStartingId(10);
1919

20-
$collection = $this->dm->getClient()->selectCollection(DOCTRINE_MONGODB_DATABASE, 'doctrine_increment_ids');
20+
$collection = $this->dm->getClient()->getCollection(DOCTRINE_MONGODB_DATABASE, 'doctrine_increment_ids');
2121

2222
self::assertSame(10, $generator->generate($this->dm, new User()));
2323
$result = $collection->findOne(['_id' => 'users']);
@@ -34,7 +34,7 @@ public function testUsesOneAsStartingValueIfNotOverridden(): void
3434

3535
self::assertSame(1, $generator->generate($this->dm, new User()));
3636

37-
$collection = $this->dm->getClient()->selectCollection(DOCTRINE_MONGODB_DATABASE, 'doctrine_increment_ids');
37+
$collection = $this->dm->getClient()->getCollection(DOCTRINE_MONGODB_DATABASE, 'doctrine_increment_ids');
3838
$result = $collection->findOne(['_id' => 'users']);
3939
self::assertSame(1, $result['current_id']);
4040
}

‎tests/Doctrine/ODM/MongoDB/Tests/UnitOfWorkCommitConsistencyTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class UnitOfWorkCommitConsistencyTest extends BaseTestCase
2020

2121
public function tearDown(): void
2222
{
23-
$this->dm->getClient()->selectDatabase('admin')->command([
23+
$this->dm->getClient()->getDatabase('admin')->command([
2424
'configureFailPoint' => 'failCommand',
2525
'mode' => 'off',
2626
]);
@@ -449,7 +449,7 @@ protected static function createTestDocumentManager(): DocumentManager
449449

450450
private function createFailpoint(string $commandName): void
451451
{
452-
$this->dm->getClient()->selectDatabase('admin')->command([
452+
$this->dm->getClient()->getDatabase('admin')->command([
453453
'configureFailPoint' => 'failCommand',
454454
'mode' => ['times' => 1],
455455
'data' => [

‎tests/Doctrine/ODM/MongoDB/Tests/UnitOfWorkTransactionalCommitConsistencyTest.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public function setUp(): void
2727

2828
public function tearDown(): void
2929
{
30-
$this->dm->getClient()->selectDatabase('admin')->command([
30+
$this->dm->getClient()->getDatabase('admin')->command([
3131
'configureFailPoint' => 'failCommand',
3232
'mode' => 'off',
3333
]);
@@ -611,7 +611,7 @@ protected static function getConfiguration(): Configuration
611611

612612
private function createTransientFailPoint(string $failCommand, int $times = 1): void
613613
{
614-
$this->dm->getClient()->selectDatabase('admin')->command([
614+
$this->dm->getClient()->getDatabase('admin')->command([
615615
'configureFailPoint' => 'failCommand',
616616
'mode' => ['times' => $times],
617617
'data' => [
@@ -624,7 +624,7 @@ private function createTransientFailPoint(string $failCommand, int $times = 1):
624624

625625
private function createFatalFailPoint(string $failCommand): void
626626
{
627-
$this->dm->getClient()->selectDatabase('admin')->command([
627+
$this->dm->getClient()->getDatabase('admin')->command([
628628
'configureFailPoint' => 'failCommand',
629629
'mode' => ['times' => 1],
630630
'data' => [

0 commit comments

Comments
 (0)