Skip to content

Commit e8eb628

Browse files
committed
MongoDB\Manager no longer has single write methods
See: PHPC-465, HHVM-129
1 parent a033aca commit e8eb628

7 files changed

+35
-10
lines changed

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/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/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)