PHPC-140: var_dump()ing WriteConcernError and WriteError

bjori · bjori · commit 031a8dac1eae · 2015-01-27T14:18:29.000-08:00
diff --git a/src/MongoDB/WriteConcernError.c b/src/MongoDB/WriteConcernError.c
@@ -44,6 +44,8 @@
 
 PHONGO_API zend_class_entry *php_phongo_writeconcernerror_ce;
 
+zend_object_handlers php_phongo_handler_writeconcernerror;
+
 /* {{{ proto integer WriteConcernError::getCode()
    Returns the MongoDB error code */
 PHP_METHOD(WriteConcernError, getCode)
@@ -156,32 +158,51 @@ static void php_phongo_writeconcernerror_free_object(void *object TSRMLS_DC) /*
 zend_object_value php_phongo_writeconcernerror_create_object(zend_class_entry *class_type TSRMLS_DC) /* {{{ */
 {
 	zend_object_value retval;
-	php_phongo_writeconcernerror_t *intern;
+	php_phongo_writeconcernerror_t *intern = NULL;
 
-	intern = (php_phongo_writeconcernerror_t *)emalloc(sizeof(php_phongo_writeconcernerror_t));
-	memset(intern, 0, sizeof(php_phongo_writeconcernerror_t));
+	intern = (php_phongo_writeconcernerror_t *)ecalloc(1, sizeof *intern);
 
 	zend_object_std_init(&intern->std, class_type TSRMLS_CC);
 	object_properties_init(&intern->std, class_type);
 
 	retval.handle = zend_objects_store_put(intern, (zend_objects_store_dtor_t) zend_objects_destroy_object, php_phongo_writeconcernerror_free_object, NULL TSRMLS_CC);
-	retval.handlers = phongo_get_std_object_handlers();
+	retval.handlers = &php_phongo_handler_writeconcernerror;
 
 	return retval;
 } /* }}} */
+
+HashTable *php_phongo_writeconcernerror_get_debug_info(zval *object, int *is_temp TSRMLS_DC) /* {{{ */
+{
+	php_phongo_writeconcernerror_t *intern;
+	zval                    retval = zval_used_for_init;
+
+
+	*is_temp = 1;
+	intern = (php_phongo_writeconcernerror_t *)zend_object_store_get_object(object TSRMLS_CC);
+
+	array_init_size(&retval, 3);
+	add_assoc_string_ex(&retval, ZEND_STRS("message"), intern->message, 1);
+	add_assoc_long_ex(&retval, ZEND_STRS("code"), intern->code);
+	Z_ADDREF_P(intern->info);
+	add_assoc_zval_ex(&retval, ZEND_STRS("info"), intern->info);
+
+	return Z_ARRVAL(retval);
+} /* }}} */
 /* }}} */
 
 /* {{{ PHP_MINIT_FUNCTION */
 PHP_MINIT_FUNCTION(WriteConcernError)
 {
-	(void)type; /* We don't care if we are loaded via dl() or extension= */
+	(void)type; (void)module_number;
 	zend_class_entry ce;
 
 	INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver", "WriteConcernError", php_phongo_writeconcernerror_me);
-	ce.create_object = php_phongo_writeconcernerror_create_object;
 	php_phongo_writeconcernerror_ce = zend_register_internal_class(&ce TSRMLS_CC);
+	php_phongo_writeconcernerror_ce->create_object = php_phongo_writeconcernerror_create_object;
 	php_phongo_writeconcernerror_ce->ce_flags |= ZEND_ACC_FINAL_CLASS;
 
+	memcpy(&php_phongo_handler_writeconcernerror, phongo_get_std_object_handlers(), sizeof(zend_object_handlers));
+	php_phongo_handler_writeconcernerror.get_debug_info = php_phongo_writeconcernerror_get_debug_info;
 
 	return SUCCESS;
 }
diff --git a/src/MongoDB/WriteError.c b/src/MongoDB/WriteError.c
@@ -44,6 +44,8 @@
 
 PHONGO_API zend_class_entry *php_phongo_writeerror_ce;
 
+zend_object_handlers php_phongo_handler_writeerror;
+
 /* {{{ proto integer WriteError::getCode()
    Returns the MongoDB error code */
 PHP_METHOD(WriteError, getCode)
@@ -149,32 +151,50 @@ static void php_phongo_writeerror_free_object(void *object TSRMLS_DC) /* {{{ */
 zend_object_value php_phongo_writeerror_create_object(zend_class_entry *class_type TSRMLS_DC) /* {{{ */
 {
 	zend_object_value retval;
-	php_phongo_writeerror_t *intern;
+	php_phongo_writeerror_t *intern = NULL;
 
-	intern = (php_phongo_writeerror_t *)emalloc(sizeof(php_phongo_writeerror_t));
-	memset(intern, 0, sizeof(php_phongo_writeerror_t));
+	intern = (php_phongo_writeerror_t *)ecalloc(1, sizeof *intern);
 
 	zend_object_std_init(&intern->std, class_type TSRMLS_CC);
 	object_properties_init(&intern->std, class_type);
 
 	retval.handle = zend_objects_store_put(intern, (zend_objects_store_dtor_t) zend_objects_destroy_object, php_phongo_writeerror_free_object, NULL TSRMLS_CC);
-	retval.handlers = phongo_get_std_object_handlers();
+	retval.handlers = &php_phongo_handler_writeerror;
 
 	return retval;
 } /* }}} */
+
+HashTable *php_phongo_writeerror_get_debug_info(zval *object, int *is_temp TSRMLS_DC) /* {{{ */
+{
+	php_phongo_writeerror_t *intern;
+	zval                    retval = zval_used_for_init;
+
+
+	*is_temp = 1;
+	intern = (php_phongo_writeerror_t *)zend_object_store_get_object(object TSRMLS_CC);
+
+	array_init_size(&retval, 3);
+	add_assoc_string_ex(&retval, ZEND_STRS("message"), intern->message, 1);
+	add_assoc_long_ex(&retval, ZEND_STRS("code"), intern->code);
+	add_assoc_long_ex(&retval, ZEND_STRS("index"), intern->index);
+
+	return Z_ARRVAL(retval);
+} /* }}} */
 /* }}} */
 
 /* {{{ PHP_MINIT_FUNCTION */
 PHP_MINIT_FUNCTION(WriteError)
 {
-	(void)type; /* We don't care if we are loaded via dl() or extension= */
+	(void)type; (void)module_number;
 	zend_class_entry ce;
 
 	INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver", "WriteError", php_phongo_writeerror_me);
-	ce.create_object = php_phongo_writeerror_create_object;
 	php_phongo_writeerror_ce = zend_register_internal_class(&ce TSRMLS_CC);
+	php_phongo_writeerror_ce->create_object = php_phongo_writeerror_create_object;
 	php_phongo_writeerror_ce->ce_flags |= ZEND_ACC_FINAL_CLASS;
 
+	memcpy(&php_phongo_handler_writeerror, phongo_get_std_object_handlers(), sizeof(zend_object_handlers));
+	php_phongo_handler_writeerror.get_debug_info = php_phongo_writeerror_get_debug_info;
 
 	return SUCCESS;
 }
diff --git a/tests/replicaset/writeconcern-error.phpt b/tests/replicaset/writeconcern-error.phpt
@@ -26,6 +26,17 @@ matchedCount: 0
 modifiedCount: 0
 upsertedCount: 0
 deletedCount: 0
+object(MongoDB\Driver\WriteConcernError)#%d (%d) {
+  ["message"]=>
+  string(33) "waiting for replication timed out"
+  ["code"]=>
+  int(64)
+  ["info"]=>
+  array(1) {
+    ["wtimeout"]=>
+    bool(true)
+  }
+}
 writeConcernError.message: waiting for replication timed out
 writeConcernError.code: 64
 writeConcernError.info: array(1) {
diff --git a/tests/replicaset/writeconcernerror-0001.phpt b/tests/replicaset/writeconcernerror-0001.phpt
@@ -32,6 +32,17 @@ matchedCount: 1
 modifiedCount: 1
 upsertedCount: 0
 deletedCount: 1
+object(MongoDB\Driver\WriteConcernError)#%d (%d) {
+  ["message"]=>
+  string(33) "waiting for replication timed out"
+  ["code"]=>
+  int(64)
+  ["info"]=>
+  array(1) {
+    ["wtimeout"]=>
+    bool(true)
+  }
+}
 writeConcernError.message: waiting for replication timed out
 writeConcernError.code: 64
 writeConcernError.info: array(1) {
diff --git a/tests/standalone/manager-executeWriteBatch-002.phpt b/tests/standalone/manager-executeWriteBatch-002.phpt
@@ -43,6 +43,14 @@ matchedCount: 0
 modifiedCount: 0
 upsertedCount: 0
 deletedCount: 0
+object(MongoDB\Driver\WriteError)#%d (%d) {
+  ["message"]=>
+  string(%d) "%s"
+  ["code"]=>
+  int(11000)
+  ["index"]=>
+  int(1)
+}
 writeError[1].message: %s
 writeError[1].code: 11000
 
diff --git a/tests/standalone/manager-executeWriteBatch-003.phpt b/tests/standalone/manager-executeWriteBatch-003.phpt
@@ -43,8 +43,24 @@ matchedCount: 0
 modifiedCount: 0
 upsertedCount: 0
 deletedCount: 0
+object(MongoDB\Driver\WriteError)#%d (%d) {
+  ["message"]=>
+  string(%d) "%s"
+  ["code"]=>
+  int(11000)
+  ["index"]=>
+  int(1)
+}
 writeError[1].message: %s
 writeError[1].code: 11000
+object(MongoDB\Driver\WriteError)#%d (%d) {
+  ["message"]=>
+  string(%d) "%s"
+  ["code"]=>
+  int(11000)
+  ["index"]=>
+  int(3)
+}
 writeError[3].message: %s
 writeError[3].code: 11000
 
diff --git a/tests/utils/tools.php b/tests/utils/tools.php
@@ -138,6 +138,7 @@ function printWriteResult(MongoDB\Driver\WriteResult $result)
 function printWriteConcernError(MongoDB\Driver\WriteConcernError $error = null)
 {
     if ($error) {
+        var_dump($error);
         printf("writeConcernError.message: %s\n", $error->getMessage());
         printf("writeConcernError.code: %d\n", $error->getCode());
         printf("writeConcernError.info: ");
@@ -147,6 +148,7 @@ function printWriteConcernError(MongoDB\Driver\WriteConcernError $error = null)
 
 function printWriteError(MongoDB\Driver\WriteError $error)
 {
+    var_dump($error);
     printf("writeError[%d].message: %s\n", $error->getIndex(), $error->getMessage());
     printf("writeError[%d].code: %d\n", $error->getIndex(), $error->getCode());
 }

Original file line number	Diff line number	Diff line change
`@@ -138,6 +138,7 @@ function printWriteResult(MongoDB\Driver\WriteResult $result)`
`138`	`138`	`function printWriteConcernError(MongoDB\Driver\WriteConcernError $error = null)`
`139`	`139`	`{`
`140`	`140`	`if ($error) {`
	`141`	`+ var_dump($error);`
`141`	`142`	`printf("writeConcernError.message: %s\n", $error->getMessage());`
`142`	`143`	`printf("writeConcernError.code: %d\n", $error->getCode());`
`143`	`144`	`printf("writeConcernError.info: ");`
`@@ -147,6 +148,7 @@ function printWriteConcernError(MongoDB\Driver\WriteConcernError $error = null)`
`147`	`148`
`148`	`149`	`function printWriteError(MongoDB\Driver\WriteError $error)`
`149`	`150`	`{`
	`151`	`+ var_dump($error);`
`150`	`152`	`printf("writeError[%d].message: %s\n", $error->getIndex(), $error->getMessage());`
`151`	`153`	`printf("writeError[%d].code: %d\n", $error->getIndex(), $error->getCode());`
`152`	`154`	`}`