PHPC-438: Debug handler should display null for no WC error

Author: jmikola

src/MongoDB/WriteResult.c

@@ -452,6 +452,7 @@ HashTable *php_phongo_writeresult_get_debug_info(zval *object, int *is_temp TSRM
 	php_phongo_writeresult_t *intern;
 	zval                      retval = zval_used_for_init;
 	php_phongo_bson_state     state = PHONGO_BSON_STATE_INITIALIZER;
+	bson_iter_t iter;
 
 	intern = (php_phongo_writeresult_t *)zend_object_store_get_object(object TSRMLS_CC);
 	*is_temp = 1;
@@ -479,10 +480,21 @@ HashTable *php_phongo_writeresult_get_debug_info(zval *object, int *is_temp TSRM
 	bson_to_zval(bson_get_data(&intern->write_result.writeErrors), intern->write_result.writeErrors.len, &state);
 	add_assoc_zval_ex(&retval, ZEND_STRS("writeErrors"), state.zchild);
 
+	if (!bson_empty0(&intern->write_result.writeConcernErrors) &&
+			bson_iter_init(&iter, &intern->write_result.writeConcernErrors) &&
+			bson_iter_next(&iter) &&
+			BSON_ITER_HOLDS_DOCUMENT(&iter)) {
+		uint32_t len;
+		const uint8_t *data;
 
-	MAKE_STD_ZVAL(state.zchild);
-	bson_to_zval(bson_get_data(&intern->write_result.writeConcernError), intern->write_result.writeConcernError.len, &state);
-	add_assoc_zval_ex(&retval, ZEND_STRS("writeConcernError"), state.zchild);
+		bson_iter_document(&iter, &len, &data);
+
+		MAKE_STD_ZVAL(state.zchild);
+		bson_to_zval(data, len, &state);
+		add_assoc_zval_ex(&retval, ZEND_STRS("writeConcernError"), state.zchild);
+	} else {
+		add_assoc_null_ex(&retval, ZEND_STRS("writeConcernError"));
+	}
 
 	if (intern->write_concern) {
 		zval *write_concern = NULL;

tests/replicaset/writeresult-getserver-002.phpt

@@ -77,8 +77,7 @@ object(MongoDB\Driver\WriteResult)#%d (%d) {
   array(0) {
   }
   ["writeConcernError"]=>
-  array(0) {
-  }
+  NULL
   ["writeConcern"]=>
   array(%d) {
     ["w"]=>

tests/server/server-executeBulkWrite-001.phpt

@@ -67,8 +67,7 @@ object(MongoDB\Driver\WriteResult)#%d (%d) {
   array(0) {
   }
   ["writeConcernError"]=>
-  array(0) {
-  }
+  NULL
   ["writeConcern"]=>
   array(%d) {
     ["w"]=>

tests/standalone/writeresult-isacknowledged-001.phpt

@@ -36,8 +36,7 @@ object(MongoDB\Driver\WriteResult)#%d (%d) {
   array(0) {
   }
   ["writeConcernError"]=>
-  array(0) {
-  }
+  NULL
   ["writeConcern"]=>
   array(%d) {
     ["w"]=>

tests/standalone/writeresult-isacknowledged-002.phpt

@@ -38,8 +38,7 @@ object(MongoDB\Driver\WriteResult)#%d (%d) {
   array(0) {
   }
   ["writeConcernError"]=>
-  array(0) {
-  }
+  NULL
   ["writeConcern"]=>
   array(%d) {
     ["w"]=>

tests/standalone/writeresult-isacknowledged-003.phpt

@@ -36,8 +36,7 @@ object(MongoDB\Driver\WriteResult)#%d (%d) {
   array(0) {
   }
   ["writeConcernError"]=>
-  array(0) {
-  }
+  NULL
   ["writeConcern"]=>
   array(%d) {
     ["w"]=>