Use new serialization handler for DateTime

Author: bukka

ext/date/php_date.c

@@ -626,6 +626,7 @@ static zend_object_value date_object_clone_period(zval *this_ptr TSRMLS_DC);
 static int date_object_compare_date(zval *d1, zval *d2 TSRMLS_DC);
 static HashTable *date_object_get_gc(zval *object, zval ***table, int *n TSRMLS_DC);
 static HashTable *date_object_get_properties(zval *object TSRMLS_DC);
+static HashTable *date_object_get_debug_info(zval *object, int *temp TSRMLS_DC);
 static HashTable *date_object_get_gc_interval(zval *object, zval ***table, int *n TSRMLS_DC);
 static HashTable *date_object_get_properties_interval(zval *object TSRMLS_DC);
 static HashTable *date_object_get_gc_period(zval *object, zval ***table, int *n TSRMLS_DC);
@@ -1993,7 +1994,8 @@ static void date_register_classes(TSRMLS_D)
 	memcpy(&date_object_handlers_date, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
 	date_object_handlers_date.clone_obj = date_object_clone_date;
 	date_object_handlers_date.compare_objects = date_object_compare_date;
-	date_object_handlers_date.get_properties = date_object_get_properties;
+	date_object_handlers_date.get_debug_info = date_object_get_debug_info;
+	date_object_handlers_date.get_serialize_info = date_object_get_properties;
 	date_object_handlers_date.get_gc = date_object_get_gc;
 	zend_class_implements(date_ce_date TSRMLS_CC, 1, date_ce_interface);
 
@@ -2180,6 +2182,12 @@ static HashTable *date_object_get_gc_timezone(zval *object, zval ***table, int *
        return zend_std_get_properties(object TSRMLS_CC);
 }
 
+static HashTable *date_object_get_debug_info(zval *object, int *temp TSRMLS_DC)
+{
+	*temp = 0;
+	return date_object_get_properties(object TSRMLS_CC);
+}
+
 static HashTable *date_object_get_properties(zval *object TSRMLS_DC)
 {
 	HashTable *props;
@@ -2195,16 +2203,22 @@ static HashTable *date_object_get_properties(zval *object TSRMLS_DC)
 		return props;
 	}
 
+	if (!dateobj->props) {
+		ALLOC_HASHTABLE(dateobj->props);
+		ZEND_INIT_SYMTABLE_EX(dateobj->props, 3, 0);
+	}
+	zend_hash_merge(dateobj->props, props, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *), 0);
+
 	/* first we add the date and time in ISO format */
 	MAKE_STD_ZVAL(zv);
 	ZVAL_STRING(zv, date_format("Y-m-d H:i:s", 12, dateobj->time, 1), 0);
-	zend_hash_update(props, "date", 5, &zv, sizeof(zval), NULL);
+	zend_hash_update(dateobj->props, "date", sizeof("date"), &zv, sizeof(zval), NULL);
 
 	/* then we add the timezone name (or similar) */
 	if (dateobj->time->is_localtime) {
 		MAKE_STD_ZVAL(zv);
 		ZVAL_LONG(zv, dateobj->time->zone_type);
-		zend_hash_update(props, "timezone_type", 14, &zv, sizeof(zval), NULL);
+		zend_hash_update(dateobj->props, "timezone_type", sizeof("timezone_type"), &zv, sizeof(zval), NULL);
 
 		MAKE_STD_ZVAL(zv);
 		switch (dateobj->time->zone_type) {
@@ -2227,10 +2241,10 @@ static HashTable *date_object_get_properties(zval *object TSRMLS_DC)
 				ZVAL_STRING(zv, dateobj->time->tz_abbr, 1);
 				break;
 		}
-		zend_hash_update(props, "timezone", 9, &zv, sizeof(zval), NULL);
+		zend_hash_update(dateobj->props, "timezone", sizeof("timezone"), &zv, sizeof(zval), NULL);
 	}
 
-	return props;
+	return dateobj->props;
 }
 
 static inline zend_object_value date_object_new_timezone_ex(zend_class_entry *class_type, php_timezone_obj **ptr TSRMLS_DC)
@@ -2465,6 +2479,10 @@ static void date_object_free_storage_date(void *object TSRMLS_DC)
 	if (intern->time) {
 		timelib_time_dtor(intern->time);
 	}
+	if (intern->props) {
+		zend_hash_destroy(intern->props);
+		FREE_HASHTABLE(intern->props);
+	}
 
 	zend_object_std_dtor(&intern->std TSRMLS_CC);
 	efree(object);