Skip to content

PHPLIB-318: Remove utility functions to convert read and write concerns to documents #487

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 6, 2018
Merged

PHPLIB-318: Remove utility functions to convert read and write concerns to documents #487

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc7e2ed
PHPLIB-318: Remove utility functions to convert read and write concer…
kvwalker Feb 6, 2018
0a3b2b7
Remove outdated test skips
kvwalker Feb 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 0 additions & 45 deletions src/functions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,25 +165,6 @@ function is_mapreduce_output_inline($out)
return key($out) === 'inline';
}

/**
* Converts a ReadConcern instance to a stdClass for use in a BSON document.
*
* @internal
* @see https://jira.mongodb.org/browse/PHPC-498
* @param ReadConcern $readConcern Read concern
* @return stdClass
*/
function read_concern_as_document(ReadConcern $readConcern)
{
$document = [];

if ($readConcern->getLevel() !== null) {
$document['level'] = $readConcern->getLevel();
}

return (object) $document;
}

/**
* Return whether the server supports a particular feature.
*
Expand Down Expand Up @@ -213,29 +194,3 @@ function is_string_array($input) {
return true;
}

/**
* Converts a WriteConcern instance to a stdClass for use in a BSON document.
*
* @internal
* @see https://jira.mongodb.org/browse/PHPC-498
* @param WriteConcern $writeConcern Write concern
* @return stdClass
*/
function write_concern_as_document(WriteConcern $writeConcern)
{
$document = [];

if ($writeConcern->getW() !== null) {
$document['w'] = $writeConcern->getW();
}

if ($writeConcern->getJournal() !== null) {
$document['j'] = $writeConcern->getJournal();
}

if ($writeConcern->getWtimeout() !== 0) {
$document['wtimeout'] = $writeConcern->getWtimeout();
}

return (object) $document;
}
4 changes: 0 additions & 4 deletions tests/ClientTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,6 @@ public function testToString()

public function testSelectCollectionInheritsOptions()
{
$this->markTestSkipped('Depends on https://jira.mongodb.org/browse/PHPC-523');

$uriOptions = [
'readConcernLevel' => ReadConcern::LOCAL,
'readPreference' => 'secondaryPreferred',
Expand Down Expand Up @@ -112,8 +110,6 @@ public function testGetSelectsDatabaseAndInheritsOptions()

public function testSelectDatabaseInheritsOptions()
{
$this->markTestSkipped('Depends on https://jira.mongodb.org/browse/PHPC-523');

$uriOptions = [
'readConcernLevel' => ReadConcern::LOCAL,
'readPreference' => 'secondaryPreferred',
Expand Down
45 changes: 0 additions & 45 deletions tests/FunctionsTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,49 +134,4 @@ public function provideMapReduceOutValues()
[ ['replace' => 'collectionName'], false ],
];
}

/**
* @dataProvider provideReadConcernsAndDocuments
*/
public function testReadConcernAsDocument(ReadConcern $readConcern, $expectedDocument)
{
$this->assertEquals($expectedDocument, \MongoDB\read_concern_as_document($readConcern));
}

public function provideReadConcernsAndDocuments()
{
return [
[ new ReadConcern, (object) [] ],
[ new ReadConcern(ReadConcern::LOCAL), (object) ['level' => ReadConcern::LOCAL] ],
[ new ReadConcern(ReadConcern::MAJORITY), (object) ['level' => ReadConcern::MAJORITY] ],
];
}

/**
* @dataProvider provideWriteConcernsAndDocuments
*/
public function testWriteConcernAsDocument(WriteConcern $writeConcern, $expectedDocument)
{
$this->assertEquals($expectedDocument, \MongoDB\write_concern_as_document($writeConcern));
}

public function provideWriteConcernsAndDocuments()
{
return [
[ new WriteConcern(-3), (object) ['w' => 'majority'] ], // MONGOC_WRITE_CONCERN_W_MAJORITY
[ new WriteConcern(-2), (object) [] ], // MONGOC_WRITE_CONCERN_W_DEFAULT
[ new WriteConcern(-1), (object) ['w' => -1] ],
[ new WriteConcern(0), (object) ['w' => 0] ],
[ new WriteConcern(1), (object) ['w' => 1] ],
[ new WriteConcern('majority'), (object) ['w' => 'majority'] ],
[ new WriteConcern('tag'), (object) ['w' => 'tag'] ],
[ new WriteConcern(1, 0), (object) ['w' => 1] ],
[ new WriteConcern(1, 0, false), (object) ['w' => 1, 'j' => false] ],
[ new WriteConcern(1, 1000), (object) ['w' => 1, 'wtimeout' => 1000] ],
[ new WriteConcern(1, 1000, true), (object) ['w' => 1, 'wtimeout' => 1000, 'j' => true] ],
[ new WriteConcern(-2, 0, true), (object) ['j' => true] ],
// Note: wtimeout is only applicable applies for w > 1
[ new WriteConcern(-2, 1000), (object) ['wtimeout' => 1000] ],
];
}
}