Skip to content

Fixed PHPLIB-108: Library relies on BSON being a vendor prefix, while our vendor should be MongoDB #19

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

Closed
wants to merge 2 commits into from
Closed

Fixed PHPLIB-108: Library relies on BSON being a vendor prefix, while our vendor should be MongoDB #19

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
be1df64
Fixed PHPLIB-108: Library relies on BSON being a vendor prefix, while…
derickr Jun 10, 2015
82c6045
Removed odd new function
derickr Jun 30, 2015
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
2 changes: 1 addition & 1 deletion src/BulkWriteResult.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace MongoDB;

use BSON\ObjectId;
use MongoDB\BSON\ObjectId;
use MongoDB\Driver\WriteResult;

/**
Expand Down
2 changes: 1 addition & 1 deletion src/Model/IndexInput.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace MongoDB\Model;

use BSON\Serializable;
use MongoDB\BSON\Serializable;
use MongoDB\Exception\InvalidArgumentException;
use MongoDB\Exception\UnexpectedTypeException;

Expand Down
6 changes: 3 additions & 3 deletions tests/Collection/BulkWriteFunctionalTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public function testInserts()

$insertedIds = $result->getInsertedIds();
$this->assertSame(1, $insertedIds[0]);
$this->assertInstanceOf('BSON\ObjectId', $insertedIds[1]);
$this->assertInstanceOf('MongoDB\BSON\ObjectId', $insertedIds[1]);

$expected = array(
array('_id' => $insertedIds[0], 'x' => 11),
Expand Down Expand Up @@ -58,7 +58,7 @@ public function testUpdates()

$upsertedIds = $result->getUpsertedIds();
$this->assertSame(5, $upsertedIds[2]);
$this->assertInstanceOf('BSON\ObjectId', $upsertedIds[3]);
$this->assertInstanceOf('MongoDB\BSON\ObjectId', $upsertedIds[3]);

$expected = array(
array('_id' => 1, 'x' => 11),
Expand Down Expand Up @@ -215,4 +215,4 @@ private function createFixtures($n)

$this->assertEquals($n, $result->getInsertedCount());
}
}
}
2 changes: 1 addition & 1 deletion tests/Model/IndexInputTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ public function testBsonSerialization()
'ns' => 'foo.bar',
));

$this->assertInstanceOf('BSON\Serializable', $indexInput);
$this->assertInstanceOf('MongoDB\BSON\Serializable', $indexInput);
$this->assertEquals($expected, $indexInput->bsonSerialize());
}
}