Skip to content

Commit 5beff17

Browse files
authored
Use getDatabase and getCollection (#19)
selectDatabase and selectCollection are deprecated since 1.21 Follows https://github.com/mongodb/mongo-php-library/releases/tag/1.21.0
1 parent 41dc635 commit 5beff17

File tree

8 files changed

+18
-18
lines changed

8 files changed

+18
-18
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ class MyService
131131
## Database Usage
132132

133133
The client service provides access to databases and collections. You can access a database by calling the
134-
`selectDatabase` method, passing the database name and potential options:
134+
`getDatabase` method, passing the database name and potential options:
135135

136136
```php
137137
use MongoDB\Client;
@@ -144,7 +144,7 @@ class MyService
144144
public function __construct(
145145
Client $client,
146146
) {
147-
$this->database = $client->selectDatabase('myDatabase');
147+
$this->database = $client->getDatabase('myDatabase');
148148
}
149149
}
150150
```
@@ -185,7 +185,7 @@ class MyService
185185

186186
## Collection Usage
187187

188-
To inject a collection, you can either call the `selectCollection` method on a `Client` or `Database` instance.
188+
To inject a collection, you can either call the `getCollection` method on a `Client` or `Database` instance.
189189
For convenience, the `#[AutowireCollection]` attribute provides a quicker alternative:
190190

191191
```php

src/Attribute/AutowireCollection.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public function __construct(
6161
: MongoDBExtension::createClientServiceId($client);
6262

6363
parent::__construct(
64-
callable: [new Reference($this->serviceId), 'selectCollection'],
64+
callable: [new Reference($this->serviceId), 'getCollection'],
6565
lazy: $lazy,
6666
);
6767
}

src/Attribute/AutowireDatabase.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public function __construct(
5959
: MongoDBExtension::createClientServiceId($client);
6060

6161
parent::__construct(
62-
callable: [new Reference($this->serviceId), 'selectDatabase'],
62+
callable: [new Reference($this->serviceId), 'getDatabase'],
6363
lazy: $lazy,
6464
);
6565
}

tests/Functional/DataCollector/DriverEventSubscriberTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public function collectCommandEvent(int $clientId, string $requestId, array $dat
3636

3737
public function testCommandSucceeded(): void
3838
{
39-
$this->getClient()->selectCollection('database1', 'collection1')->find();
39+
$this->getClient()->getCollection('database1', 'collection1')->find();
4040

4141
// The 2 events are commandStarted and commandSucceeded
4242
$this->assertCount(2, $this->collector->events);

tests/Functional/FunctionalTestCase.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,9 @@ public function assertNumberOfDocuments(int $expected, string $clientId, string
6868
{
6969
$client = self::getContainer()->get(MongoDBExtension::createClientServiceId($clientId));
7070
assert($client instanceof Client);
71-
$db = $client->selectDatabase($database);
71+
$db = $client->getDatabase($database);
7272
assert($db instanceof Database);
73-
$collection = $db->selectCollection($collection);
73+
$collection = $db->getCollection($collection);
7474
assert($collection instanceof Collection);
7575

7676
$this->assertSame($expected, $collection->countDocuments());
@@ -80,7 +80,7 @@ private function dropDatabase(string $clientId, string $database): void
8080
{
8181
$client = self::getContainer()->get(MongoDBExtension::createClientServiceId($clientId));
8282
assert($client instanceof Client);
83-
$db = $client->selectDatabase($database);
83+
$db = $client->getDatabase($database);
8484
assert($db instanceof Database);
8585
$db->drop();
8686
}

tests/TestApplication/src/Controller/AbstractMongoDBController.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,11 @@ final public function insertDocumentForClient(Client|string $client, ?string $da
6767

6868
assert($database !== null);
6969

70-
$db = $client->selectDatabase($database);
70+
$db = $client->getDatabase($database);
7171
$db->drop();
7272

7373
if (! $collection instanceof Collection) {
74-
$collection = $db->selectCollection($collection);
74+
$collection = $db->getCollection($collection);
7575
}
7676

7777
$collection->insertOne(['foo' => 'bar']);
@@ -80,7 +80,7 @@ final public function insertDocumentForClient(Client|string $client, ?string $da
8080
final public function insertDocumentForDatabase(Database $database, string $collection): void
8181
{
8282
$database->drop();
83-
$collection = $database->selectCollection($collection);
83+
$collection = $database->getCollection($collection);
8484
$collection->insertOne(['foo' => 'bar']);
8585
}
8686

tests/Unit/Attribute/AutowireCollectionTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public function testMinimal(): void
3535
{
3636
$autowire = new AutowireCollection();
3737

38-
$this->assertEquals([new Reference($client = Client::class), 'selectCollection'], $autowire->value);
38+
$this->assertEquals([new Reference($client = Client::class), 'getCollection'], $autowire->value);
3939

4040
$definition = $autowire->buildDefinition(
4141
value: $autowire->value,
@@ -62,7 +62,7 @@ public function testCollection(): void
6262
client: 'default',
6363
);
6464

65-
$this->assertEquals([new Reference('mongodb.client.default'), 'selectCollection'], $autowire->value);
65+
$this->assertEquals([new Reference('mongodb.client.default'), 'getCollection'], $autowire->value);
6666

6767
$definition = $autowire->buildDefinition(
6868
value: $autowire->value,
@@ -88,7 +88,7 @@ public function testWithoutCollection(): void
8888
client: 'default',
8989
);
9090

91-
$this->assertEquals([new Reference('mongodb.client.default'), 'selectCollection'], $autowire->value);
91+
$this->assertEquals([new Reference('mongodb.client.default'), 'getCollection'], $autowire->value);
9292

9393
$definition = $autowire->buildDefinition(
9494
value: $autowire->value,

tests/Unit/Attribute/AutowireDatabaseTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public function testMinimal(): void
3434
{
3535
$autowire = new AutowireDatabase();
3636

37-
$this->assertEquals([new Reference(Client::class), 'selectDatabase'], $autowire->value);
37+
$this->assertEquals([new Reference(Client::class), 'getDatabase'], $autowire->value);
3838

3939
$definition = $autowire->buildDefinition(
4040
value: $autowire->value,
@@ -58,7 +58,7 @@ public function testDatabase(): void
5858
client: 'default',
5959
);
6060

61-
$this->assertEquals([new Reference('mongodb.client.default'), 'selectDatabase'], $autowire->value);
61+
$this->assertEquals([new Reference('mongodb.client.default'), 'getDatabase'], $autowire->value);
6262

6363
$definition = $autowire->buildDefinition(
6464
value: $autowire->value,
@@ -82,7 +82,7 @@ public function testWithoutDatabase(): void
8282
client: 'default',
8383
);
8484

85-
$this->assertEquals([new Reference('mongodb.client.default'), 'selectDatabase'], $autowire->value);
85+
$this->assertEquals([new Reference('mongodb.client.default'), 'getDatabase'], $autowire->value);
8686

8787
$definition = $autowire->buildDefinition(
8888
value: $autowire->value,

0 commit comments

Comments
 (0)