Skip to content

Commit 303de40

Browse files
jmikolajmikola
committed
Merge pull request #42 
2 parents 6693f5f + 66189d6 commit 303de40

19 files changed

+53
-95
lines changed

‎.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ env:
1212
- MONGO_REPO_TYPE="precise/mongodb-enterprise/"
1313
- SOURCES_LOC="/etc/apt/sources.list.d/mongodb.list"
1414
matrix:
15-
- DRIVER_VERSION=beta SERVER_VERSION=2.4
16-
- DRIVER_VERSION=beta SERVER_VERSION=2.6
17-
- DRIVER_VERSION=beta SERVER_VERSION=3.0
15+
- DRIVER_VERSION=1.0 SERVER_VERSION=2.4
16+
- DRIVER_VERSION=1.0 SERVER_VERSION=2.6
17+
- DRIVER_VERSION=1.0 SERVER_VERSION=3.0
1818

1919
before_install:
2020
- sudo apt-key adv --keyserver ${KEY_SERVER} --recv 7F0CEB10

‎src/Client.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ public function listDatabases(array $options = array())
7575
public function selectCollection($databaseName, $collectionName, WriteConcern $writeConcern = null, ReadPreference $readPreference = null)
7676
{
7777
$namespace = $databaseName . '.' . $collectionName;
78-
$writeConcern = $writeConcern ?: \MongoDB\get_manager_write_concern($this->manager);
79-
$readPreference = $readPreference ?: \MongoDB\get_manager_read_preference($this->manager);
78+
$writeConcern = $writeConcern ?: $this->manager->getWriteConcern();
79+
$readPreference = $readPreference ?: $this->manager->getReadPreference();
8080

8181
return new Collection($this->manager, $namespace, $writeConcern, $readPreference);
8282
}
@@ -94,8 +94,8 @@ public function selectCollection($databaseName, $collectionName, WriteConcern $w
9494
*/
9595
public function selectDatabase($databaseName, WriteConcern $writeConcern = null, ReadPreference $readPreference = null)
9696
{
97-
$writeConcern = $writeConcern ?: \MongoDB\get_manager_write_concern($this->manager);
98-
$readPreference = $readPreference ?: \MongoDB\get_manager_read_preference($this->manager);
97+
$writeConcern = $writeConcern ?: $this->manager->getWriteConcern();
98+
$readPreference = $readPreference ?: $this->manager->getReadPreference();
9999

100100
return new Database($this->manager, $databaseName, $writeConcern, $readPreference);
101101
}

‎src/Collection.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ public function __construct(Manager $manager, $namespace, WriteConcern $writeCon
6666
$this->collectionName = $parts[1];
6767

6868
$this->manager = $manager;
69-
$this->writeConcern = $writeConcern ?: \MongoDB\get_manager_write_concern($this->manager);
70-
$this->readPreference = $readPreference ?: \MongoDB\get_manager_read_preference($this->manager);
69+
$this->writeConcern = $writeConcern ?: $this->manager->getWriteConcern();
70+
$this->readPreference = $readPreference ?: $this->manager->getReadPreference();
7171
}
7272

7373
/**

‎src/Database.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ public function __construct(Manager $manager, $databaseName, WriteConcern $write
4444

4545
$this->manager = $manager;
4646
$this->databaseName = (string) $databaseName;
47-
$this->writeConcern = $writeConcern ?: \MongoDB\get_manager_write_concern($this->manager);
48-
$this->readPreference = $readPreference ?: \MongoDB\get_manager_read_preference($this->manager);
47+
$this->writeConcern = $writeConcern ?: $this->manager->getWriteConcern();
48+
$this->readPreference = $readPreference ?: $this->manager->getReadPreference();
4949
}
5050

5151
/**

‎src/Operation/BulkWrite.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ public function __construct($databaseName, $collectionName, array $operations, a
207207
*/
208208
public function execute(Server $server)
209209
{
210-
$bulk = new Bulk($this->options['ordered']);
210+
$bulk = new Bulk(['ordered' => $this->options['ordered']]);
211211
$insertedIds = array();
212212

213213
foreach ($this->operations as $i => $operation) {

‎src/Operation/CreateIndexes.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ private function executeCommand(Server $server)
107107
*/
108108
private function executeLegacy(Server $server)
109109
{
110-
$bulk = new Bulk(true);
110+
$bulk = new Bulk(['ordered' => true]);
111111

112112
foreach ($this->indexes as $index) {
113113
$bulk->insert($index);

‎src/Operation/InsertMany.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public function __construct($databaseName, $collectionName, array $documents, ar
8787
*/
8888
public function execute(Server $server)
8989
{
90-
$bulk = new Bulk($this->options['ordered']);
90+
$bulk = new Bulk(['ordered' => $this->options['ordered']]);
9191
$insertedIds = array();
9292

9393
foreach ($this->documents as $i => $document) {

‎src/functions.php

Lines changed: 0 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,8 @@
22

33
namespace MongoDB;
44

5-
use MongoDB\Driver\Manager;
6-
use MongoDB\Driver\ReadPreference;
75
use MongoDB\Driver\Server;
8-
use MongoDB\Driver\WriteConcern;
96
use MongoDB\Exception\InvalidArgumentTypeException;
10-
use ReflectionClass;
117

128
/**
139
* Return whether the first key in the document starts with a "$" character.
@@ -57,69 +53,6 @@ function is_last_pipeline_operator_out(array $pipeline)
5753
return key($lastOp) === '$out';
5854
}
5955

60-
/**
61-
* Returns a ReadPreference corresponding to the Manager's read preference.
62-
*
63-
* @internal
64-
* @todo this function can be removed once PHPC-417 is implemented
65-
* @param Manager $manager
66-
* @return ReadPreference
67-
*/
68-
function get_manager_read_preference(Manager $manager)
69-
{
70-
$rp = $manager->getReadPreference();
71-
72-
if ($rp instanceof ReadPreference) {
73-
return $rp;
74-
}
75-
76-
$args = array(
77-
$rp['mode'],
78-
);
79-
80-
if (isset($rp['tags'])) {
81-
$args[] = $rp['tags'];
82-
}
83-
84-
$rc = new ReflectionClass('MongoDB\Driver\ReadPreference');
85-
86-
return $rc->newInstanceArgs($args);
87-
}
88-
89-
/**
90-
* Returns a WriteConcern corresponding to the Manager's write concern.
91-
*
92-
* @internal
93-
* @todo this function can be removed once PHPC-417 is implemented
94-
* @param Manager $manager
95-
* @return WriteConcern
96-
*/
97-
function get_manager_write_concern(Manager $manager)
98-
{
99-
$wc = $manager->getWriteConcern();
100-
101-
if ($wc instanceof WriteConcern) {
102-
return $wc;
103-
}
104-
105-
$args = array(
106-
isset($wc['w']) ? $wc['w'] : -2,
107-
$wc['wtimeout'],
108-
);
109-
110-
if (isset($wc['journal'])) {
111-
$args[] = $wc['journal'];
112-
113-
if (isset($wc['fsync'])) {
114-
$args[] = $wc['fsync'];
115-
}
116-
}
117-
118-
$rc = new ReflectionClass('MongoDB\Driver\WriteConcern');
119-
120-
return $rc->newInstanceArgs($args);
121-
}
122-
12356
/**
12457
* Generate an index name from a key specification.
12558
*

‎tests/ClientFunctionalTest.php

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
namespace MongoDB\Tests;
44

55
use MongoDB\Client;
6+
use MongoDB\Driver\BulkWrite;
67
use MongoDB\Driver\Command;
78
use MongoDB\Model\DatabaseInfo;
89

@@ -23,7 +24,10 @@ public function setUp()
2324

2425
public function testDropDatabase()
2526
{
26-
$writeResult = $this->manager->executeInsert($this->getNamespace(), array('x' => 1));
27+
$bulkWrite = new BulkWrite();
28+
$bulkWrite->insert(['x' => 1]);
29+
30+
$writeResult = $this->manager->executeBulkWrite($this->getNamespace(), $bulkWrite);
2731
$this->assertEquals(1, $writeResult->getInsertedCount());
2832

2933
$commandResult = $this->client->dropDatabase($this->getDatabaseName());
@@ -33,7 +37,10 @@ public function testDropDatabase()
3337

3438
public function testListDatabases()
3539
{
36-
$writeResult = $this->manager->executeInsert($this->getNamespace(), array('x' => 1));
40+
$bulkWrite = new BulkWrite();
41+
$bulkWrite->insert(['x' => 1]);
42+
43+
$writeResult = $this->manager->executeBulkWrite($this->getNamespace(), $bulkWrite);
3744
$this->assertEquals(1, $writeResult->getInsertedCount());
3845

3946
$databases = $this->client->listDatabases();

‎tests/Collection/BulkWriteFunctionalTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ public function testReplaceOneRequiresReplacementDocument()
202202
*/
203203
private function createFixtures($n)
204204
{
205-
$bulkWrite = new BulkWrite(true);
205+
$bulkWrite = new BulkWrite(['ordered' => true]);
206206

207207
for ($i = 1; $i <= $n; $i++) {
208208
$bulkWrite->insert(array(

‎tests/Collection/CollectionFunctionalTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public function testFindOne()
8383
*/
8484
private function createFixtures($n)
8585
{
86-
$bulkWrite = new BulkWrite(true);
86+
$bulkWrite = new BulkWrite(['ordered' => true]);
8787

8888
for ($i = 1; $i <= $n; $i++) {
8989
$bulkWrite->insert(array(

‎tests/Collection/CrudSpec/FunctionalTestCase.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ abstract class FunctionalTestCase extends BaseFunctionalTestCase
1717
*/
1818
protected function createFixtures($n)
1919
{
20-
$bulkWrite = new BulkWrite(true);
20+
$bulkWrite = new BulkWrite(['ordered' => true]);
2121

2222
for ($i = 1; $i <= $n; $i++) {
2323
$bulkWrite->insert(array(

‎tests/Database/CollectionManagementFunctionalTest.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace MongoDB\Tests\Database;
44

5+
use MongoDB\Driver\BulkWrite;
56
use MongoDB\Model\CollectionInfo;
67
use InvalidArgumentException;
78

@@ -39,7 +40,10 @@ public function testCreateCollection()
3940

4041
public function testDropCollection()
4142
{
42-
$writeResult = $this->manager->executeInsert($this->getNamespace(), array('x' => 1));
43+
$bulkWrite = new BulkWrite();
44+
$bulkWrite->insert(['x' => 1]);
45+
46+
$writeResult = $this->manager->executeBulkWrite($this->getNamespace(), $bulkWrite);
4347
$this->assertEquals(1, $writeResult->getInsertedCount());
4448

4549
$commandResult = $this->database->dropCollection($this->getCollectionName());

‎tests/Database/DatabaseFunctionalTest.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
namespace MongoDB\Tests\Database;
44

55
use MongoDB\Database;
6+
use MongoDB\Driver\BulkWrite;
67

78
/**
89
* Functional tests for the Database class.
@@ -39,7 +40,10 @@ public function getGetDatabaseName()
3940

4041
public function testDrop()
4142
{
42-
$writeResult = $this->manager->executeInsert($this->getNamespace(), array('x' => 1));
43+
$bulkWrite = new BulkWrite();
44+
$bulkWrite->insert(['x' => 1]);
45+
46+
$writeResult = $this->manager->executeBulkWrite($this->getNamespace(), $bulkWrite);
4347
$this->assertEquals(1, $writeResult->getInsertedCount());
4448

4549
$commandResult = $this->database->drop();

‎tests/Operation/DropCollectionFunctionalTest.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,19 @@
44

55
use MongoDB\Driver\Server;
66
use MongoDB\Operation\DropCollection;
7+
use MongoDB\Operation\InsertOne;
78
use MongoDB\Operation\ListCollections;
89

910
class DropCollectionFunctionalTest extends FunctionalTestCase
1011
{
1112
public function testDropExistingCollection()
1213
{
13-
$writeResult = $this->manager->executeInsert($this->getNamespace(), array('x' => 1));
14+
$server = $this->getPrimaryServer();
15+
16+
$insertOne = new InsertOne($this->getDatabaseName(), $this->getCollectionName(), ['x' => 1]);
17+
$writeResult = $insertOne->execute($server);
1418
$this->assertEquals(1, $writeResult->getInsertedCount());
1519

16-
$server = $this->getPrimaryServer();
1720
$operation = new DropCollection($this->getDatabaseName(), $this->getCollectionName());
1821
$operation->execute($server);
1922

‎tests/Operation/DropDatabaseFunctionalTest.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,19 @@
44

55
use MongoDB\Driver\Server;
66
use MongoDB\Operation\DropDatabase;
7+
use MongoDB\Operation\InsertOne;
78
use MongoDB\Operation\ListDatabases;
89

910
class DropDatabaseFunctionalTest extends FunctionalTestCase
1011
{
1112
public function testDropExistingDatabase()
1213
{
13-
$writeResult = $this->manager->executeInsert($this->getNamespace(), array('x' => 1));
14+
$server = $this->getPrimaryServer();
15+
16+
$insertOne = new InsertOne($this->getDatabaseName(), $this->getCollectionName(), ['x' => 1]);
17+
$writeResult = $insertOne->execute($server);
1418
$this->assertEquals(1, $writeResult->getInsertedCount());
1519

16-
$server = $this->getPrimaryServer();
1720
$operation = new DropDatabase($this->getDatabaseName());
1821
$operation->execute($server);
1922

‎tests/Operation/FindOneFunctionalTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public function provideTypeMapOptionsAndExpectedDocument()
4545
*/
4646
private function createFixtures($n)
4747
{
48-
$bulkWrite = new BulkWrite(true);
48+
$bulkWrite = new BulkWrite(['ordered' => true]);
4949

5050
for ($i = 1; $i <= $n; $i++) {
5151
$bulkWrite->insert([

‎tests/Operation/ListCollectionsFunctionalTest.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
use MongoDB\Driver\Server;
66
use MongoDB\Operation\DropDatabase;
7+
use MongoDB\Operation\InsertOne;
78
use MongoDB\Operation\ListCollections;
89

910
class ListCollectionsFunctionalTest extends FunctionalTestCase
@@ -15,7 +16,8 @@ public function testListCollectionsForNewlyCreatedDatabase()
1516
$operation = new DropDatabase($this->getDatabaseName());
1617
$operation->execute($server);
1718

18-
$writeResult = $this->manager->executeInsert($this->getNamespace(), ['x' => 1]);
19+
$insertOne = new InsertOne($this->getDatabaseName(), $this->getCollectionName(), ['x' => 1]);
20+
$writeResult = $insertOne->execute($server);
1921
$this->assertEquals(1, $writeResult->getInsertedCount());
2022

2123
$operation = new ListCollections($this->getDatabaseName(), ['filter' => ['name' => $this->getCollectionName()]]);

‎tests/Operation/ListIndexesFunctionalTest.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
use MongoDB\Driver\Server;
66
use MongoDB\Operation\DropCollection;
7+
use MongoDB\Operation\InsertOne;
78
use MongoDB\Operation\ListIndexes;
89

910
class ListIndexesFunctionalTest extends FunctionalTestCase
@@ -15,7 +16,8 @@ public function testListIndexesForNewlyCreatedCollection()
1516
$operation = new DropCollection($this->getDatabaseName(), $this->getCollectionName());
1617
$operation->execute($server);
1718

18-
$writeResult = $this->manager->executeInsert($this->getNamespace(), ['x' => 1]);
19+
$insertOne = new InsertOne($this->getDatabaseName(), $this->getCollectionName(), ['x' => 1]);
20+
$writeResult = $insertOne->execute($server);
1921
$this->assertEquals(1, $writeResult->getInsertedCount());
2022

2123
$operation = new ListIndexes($this->getDatabaseName(), $this->getCollectionName());

0 commit comments

Comments
 (0)