PHPC-137: var_dump()ing CursorID should show the Cursor ID

Author: bjori

src/MongoDB/CursorId.c

@@ -44,6 +44,8 @@
 
 PHONGO_API zend_class_entry *php_phongo_cursorid_ce;
 
+zend_object_handlers php_phongo_handler_cursorid;
+
 /* {{{ proto MongoDB\Driver\CursorId CursorId::__construct(string $id)
    Construct a new CursorId */
 PHP_METHOD(CursorId, __construct)
@@ -52,6 +54,7 @@ PHP_METHOD(CursorId, __construct)
 	zend_error_handling       error_handling;
 	char                     *id;
 	int                       id_len;
+	(void)return_value; (void)return_value_ptr; (void)return_value_used;
 
 
 	zend_replace_error_handling(EH_THROW, phongo_exception_from_phongo_domain(PHONGO_ERROR_INVALID_ARGUMENT), &error_handling TSRMLS_CC);
@@ -70,6 +73,7 @@ PHP_METHOD(CursorId, __toString)
 {
 	php_phongo_cursorid_t    *intern;
 	zend_error_handling       error_handling;
+	(void)return_value_ptr; (void)return_value_used;
 
 
 	zend_replace_error_handling(EH_THROW, phongo_exception_from_phongo_domain(PHONGO_ERROR_INVALID_ARGUMENT), &error_handling TSRMLS_CC);
@@ -124,32 +128,50 @@ static void php_phongo_cursorid_free_object(void *object TSRMLS_DC) /* {{{ */
 zend_object_value php_phongo_cursorid_create_object(zend_class_entry *class_type TSRMLS_DC) /* {{{ */
 {
 	zend_object_value retval;
-	php_phongo_cursorid_t *intern;
+	php_phongo_cursorid_t *intern = NULL;
 
-	intern = (php_phongo_cursorid_t *)emalloc(sizeof(php_phongo_cursorid_t));
-	memset(intern, 0, sizeof(php_phongo_cursorid_t));
+	intern = (php_phongo_cursorid_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_cursorid_free_object, NULL TSRMLS_CC);
-	retval.handlers = phongo_get_std_object_handlers();
+	retval.handlers = &php_phongo_handler_cursorid;
 
 	return retval;
 } /* }}} */
+
+HashTable *php_phongo_cursorid_get_debug_info(zval *object, int *is_temp TSRMLS_DC) /* {{{ */
+{
+	php_phongo_cursorid_t  *intern;
+	zval                    retval = zval_used_for_init;
+
+
+	*is_temp = 1;
+	intern = (php_phongo_cursorid_t *)zend_object_store_get_object(object TSRMLS_CC);
+
+	array_init(&retval);
+
+	add_assoc_long_ex(&retval, ZEND_STRS("id"), intern->id);
+
+	return Z_ARRVAL(retval);
+
+} /* }}} */
 /* }}} */
 
 /* {{{ PHP_MINIT_FUNCTION */
 PHP_MINIT_FUNCTION(CursorId)
 {
-	(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", "CursorId", php_phongo_cursorid_me);
-	ce.create_object = php_phongo_cursorid_create_object;
 	php_phongo_cursorid_ce = zend_register_internal_class(&ce TSRMLS_CC);
+	php_phongo_cursorid_ce->create_object = php_phongo_cursorid_create_object;
 	php_phongo_cursorid_ce->ce_flags |= ZEND_ACC_FINAL_CLASS;
 
+	memcpy(&php_phongo_handler_cursorid, phongo_get_std_object_handlers(), sizeof(zend_object_handlers));
+	php_phongo_handler_cursorid.get_debug_info = php_phongo_cursorid_get_debug_info;
 
 	return SUCCESS;
 }

tests/functional/cursorid-001.phpt

@@ -31,7 +31,9 @@ $cursor->kill();
 ===DONE===
 <?php exit(0); ?>
 --EXPECTF--
-object(MongoDB\Driver\CursorId)#%d (0) {
+object(MongoDB\Driver\CursorId)#%d (%d) {
+  ["id"]=>
+  %s(%d)
 }
 string(%d) "%d"
 ===DONE===