Skip to content

Commit aa5d50c

Browse files
jmikolajmikola
committed
Merge pull request #322 
2 parents 38b55d3 + c0046a3 commit aa5d50c

9 files changed

+124
-14
lines changed

‎tests/cursor/cursor-isDead-001.phpt

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--TEST--
2-
MongoDB\Driver\Cursor::isDead()
2+
MongoDB\Driver\Cursor::isDead() with basic iteration (find command)
33
--SKIPIF--
44
<?php require __DIR__ . "/../utils/basic-skipif.inc"; CLEANUP(STANDALONE) ?>
55
--FILE--
@@ -9,22 +9,25 @@ require_once __DIR__ . "/../utils/basic.inc";
99
$manager = new MongoDB\Driver\Manager(STANDALONE);
1010

1111
$bulk = new MongoDB\Driver\BulkWrite();
12-
$bulk->insert(array('_id' => 1));
13-
$bulk->insert(array('_id' => 2));
14-
$bulk->insert(array('_id' => 3));
12+
$bulk->insert(['_id' => 1]);
13+
$bulk->insert(['_id' => 2]);
14+
$bulk->insert(['_id' => 3]);
1515
$manager->executeBulkWrite(NS, $bulk);
1616

17-
$cursor = $manager->executeQuery(NS, new MongoDB\Driver\Query(array(), array('batchSize' => 2)));
17+
$cursor = $manager->executeQuery(NS, new MongoDB\Driver\Query([], ['batchSize' => 2]));
1818

1919
foreach ($cursor as $_) {
2020
var_dump($cursor->isDead());
2121
}
2222

23+
var_dump($cursor->isDead());
24+
2325
?>
2426
===DONE===
2527
<?php exit(0); ?>
2628
--EXPECT--
2729
bool(false)
2830
bool(false)
31+
bool(false)
2932
bool(true)
3033
===DONE===

‎tests/cursor/cursor-isDead-002.phpt

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
--TEST--
2+
MongoDB\Driver\Cursor::isDead() with IteratorIterator (find command)
3+
--SKIPIF--
4+
<?php require __DIR__ . "/../utils/basic-skipif.inc"; CLEANUP(STANDALONE) ?>
5+
--FILE--
6+
<?php
7+
require_once __DIR__ . "/../utils/basic.inc";
8+
9+
$manager = new MongoDB\Driver\Manager(STANDALONE);
10+
11+
$bulk = new MongoDB\Driver\BulkWrite();
12+
$bulk->insert(['_id' => 1]);
13+
$bulk->insert(['_id' => 2]);
14+
$bulk->insert(['_id' => 3]);
15+
$manager->executeBulkWrite(NS, $bulk);
16+
17+
$cursor = $manager->executeQuery(NS, new MongoDB\Driver\Query([], ['batchSize' => 2]));
18+
19+
$iterator = new IteratorIterator($cursor);
20+
$iterator->rewind();
21+
22+
for ($i = 0; $i < 3; $i++) {
23+
var_dump($cursor->isDead());
24+
$iterator->next();
25+
}
26+
27+
var_dump($cursor->isDead());
28+
29+
?>
30+
===DONE===
31+
<?php exit(0); ?>
32+
--EXPECT--
33+
bool(false)
34+
bool(false)
35+
bool(false)
36+
bool(true)
37+
===DONE===

‎tests/cursor/cursor-isDead-003.phpt

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
--TEST--
2+
MongoDB\Driver\Cursor::isDead() with basic iteration (OP_QUERY)
3+
--SKIPIF--
4+
<?php require __DIR__ . "/../utils/basic-skipif.inc"; CLEANUP(STANDALONE_30) ?>
5+
--FILE--
6+
<?php
7+
require_once __DIR__ . "/../utils/basic.inc";
8+
9+
$manager = new MongoDB\Driver\Manager(STANDALONE_30);
10+
11+
$bulk = new MongoDB\Driver\BulkWrite();
12+
$bulk->insert(['_id' => 1]);
13+
$bulk->insert(['_id' => 2]);
14+
$bulk->insert(['_id' => 3]);
15+
$manager->executeBulkWrite(NS, $bulk);
16+
17+
$cursor = $manager->executeQuery(NS, new MongoDB\Driver\Query([], ['batchSize' => 2]));
18+
19+
foreach ($cursor as $_) {
20+
var_dump($cursor->isDead());
21+
}
22+
23+
var_dump($cursor->isDead());
24+
25+
?>
26+
===DONE===
27+
<?php exit(0); ?>
28+
--EXPECT--
29+
bool(false)
30+
bool(false)
31+
bool(false)
32+
bool(true)
33+
===DONE===

‎tests/cursor/cursor-isDead-004.phpt

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
--TEST--
2+
MongoDB\Driver\Cursor::isDead() with IteratorIterator (OP_QUERY)
3+
--SKIPIF--
4+
<?php require __DIR__ . "/../utils/basic-skipif.inc"; CLEANUP(STANDALONE_30) ?>
5+
--FILE--
6+
<?php
7+
require_once __DIR__ . "/../utils/basic.inc";
8+
9+
$manager = new MongoDB\Driver\Manager(STANDALONE_30);
10+
11+
$bulk = new MongoDB\Driver\BulkWrite();
12+
$bulk->insert(['_id' => 1]);
13+
$bulk->insert(['_id' => 2]);
14+
$bulk->insert(['_id' => 3]);
15+
$manager->executeBulkWrite(NS, $bulk);
16+
17+
$cursor = $manager->executeQuery(NS, new MongoDB\Driver\Query([], ['batchSize' => 2]));
18+
19+
$iterator = new IteratorIterator($cursor);
20+
$iterator->rewind();
21+
22+
for ($i = 0; $i < 3; $i++) {
23+
var_dump($cursor->isDead());
24+
$iterator->next();
25+
}
26+
27+
var_dump($cursor->isDead());
28+
29+
?>
30+
===DONE===
31+
<?php exit(0); ?>
32+
--EXPECT--
33+
bool(false)
34+
bool(false)
35+
bool(false)
36+
bool(true)
37+
===DONE===

‎tests/manager/manager-executeCommand-001.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ object(MongoDB\Driver\Cursor)#%d (%d) {
5454
["readPreference"]=>
5555
NULL
5656
["isDead"]=>
57-
bool(true)
57+
bool(false)
5858
["currentIndex"]=>
5959
int(0)
6060
["currentDocument"]=>

‎tests/manager/manager-executeQuery-001.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ object(MongoDB\Driver\Cursor)#%d (%d) {
7171
["readPreference"]=>
7272
NULL
7373
["isDead"]=>
74-
bool(true)
74+
bool(false)
7575
["currentIndex"]=>
7676
int(0)
7777
["currentDocument"]=>

‎tests/manager/manager-executeQuery-002.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ object(MongoDB\Driver\Cursor)#%d (%d) {
7070
["readPreference"]=>
7171
NULL
7272
["isDead"]=>
73-
bool(true)
73+
bool(false)
7474
["currentIndex"]=>
7575
int(0)
7676
["currentDocument"]=>

‎tests/readPreference/bug0146-002.phpt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ object(MongoDB\Driver\Cursor)#%d (%d) {
6969
}
7070
}
7171
["isDead"]=>
72-
bool(true)
72+
bool(false)
7373
["currentIndex"]=>
7474
int(0)
7575
["currentDocument"]=>
@@ -118,7 +118,7 @@ object(MongoDB\Driver\Cursor)#%d (%d) {
118118
}
119119
}
120120
["isDead"]=>
121-
bool(true)
121+
bool(false)
122122
["currentIndex"]=>
123123
int(0)
124124
["currentDocument"]=>
@@ -167,7 +167,7 @@ object(MongoDB\Driver\Cursor)#%d (%d) {
167167
}
168168
}
169169
["isDead"]=>
170-
bool(true)
170+
bool(false)
171171
["currentIndex"]=>
172172
int(0)
173173
["currentDocument"]=>
@@ -216,7 +216,7 @@ object(MongoDB\Driver\Cursor)#%d (%d) {
216216
}
217217
}
218218
["isDead"]=>
219-
bool(true)
219+
bool(false)
220220
["currentIndex"]=>
221221
int(0)
222222
["currentDocument"]=>
@@ -265,7 +265,7 @@ object(MongoDB\Driver\Cursor)#%d (%d) {
265265
}
266266
}
267267
["isDead"]=>
268-
bool(true)
268+
bool(false)
269269
["currentIndex"]=>
270270
int(0)
271271
["currentDocument"]=>

‎tests/server/server-executeCommand-001.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ object(MongoDB\Driver\Cursor)#%d (%d) {
4343
["readPreference"]=>
4444
NULL
4545
["isDead"]=>
46-
bool(true)
46+
bool(false)
4747
["currentIndex"]=>
4848
int(0)
4949
["currentDocument"]=>

0 commit comments

Comments
 (0)