Skip to content

Commit 184b79b

Browse files
jmikolajmikola
committed
Merge pull request #317 
2 parents 29729c9 + db0e303 commit 184b79b

13 files changed

+25
-25
lines changed

‎src/MongoDB/WriteResult.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ PHONGO_API zend_class_entry *php_phongo_writeresult_ce;
5151

5252
zend_object_handlers php_phongo_handler_writeresult;
5353

54-
/* {{{ proto integer WriteResult::getInsertedCount()
54+
/* {{{ proto integer|null WriteResult::getInsertedCount()
5555
Returns the number of documents that were inserted */
5656
PHP_METHOD(WriteResult, getInsertedCount)
5757
{
@@ -69,7 +69,7 @@ PHP_METHOD(WriteResult, getInsertedCount)
6969
RETURN_LONG_FROM_BSON_INT32(&iter, intern->reply, "nInserted");
7070
}
7171
/* }}} */
72-
/* {{{ proto integer WriteResult::getMatchedCount()
72+
/* {{{ proto integer|null WriteResult::getMatchedCount()
7373
Returns the number of documents that matched the update criteria */
7474
PHP_METHOD(WriteResult, getMatchedCount)
7575
{
@@ -105,7 +105,7 @@ PHP_METHOD(WriteResult, getModifiedCount)
105105
RETURN_LONG_FROM_BSON_INT32(&iter, intern->reply, "nModified");
106106
}
107107
/* }}} */
108-
/* {{{ proto integer WriteResult::getDeletedCount()
108+
/* {{{ proto integer|null WriteResult::getDeletedCount()
109109
Returns the number of documents that were deleted */
110110
PHP_METHOD(WriteResult, getDeletedCount)
111111
{
@@ -123,7 +123,7 @@ PHP_METHOD(WriteResult, getDeletedCount)
123123
RETURN_LONG_FROM_BSON_INT32(&iter, intern->reply, "nRemoved");
124124
}
125125
/* }}} */
126-
/* {{{ proto integer WriteResult::getUpsertedCount()
126+
/* {{{ proto integer|null WriteResult::getUpsertedCount()
127127
Returns the number of documents that were upserted */
128128
PHP_METHOD(WriteResult, getUpsertedCount)
129129
{

‎src/libbson

‎src/libmongoc

Submodule libmongoc updated 59 files

‎tests/manager/manager-executeBulkWrite_error-007.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ echo throws(function() use ($manager, $bulk) {
2828
<?php exit(0); ?>
2929
--EXPECTF--
3030
OK: Got MongoDB\Driver\Exception\ConnectionTimeoutException
31-
No suitable servers found (`serverselectiontryonce` set): %s
31+
No suitable servers found (`serverSelectionTryOnce` set): %s
3232
OK: Got MongoDB\Driver\Exception\ConnectionTimeoutException
33-
No suitable servers found (`serverselectiontryonce` set): %s
33+
No suitable servers found (`serverSelectionTryOnce` set): %s
3434
===DONE===

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ echo throws(function() use ($manager, $command) {
2727
<?php exit(0); ?>
2828
--EXPECTF--
2929
OK: Got MongoDB\Driver\Exception\ConnectionTimeoutException
30-
No suitable servers found (`serverselectiontryonce` set): %s
30+
No suitable servers found (`serverSelectionTryOnce` set): %s
3131
OK: Got MongoDB\Driver\Exception\ConnectionTimeoutException
32-
No suitable servers found (`serverselectiontryonce` set): %s
32+
No suitable servers found (`serverSelectionTryOnce` set): %s
3333
===DONE===

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ echo throws(function() use ($manager, $query) {
2727
<?php exit(0); ?>
2828
--EXPECTF--
2929
OK: Got MongoDB\Driver\Exception\ConnectionTimeoutException
30-
No suitable servers found (`serverselectiontryonce` set): %s
30+
No suitable servers found (`serverSelectionTryOnce` set): %s
3131
OK: Got MongoDB\Driver\Exception\ConnectionTimeoutException
32-
No suitable servers found (`serverselectiontryonce` set): %s
32+
No suitable servers found (`serverSelectionTryOnce` set): %s
3333
===DONE===

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ echo throws(function() use ($manager, $rp) {
2727
<?php exit(0); ?>
2828
--EXPECTF--
2929
OK: Got MongoDB\Driver\Exception\ConnectionTimeoutException
30-
No suitable servers found (`serverselectiontryonce` set): %s
30+
No suitable servers found (`serverSelectionTryOnce` set): %s
3131
OK: Got MongoDB\Driver\Exception\ConnectionTimeoutException
32-
No suitable servers found (`serverselectiontryonce` set): %s
32+
No suitable servers found (`serverSelectionTryOnce` set): %s
3333
===DONE===

‎tests/server/server-executeBulkWrite-002.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ foreach ($writeConcerns as $writeConcern) {
2525
<?php exit(0); ?>
2626
--EXPECT--
2727
bool(false)
28-
int(0)
28+
NULL
2929
bool(true)
3030
int(1)
3131
===DONE===

‎tests/server/server-executeBulkWrite-003.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ foreach ($writeConcerns as $wc) {
2626
<?php exit(0); ?>
2727
--EXPECT--
2828
bool(false)
29-
int(0)
29+
NULL
3030
bool(true)
3131
int(1)
3232
bool(true)

‎tests/server/server-executeBulkWrite-004.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ foreach ($writeConcerns as $wc) {
3333
<?php exit(0); ?>
3434
--EXPECT--
3535
bool(false)
36-
int(0)
36+
NULL
3737
OK: Got MongoDB\Driver\Exception\RuntimeException
3838
not master
3939
OK: Got MongoDB\Driver\Exception\RuntimeException

‎tests/server/server-executeBulkWrite-005.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ $server->executeCommand('local', $command);
3131
<?php exit(0); ?>
3232
--EXPECT--
3333
bool(false)
34-
int(0)
34+
NULL
3535
bool(true)
3636
int(1)
3737
===DONE===

‎tests/standalone/bug0655.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ ini_set('mongodb.debug', 'off');
3636
[%s] PHONGO: DEBUG > Connecting to 'invalid.host:27017[mongodb://invalid.host:27017]'
3737
%a
3838
OK: Got MongoDB\Driver\Exception\ConnectionTimeoutException
39-
No suitable servers found (`serverselectiontryonce` set): %s
39+
No suitable servers found (`serverSelectionTryOnce` set): %s
4040
%a
4141
[%s] PHONGO: DEBUG > Applying connectTimeoutMS: 1
4242
[%s] PHONGO: DEBUG > Connecting to 'localhost:54321[mongodb://localhost:54321]'
4343
%a
4444
OK: Got MongoDB\Driver\Exception\ConnectionTimeoutException
45-
No suitable servers found (`serverselectiontryonce` set): %s
45+
No suitable servers found (`serverSelectionTryOnce` set): %s
4646
===DONE===

‎tests/standalone/writeresult-isacknowledged-003.phpt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ var_dump($result);
2222
WriteResult::isAcknowledged(): false
2323
object(MongoDB\Driver\WriteResult)#%d (%d) {
2424
["nInserted"]=>
25-
int(0)
25+
NULL
2626
["nMatched"]=>
27-
int(0)
27+
NULL
2828
["nModified"]=>
29-
int(0)
29+
NULL
3030
["nRemoved"]=>
31-
int(0)
31+
NULL
3232
["nUpserted"]=>
33-
int(0)
33+
NULL
3434
["upsertedIds"]=>
3535
array(0) {
3636
}

0 commit comments

Comments
 (0)