PHPC-340: BSON\UTCDateTime debug handler

The milliseconds will be dumped as a string value on 32-bit platforms.

Author: jmikola

src/BSON/UTCDateTime.c

@@ -44,6 +44,8 @@
 
 PHONGO_API zend_class_entry *php_phongo_utcdatetime_ce;
 
+zend_object_handlers php_phongo_handler_utcdatetime;
+
 /* {{{ proto BSON\UTCDateTime UTCDateTime::__construct(integer $milliseconds)
    Construct a new UTCDateTime */
 PHP_METHOD(UTCDateTime, __construct)
@@ -161,10 +163,35 @@ zend_object_value php_phongo_utcdatetime_create_object(zend_class_entry *class_t
 	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_utcdatetime_free_object, NULL TSRMLS_CC);
-	retval.handlers = phongo_get_std_object_handlers();
+	retval.handlers = &php_phongo_handler_utcdatetime;
 
 	return retval;
 } /* }}} */
+
+HashTable *php_phongo_utcdatetime_get_debug_info(zval *object, int *is_temp TSRMLS_DC) /* {{{ */
+{
+	php_phongo_utcdatetime_t *intern;
+	zval                      retval = zval_used_for_init;
+
+	*is_temp = 1;
+	intern = (php_phongo_utcdatetime_t *)zend_object_store_get_object(object TSRMLS_CC);
+
+	array_init(&retval);
+
+#if SIZEOF_LONG == 4
+	{
+		char *tmp;
+		int tmp_len;
+
+		tmp_len = spprintf(&tmp, 0, "%" PRId64, intern->milliseconds);
+		add_assoc_stringl_ex(&retval, ZEND_STRS("milliseconds"), tmp, tmp_len, 0);
+	}
+#else
+	add_assoc_long_ex(&retval, ZEND_STRS("milliseconds"), intern->milliseconds);
+#endif
+
+	return Z_ARRVAL(retval);
+} /* }}} */
 /* }}} */
 
 /* {{{ PHP_MINIT_FUNCTION */
@@ -179,6 +206,8 @@ PHP_MINIT_FUNCTION(UTCDateTime)
 
 	zend_class_implements(php_phongo_utcdatetime_ce TSRMLS_CC, 1, php_phongo_type_ce);
 
+	memcpy(&php_phongo_handler_utcdatetime, phongo_get_std_object_handlers(), sizeof(zend_object_handlers));
+	php_phongo_handler_utcdatetime.get_debug_info = php_phongo_utcdatetime_get_debug_info;
 
 	return SUCCESS;
 }

tests/bson/bson-utcdatetime-002.phpt

@@ -0,0 +1,23 @@
+--TEST--
+BSON BSON\UTCDateTime debug handler (32-bit)
+--SKIPIF--
+<?php if (4 !== PHP_INT_SIZE) { die('skip Only for 32-bit platform'); } ?>
+<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
+--FILE--
+<?php
+require_once __DIR__ . "/../utils/basic.inc";
+
+$classname = BSON_NAMESPACE . '\UTCDateTime';
+$utcdatetime = new $classname('1416445411987');
+
+var_dump($utcdatetime);
+
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECTF--
+object(%SBSON\UTCDateTime)#%d (%d) {
+  ["milliseconds"]=>
+  string(13) "1416445411987"
+}
+===DONE===

tests/bson/bson-utcdatetime-003.phpt

@@ -0,0 +1,23 @@
+--TEST--
+BSON BSON\UTCDateTime debug handler (64-bit)
+--SKIPIF--
+<?php if (8 !== PHP_INT_SIZE) { die('skip Only for 64-bit platform'); } ?>
+<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
+--FILE--
+<?php
+require_once __DIR__ . "/../utils/basic.inc";
+
+$classname = BSON_NAMESPACE . '\UTCDateTime';
+$utcdatetime = new $classname(1416445411987);
+
+var_dump($utcdatetime);
+
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECTF--
+object(%SBSON\UTCDateTime)#%d (%d) {
+  ["milliseconds"]=>
+  int(1416445411987)
+}
+===DONE===

tests/manager/manager-var-dump-001.phpt

@@ -92,6 +92,8 @@ object(MongoDB\Driver\Manager)#%d (%d) {
         int(1000)
         ["localTime"]=>
         object(%s\UTCDateTime)#%d (%d) {
+          ["milliseconds"]=>
+          %r(int\(\d+\)|string\(\d+\) "\d+")%r
         }
         ["maxWireVersion"]=>
         int(%d)

tests/server/server-debug.phpt

@@ -44,6 +44,8 @@ object(MongoDB\Driver\Server)#%d (%d) {
     int(1000)
     ["localTime"]=>
     object(%s\UTCDateTime)#%d (%d) {
+      ["milliseconds"]=>
+      %r(int\(\d+\)|string\(\d+\) "\d+")%r
     }
     ["maxWireVersion"]=>
     int(%d)