Skip to content

Commit 26c1d13

Browse files
GromNaNGromNaN
committed
Use ReadPreference::getModeString to compare with string constants
1 parent 1ca89f6 commit 26c1d13

File tree

4 files changed

+14
-14
lines changed

4 files changed

+14
-14
lines changed

‎src/functions.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -578,7 +578,7 @@ function select_server_for_aggregate_write_stage(Manager $manager, array &$optio
578578

579579
/* If there is either no read preference or a primary read preference, there
580580
* is no special server selection logic to apply. */
581-
if ($readPreference === null || $readPreference->getMode() === ReadPreference::PRIMARY) {
581+
if ($readPreference === null || $readPreference->getModeString() === ReadPreference::PRIMARY) {
582582
return select_server($manager, $options);
583583
}
584584

‎tests/ClientTest.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public function testSelectCollectionInheritsOptions(): void
9595
$this->assertInstanceOf(ReadConcern::class, $debug['readConcern']);
9696
$this->assertSame(ReadConcern::LOCAL, $debug['readConcern']->getLevel());
9797
$this->assertInstanceOf(ReadPreference::class, $debug['readPreference']);
98-
$this->assertSame(ReadPreference::SECONDARY_PREFERRED, $debug['readPreference']->getMode());
98+
$this->assertSame(ReadPreference::SECONDARY_PREFERRED, $debug['readPreference']->getModeString());
9999
$this->assertIsArray($debug['typeMap']);
100100
$this->assertSame(['root' => 'array'], $debug['typeMap']);
101101
$this->assertInstanceOf(WriteConcern::class, $debug['writeConcern']);
@@ -118,7 +118,7 @@ public function testSelectCollectionPassesOptions(): void
118118
$this->assertInstanceOf(ReadConcern::class, $debug['readConcern']);
119119
$this->assertSame(ReadConcern::LOCAL, $debug['readConcern']->getLevel());
120120
$this->assertInstanceOf(ReadPreference::class, $debug['readPreference']);
121-
$this->assertSame(ReadPreference::SECONDARY_PREFERRED, $debug['readPreference']->getMode());
121+
$this->assertSame(ReadPreference::SECONDARY_PREFERRED, $debug['readPreference']->getModeString());
122122
$this->assertIsArray($debug['typeMap']);
123123
$this->assertSame(['root' => 'array'], $debug['typeMap']);
124124
$this->assertInstanceOf(WriteConcern::class, $debug['writeConcern']);
@@ -142,7 +142,7 @@ public function testSelectDatabaseInheritsOptions(): void
142142
{
143143
$uriOptions = [
144144
'readConcernLevel' => ReadConcern::LOCAL,
145-
'readPreference' => 'secondaryPreferred',
145+
'readPreference' => ReadPreference::SECONDARY_PREFERRED,
146146
'w' => WriteConcern::MAJORITY,
147147
];
148148

@@ -157,7 +157,7 @@ public function testSelectDatabaseInheritsOptions(): void
157157
$this->assertInstanceOf(ReadConcern::class, $debug['readConcern']);
158158
$this->assertSame(ReadConcern::LOCAL, $debug['readConcern']->getLevel());
159159
$this->assertInstanceOf(ReadPreference::class, $debug['readPreference']);
160-
$this->assertSame(ReadPreference::SECONDARY_PREFERRED, $debug['readPreference']->getMode());
160+
$this->assertSame(ReadPreference::SECONDARY_PREFERRED, $debug['readPreference']->getModeString());
161161
$this->assertIsArray($debug['typeMap']);
162162
$this->assertSame(['root' => 'array'], $debug['typeMap']);
163163
$this->assertInstanceOf(WriteConcern::class, $debug['writeConcern']);
@@ -180,7 +180,7 @@ public function testSelectDatabasePassesOptions(): void
180180
$this->assertInstanceOf(ReadConcern::class, $debug['readConcern']);
181181
$this->assertSame(ReadConcern::LOCAL, $debug['readConcern']->getLevel());
182182
$this->assertInstanceOf(ReadPreference::class, $debug['readPreference']);
183-
$this->assertSame(ReadPreference::SECONDARY_PREFERRED, $debug['readPreference']->getMode());
183+
$this->assertSame(ReadPreference::SECONDARY_PREFERRED, $debug['readPreference']->getModeString());
184184
$this->assertIsArray($debug['typeMap']);
185185
$this->assertSame(['root' => 'array'], $debug['typeMap']);
186186
$this->assertInstanceOf(WriteConcern::class, $debug['writeConcern']);

‎tests/Collection/CollectionFunctionalTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,7 @@ public function testWithOptionsInheritsOptions(): void
386386
$this->assertInstanceOf(ReadConcern::class, $debug['readConcern']);
387387
$this->assertSame(ReadConcern::LOCAL, $debug['readConcern']->getLevel());
388388
$this->assertInstanceOf(ReadPreference::class, $debug['readPreference']);
389-
$this->assertSame(ReadPreference::SECONDARY_PREFERRED, $debug['readPreference']->getMode());
389+
$this->assertSame(ReadPreference::SECONDARY_PREFERRED, $debug['readPreference']->getModeString());
390390
$this->assertIsArray($debug['typeMap']);
391391
$this->assertSame(['root' => 'array'], $debug['typeMap']);
392392
$this->assertInstanceOf(WriteConcern::class, $debug['writeConcern']);
@@ -408,7 +408,7 @@ public function testWithOptionsPassesOptions(): void
408408
$this->assertInstanceOf(ReadConcern::class, $debug['readConcern']);
409409
$this->assertSame(ReadConcern::LOCAL, $debug['readConcern']->getLevel());
410410
$this->assertInstanceOf(ReadPreference::class, $debug['readPreference']);
411-
$this->assertSame(ReadPreference::SECONDARY_PREFERRED, $debug['readPreference']->getMode());
411+
$this->assertSame(ReadPreference::SECONDARY_PREFERRED, $debug['readPreference']->getModeString());
412412
$this->assertIsArray($debug['typeMap']);
413413
$this->assertSame(['root' => 'array'], $debug['typeMap']);
414414
$this->assertInstanceOf(WriteConcern::class, $debug['writeConcern']);

‎tests/Database/DatabaseFunctionalTest.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ public function testSelectCollectionInheritsOptions(): void
301301
$this->assertInstanceOf(ReadConcern::class, $debug['readConcern']);
302302
$this->assertSame(ReadConcern::LOCAL, $debug['readConcern']->getLevel());
303303
$this->assertInstanceOf(ReadPreference::class, $debug['readPreference']);
304-
$this->assertSame(ReadPreference::SECONDARY_PREFERRED, $debug['readPreference']->getMode());
304+
$this->assertSame(ReadPreference::SECONDARY_PREFERRED, $debug['readPreference']->getModeString());
305305
$this->assertIsArray($debug['typeMap']);
306306
$this->assertSame(['root' => 'array'], $debug['typeMap']);
307307
$this->assertInstanceOf(WriteConcern::class, $debug['writeConcern']);
@@ -323,7 +323,7 @@ public function testSelectCollectionPassesOptions(): void
323323
$this->assertInstanceOf(ReadConcern::class, $debug['readConcern']);
324324
$this->assertSame(ReadConcern::LOCAL, $debug['readConcern']->getLevel());
325325
$this->assertInstanceOf(ReadPreference::class, $debug['readPreference']);
326-
$this->assertSame(ReadPreference::SECONDARY_PREFERRED, $debug['readPreference']->getMode());
326+
$this->assertSame(ReadPreference::SECONDARY_PREFERRED, $debug['readPreference']->getModeString());
327327
$this->assertIsArray($debug['typeMap']);
328328
$this->assertSame(['root' => 'array'], $debug['typeMap']);
329329
$this->assertInstanceOf(WriteConcern::class, $debug['writeConcern']);
@@ -349,7 +349,7 @@ public function testSelectGridFSBucketInheritsOptions(): void
349349
$this->assertInstanceOf(ReadConcern::class, $debug['readConcern']);
350350
$this->assertSame(ReadConcern::LOCAL, $debug['readConcern']->getLevel());
351351
$this->assertInstanceOf(ReadPreference::class, $debug['readPreference']);
352-
$this->assertSame(ReadPreference::SECONDARY_PREFERRED, $debug['readPreference']->getMode());
352+
$this->assertSame(ReadPreference::SECONDARY_PREFERRED, $debug['readPreference']->getModeString());
353353
$this->assertInstanceOf(WriteConcern::class, $debug['writeConcern']);
354354
$this->assertSame(WriteConcern::MAJORITY, $debug['writeConcern']->getW());
355355
}
@@ -374,7 +374,7 @@ public function testSelectGridFSBucketPassesOptions(): void
374374
$this->assertInstanceOf(ReadConcern::class, $debug['readConcern']);
375375
$this->assertSame(ReadConcern::LOCAL, $debug['readConcern']->getLevel());
376376
$this->assertInstanceOf(ReadPreference::class, $debug['readPreference']);
377-
$this->assertSame(ReadPreference::SECONDARY_PREFERRED, $debug['readPreference']->getMode());
377+
$this->assertSame(ReadPreference::SECONDARY_PREFERRED, $debug['readPreference']->getModeString());
378378
$this->assertInstanceOf(WriteConcern::class, $debug['writeConcern']);
379379
$this->assertSame(WriteConcern::MAJORITY, $debug['writeConcern']->getW());
380380
}
@@ -397,7 +397,7 @@ public function testWithOptionsInheritsOptions(): void
397397
$this->assertInstanceOf(ReadConcern::class, $debug['readConcern']);
398398
$this->assertSame(ReadConcern::LOCAL, $debug['readConcern']->getLevel());
399399
$this->assertInstanceOf(ReadPreference::class, $debug['readPreference']);
400-
$this->assertSame(ReadPreference::SECONDARY_PREFERRED, $debug['readPreference']->getMode());
400+
$this->assertSame(ReadPreference::SECONDARY_PREFERRED, $debug['readPreference']->getModeString());
401401
$this->assertIsArray($debug['typeMap']);
402402
$this->assertSame(['root' => 'array'], $debug['typeMap']);
403403
$this->assertInstanceOf(WriteConcern::class, $debug['writeConcern']);
@@ -419,7 +419,7 @@ public function testWithOptionsPassesOptions(): void
419419
$this->assertInstanceOf(ReadConcern::class, $debug['readConcern']);
420420
$this->assertSame(ReadConcern::LOCAL, $debug['readConcern']->getLevel());
421421
$this->assertInstanceOf(ReadPreference::class, $debug['readPreference']);
422-
$this->assertSame(ReadPreference::SECONDARY_PREFERRED, $debug['readPreference']->getMode());
422+
$this->assertSame(ReadPreference::SECONDARY_PREFERRED, $debug['readPreference']->getModeString());
423423
$this->assertIsArray($debug['typeMap']);
424424
$this->assertSame(['root' => 'array'], $debug['typeMap']);
425425
$this->assertInstanceOf(WriteConcern::class, $debug['writeConcern']);

0 commit comments

Comments
 (0)