Skip to content

Commit e4c971f

Browse files
authored
Remove usage of deprecated ReadPreference::RP_* constants (#2693)
1 parent 8ac8b3a commit e4c971f

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

tests/Doctrine/ODM/MongoDB/Tests/Functional/ReadPreferenceTest.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public function testHintIsNotSetByDefault(): void
4646

4747
/** @psalm-param ReadPreferenceTagShape[] $tags */
4848
#[DataProvider('provideReadPreferenceHints')]
49-
public function testHintIsSetOnQuery(int $readPreference, array $tags = []): void
49+
public function testHintIsSetOnQuery(string $readPreference, array $tags = []): void
5050
{
5151
$this->skipTestIfSharded(User::class);
5252

@@ -68,17 +68,17 @@ public function testHintIsSetOnQuery(int $readPreference, array $tags = []): voi
6868
public static function provideReadPreferenceHints(): array
6969
{
7070
return [
71-
[ReadPreference::RP_PRIMARY, []],
72-
[ReadPreference::RP_SECONDARY_PREFERRED, []],
73-
[ReadPreference::RP_SECONDARY, [['dc' => 'east'], []]],
71+
[ReadPreference::PRIMARY, []],
72+
[ReadPreference::SECONDARY_PREFERRED, []],
73+
[ReadPreference::SECONDARY, [['dc' => 'east'], []]],
7474
];
7575
}
7676

7777
public function testDocumentLevelReadPreferenceIsSetInCollection(): void
7878
{
7979
$coll = $this->dm->getDocumentCollection(DocumentWithReadPreference::class);
8080

81-
self::assertSame(ReadPreference::RP_NEAREST, $coll->getReadPreference()->getMode());
81+
self::assertSame(ReadPreference::NEAREST, $coll->getReadPreference()->getModeString());
8282
self::assertSame([['dc' => 'east']], $coll->getReadPreference()->getTagSets());
8383
}
8484

@@ -88,7 +88,7 @@ public function testDocumentLevelReadPreferenceIsAppliedInQueryBuilder(): void
8888
->createQueryBuilder()
8989
->getQuery();
9090

91-
$this->assertReadPreferenceHint(ReadPreference::RP_NEAREST, $query->getQuery()['readPreference'], [['dc' => 'east']]);
91+
$this->assertReadPreferenceHint(ReadPreference::NEAREST, $query->getQuery()['readPreference'], [['dc' => 'east']]);
9292
}
9393

9494
public function testDocumentLevelReadPreferenceCanBeOverriddenInQueryBuilder(): void
@@ -98,14 +98,14 @@ public function testDocumentLevelReadPreferenceCanBeOverriddenInQueryBuilder():
9898
->setReadPreference(new ReadPreference('secondary', []))
9999
->getQuery();
100100

101-
$this->assertReadPreferenceHint(ReadPreference::RP_SECONDARY, $query->getQuery()['readPreference']);
101+
$this->assertReadPreferenceHint(ReadPreference::SECONDARY, $query->getQuery()['readPreference']);
102102
}
103103

104104
/** @psalm-param ReadPreferenceTagShape[] $tags */
105-
private function assertReadPreferenceHint(int $mode, ReadPreference $readPreference, array $tags = []): void
105+
private function assertReadPreferenceHint(string $mode, ReadPreference $readPreference, array $tags = []): void
106106
{
107107
self::assertInstanceOf(ReadPreference::class, $readPreference);
108-
self::assertEquals($mode, $readPreference->getMode());
108+
self::assertEquals($mode, $readPreference->getModeString());
109109
self::assertEquals($tags, $readPreference->getTagSets());
110110
}
111111
}

tests/Doctrine/ODM/MongoDB/Tests/Functional/ReferencePrimerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ public function testPrimeReferencesInvokesPrimer(): void
391391

392392
// Note: using a secondary read preference here can cause issues when using transactions
393393
// Using a primaryPreferred works just as well to check if the hint is passed on to the primer
394-
$readPreference = new ReadPreference(ReadPreference::RP_PRIMARY_PREFERRED);
394+
$readPreference = new ReadPreference(ReadPreference::PRIMARY_PREFERRED);
395395
$this->dm->createQueryBuilder(User::class)
396396
->field('account')->prime($primer)
397397
->field('groups')->prime($primer)

tests/Doctrine/ODM/MongoDB/Tests/Query/BuilderTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -675,7 +675,7 @@ public function testSetReadPreference(): void
675675

676676
$readPreference = $qb->debug('readPreference');
677677
self::assertInstanceOf(ReadPreference::class, $readPreference);
678-
self::assertEquals(ReadPreference::RP_SECONDARY, $readPreference->getMode());
678+
self::assertEquals(ReadPreference::SECONDARY, $readPreference->getModeString());
679679
self::assertEquals([['dc' => 'east']], $readPreference->getTagSets());
680680
}
681681

0 commit comments

Comments
 (0)