Skip to content
Browse files

Merge pull request #317

  • Loading branch information...
2 parents 29729c9 + db0e303 commit 184b79b9047f984e53267de6b44cfbb7c68e8749 @jmikola jmikola committed May 3, 2016
View
8 src/MongoDB/WriteResult.c
@@ -51,7 +51,7 @@ PHONGO_API zend_class_entry *php_phongo_writeresult_ce;
zend_object_handlers php_phongo_handler_writeresult;
-/* {{{ proto integer WriteResult::getInsertedCount()
+/* {{{ proto integer|null WriteResult::getInsertedCount()
Returns the number of documents that were inserted */
PHP_METHOD(WriteResult, getInsertedCount)
{
@@ -69,7 +69,7 @@ PHP_METHOD(WriteResult, getInsertedCount)
RETURN_LONG_FROM_BSON_INT32(&iter, intern->reply, "nInserted");
}
/* }}} */
-/* {{{ proto integer WriteResult::getMatchedCount()
+/* {{{ proto integer|null WriteResult::getMatchedCount()
Returns the number of documents that matched the update criteria */
PHP_METHOD(WriteResult, getMatchedCount)
{
@@ -105,7 +105,7 @@ PHP_METHOD(WriteResult, getModifiedCount)
RETURN_LONG_FROM_BSON_INT32(&iter, intern->reply, "nModified");
}
/* }}} */
-/* {{{ proto integer WriteResult::getDeletedCount()
+/* {{{ proto integer|null WriteResult::getDeletedCount()
Returns the number of documents that were deleted */
PHP_METHOD(WriteResult, getDeletedCount)
{
@@ -123,7 +123,7 @@ PHP_METHOD(WriteResult, getDeletedCount)
RETURN_LONG_FROM_BSON_INT32(&iter, intern->reply, "nRemoved");
}
/* }}} */
-/* {{{ proto integer WriteResult::getUpsertedCount()
+/* {{{ proto integer|null WriteResult::getUpsertedCount()
Returns the number of documents that were upserted */
PHP_METHOD(WriteResult, getUpsertedCount)
{
2 src/libbson
@@ -1 +1 @@
-Subproject commit ab2ee5ba73c6e38263bfd6de892c0e22b128a809
+Subproject commit 8d8bf379efbd61fcaa1c22bb4d2cbf0f502ac823
2 src/libmongoc
@@ -1 +1 @@
-Subproject commit 62e680aa26754ef8dbdb2709aac4d2488507872a
+Subproject commit 9a31e4c9adc8159ce64d43942b86999eab0eb940
View
4 tests/manager/manager-executeBulkWrite_error-007.phpt
@@ -28,7 +28,7 @@ echo throws(function() use ($manager, $bulk) {
<?php exit(0); ?>
--EXPECTF--
OK: Got MongoDB\Driver\Exception\ConnectionTimeoutException
-No suitable servers found (`serverselectiontryonce` set): %s
+No suitable servers found (`serverSelectionTryOnce` set): %s
OK: Got MongoDB\Driver\Exception\ConnectionTimeoutException
-No suitable servers found (`serverselectiontryonce` set): %s
+No suitable servers found (`serverSelectionTryOnce` set): %s
===DONE===
View
4 tests/manager/manager-executeCommand_error-001.phpt
@@ -27,7 +27,7 @@ echo throws(function() use ($manager, $command) {
<?php exit(0); ?>
--EXPECTF--
OK: Got MongoDB\Driver\Exception\ConnectionTimeoutException
-No suitable servers found (`serverselectiontryonce` set): %s
+No suitable servers found (`serverSelectionTryOnce` set): %s
OK: Got MongoDB\Driver\Exception\ConnectionTimeoutException
-No suitable servers found (`serverselectiontryonce` set): %s
+No suitable servers found (`serverSelectionTryOnce` set): %s
===DONE===
View
4 tests/manager/manager-executeQuery_error-001.phpt
@@ -27,7 +27,7 @@ echo throws(function() use ($manager, $query) {
<?php exit(0); ?>
--EXPECTF--
OK: Got MongoDB\Driver\Exception\ConnectionTimeoutException
-No suitable servers found (`serverselectiontryonce` set): %s
+No suitable servers found (`serverSelectionTryOnce` set): %s
OK: Got MongoDB\Driver\Exception\ConnectionTimeoutException
-No suitable servers found (`serverselectiontryonce` set): %s
+No suitable servers found (`serverSelectionTryOnce` set): %s
===DONE===
View
4 tests/manager/manager-selectserver_error-001.phpt
@@ -27,7 +27,7 @@ echo throws(function() use ($manager, $rp) {
<?php exit(0); ?>
--EXPECTF--
OK: Got MongoDB\Driver\Exception\ConnectionTimeoutException
-No suitable servers found (`serverselectiontryonce` set): %s
+No suitable servers found (`serverSelectionTryOnce` set): %s
OK: Got MongoDB\Driver\Exception\ConnectionTimeoutException
-No suitable servers found (`serverselectiontryonce` set): %s
+No suitable servers found (`serverSelectionTryOnce` set): %s
===DONE===
View
2 tests/server/server-executeBulkWrite-002.phpt
@@ -25,7 +25,7 @@ foreach ($writeConcerns as $writeConcern) {
<?php exit(0); ?>
--EXPECT--
bool(false)
-int(0)
+NULL
bool(true)
int(1)
===DONE===
View
2 tests/server/server-executeBulkWrite-003.phpt
@@ -26,7 +26,7 @@ foreach ($writeConcerns as $wc) {
<?php exit(0); ?>
--EXPECT--
bool(false)
-int(0)
+NULL
bool(true)
int(1)
bool(true)
View
2 tests/server/server-executeBulkWrite-004.phpt
@@ -33,7 +33,7 @@ foreach ($writeConcerns as $wc) {
<?php exit(0); ?>
--EXPECT--
bool(false)
-int(0)
+NULL
OK: Got MongoDB\Driver\Exception\RuntimeException
not master
OK: Got MongoDB\Driver\Exception\RuntimeException
View
2 tests/server/server-executeBulkWrite-005.phpt
@@ -31,7 +31,7 @@ $server->executeCommand('local', $command);
<?php exit(0); ?>
--EXPECT--
bool(false)
-int(0)
+NULL
bool(true)
int(1)
===DONE===
View
4 tests/standalone/bug0655.phpt
@@ -36,11 +36,11 @@ ini_set('mongodb.debug', 'off');
[%s] PHONGO: DEBUG > Connecting to 'invalid.host:27017[mongodb://invalid.host:27017]'
%a
OK: Got MongoDB\Driver\Exception\ConnectionTimeoutException
-No suitable servers found (`serverselectiontryonce` set): %s
+No suitable servers found (`serverSelectionTryOnce` set): %s
%a
[%s] PHONGO: DEBUG > Applying connectTimeoutMS: 1
[%s] PHONGO: DEBUG > Connecting to 'localhost:54321[mongodb://localhost:54321]'
%a
OK: Got MongoDB\Driver\Exception\ConnectionTimeoutException
-No suitable servers found (`serverselectiontryonce` set): %s
+No suitable servers found (`serverSelectionTryOnce` set): %s
===DONE===
View
10 tests/standalone/writeresult-isacknowledged-003.phpt
@@ -22,15 +22,15 @@ var_dump($result);
WriteResult::isAcknowledged(): false
object(MongoDB\Driver\WriteResult)#%d (%d) {
["nInserted"]=>
- int(0)
+ NULL
["nMatched"]=>
- int(0)
+ NULL
["nModified"]=>
- int(0)
+ NULL
["nRemoved"]=>
- int(0)
+ NULL
["nUpserted"]=>
- int(0)
+ NULL
["upsertedIds"]=>
array(0) {
}

0 comments on commit 184b79b

Please sign in to comment.
Something went wrong with that request. Please try again.