Merge pull request mongodb#317

jmikola · jmikola · commit 184b79b9047f · 2016-05-03T13:15:14.000-04:00
diff --git a/src/MongoDB/WriteResult.c b/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)
 {
diff --git a/src/libbson b/src/libbson
@@ -1 +1 @@
-Subproject commit ab2ee5ba73c6e38263bfd6de892c0e22b128a809
+Subproject commit 8d8bf379efbd61fcaa1c22bb4d2cbf0f502ac823
diff --git a/src/libmongoc b/src/libmongoc
@@ -1 +1 @@
-Subproject commit 62e680aa26754ef8dbdb2709aac4d2488507872a
+Subproject commit 9a31e4c9adc8159ce64d43942b86999eab0eb940
diff --git a/tests/manager/manager-executeBulkWrite_error-007.phpt b/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===
diff --git a/tests/manager/manager-executeCommand_error-001.phpt b/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===
diff --git a/tests/manager/manager-executeQuery_error-001.phpt b/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===
diff --git a/tests/manager/manager-selectserver_error-001.phpt b/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===
diff --git a/tests/server/server-executeBulkWrite-002.phpt b/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===
diff --git a/tests/server/server-executeBulkWrite-003.phpt b/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)
diff --git a/tests/server/server-executeBulkWrite-004.phpt b/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
diff --git a/tests/server/server-executeBulkWrite-005.phpt b/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===
diff --git a/tests/standalone/bug0655.phpt b/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===
diff --git a/tests/standalone/writeresult-isacknowledged-003.phpt b/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) {
   }

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ PHONGO_API zend_class_entry *php_phongo_writeresult_ce;`
`51`	`51`
`52`	`52`	`zend_object_handlers php_phongo_handler_writeresult;`
`53`	`53`
`54`		`-/* {{{ proto integer WriteResult::getInsertedCount()`
	`54`	`+/* {{{ proto integer\|null WriteResult::getInsertedCount()`
`55`	`55`	`Returns the number of documents that were inserted */`
`56`	`56`	`PHP_METHOD(WriteResult, getInsertedCount)`
`57`	`57`	`{`
`@@ -69,7 +69,7 @@ PHP_METHOD(WriteResult, getInsertedCount)`
`69`	`69`	`RETURN_LONG_FROM_BSON_INT32(&iter, intern->reply, "nInserted");`
`70`	`70`	`}`
`71`	`71`	`/* }}} */`
`72`		`-/* {{{ proto integer WriteResult::getMatchedCount()`
	`72`	`+/* {{{ proto integer\|null WriteResult::getMatchedCount()`
`73`	`73`	`Returns the number of documents that matched the update criteria */`
`74`	`74`	`PHP_METHOD(WriteResult, getMatchedCount)`
`75`	`75`	`{`
`@@ -105,7 +105,7 @@ PHP_METHOD(WriteResult, getModifiedCount)`
`105`	`105`	`RETURN_LONG_FROM_BSON_INT32(&iter, intern->reply, "nModified");`
`106`	`106`	`}`
`107`	`107`	`/* }}} */`
`108`		`-/* {{{ proto integer WriteResult::getDeletedCount()`
	`108`	`+/* {{{ proto integer\|null WriteResult::getDeletedCount()`
`109`	`109`	`Returns the number of documents that were deleted */`
`110`	`110`	`PHP_METHOD(WriteResult, getDeletedCount)`
`111`	`111`	`{`
`@@ -123,7 +123,7 @@ PHP_METHOD(WriteResult, getDeletedCount)`
`123`	`123`	`RETURN_LONG_FROM_BSON_INT32(&iter, intern->reply, "nRemoved");`
`124`	`124`	`}`
`125`	`125`	`/* }}} */`
`126`		`-/* {{{ proto integer WriteResult::getUpsertedCount()`
	`126`	`+/* {{{ proto integer\|null WriteResult::getUpsertedCount()`
`127`	`127`	`Returns the number of documents that were upserted */`
`128`	`128`	`PHP_METHOD(WriteResult, getUpsertedCount)`
`129`	`129`	`{`