com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/date/php _date.c
| From: | Nikita Popov | Date: | Tue, 14 Jun 2016 20:38:44 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/date/php _date.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-92387@lists.php.net to get a copy of this message | ||
Commit: 93f7939891e11f84bd8448f464e38d9b43e3f818
Author: Nikita Popov <nikic@php.net> Tue, 14 Jun 2016 22:38:44 +0200
Parents: 49b1290617b1500f70bd64de6732d9e23c4cb2e8 248fdfcf7356f2c20ab1e6afd1e9f295d08331c7
Branches: PHP-7.0 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=93f7939891e11f84bd8448f464e38d9b43e3f818
Log:
Merge branch 'PHP-5.6' into PHP-7.0
Conflicts:
ext/date/php_date.c
Changed paths:
MM ext/date/php_date.c
Diff:
diff --cc ext/date/php_date.c
index e780b2e,801208d..f494d6c
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@@ -2013,7 -2059,8 +2013,8 @@@ static void date_register_classes(void
date_object_handlers_immutable.clone_obj = date_object_clone_date;
date_object_handlers_immutable.compare_objects = date_object_compare_date;
date_object_handlers_immutable.get_properties = date_object_get_properties;
+ date_object_handlers_immutable.get_gc = date_object_get_gc;
- zend_class_implements(date_ce_immutable TSRMLS_CC, 1, date_ce_interface);
+ zend_class_implements(date_ce_immutable, 1, date_ce_interface);
INIT_CLASS_ENTRY(ce_timezone, "DateTimeZone", date_funcs_timezone);
ce_timezone.create_object = date_object_new_timezone;
@@@ -2166,11 -2222,11 +2167,11 @@@ static HashTable *date_object_get_prope
php_date_obj *dateobj;
- dateobj = (php_date_obj *) zend_object_store_get_object(object TSRMLS_CC);
+ dateobj = Z_PHPDATE_P(object);
- props = zend_std_get_properties(object TSRMLS_CC);
+ props = zend_std_get_properties(object);
- if (!dateobj->time || GC_G(gc_active)) {
+ if (!dateobj->time) {
return props;
}
@@@ -4838,20 -4929,20 +4839,20 @@@ static HashTable *date_object_get_gc_pe
{
*table = NULL;
*n = 0;
- return zend_std_get_properties(object TSRMLS_CC);
-}
+ return zend_std_get_properties(object);
+} /* }}} */
-static HashTable *date_object_get_properties_period(zval *object TSRMLS_DC)
+static HashTable *date_object_get_properties_period(zval *object) /* {{{ */
{
HashTable *props;
- zval *zv;
+ zval zv;
php_period_obj *period_obj;
- period_obj = zend_object_store_get_object(object TSRMLS_CC);
+ period_obj = Z_PHPPERIOD_P(object);
- props = zend_std_get_properties(object TSRMLS_CC);
+ props = zend_std_get_properties(object);
- if (!period_obj->start || GC_G(gc_active)) {
+ if (!period_obj->start) {
return props;
}