com php-src: Merge branch 'PHP-7.4': ext/date/php_date.c

From: Date: Tue, 12 Feb 2019 08:59:12 +0000
Subject: com php-src: Merge branch 'PHP-7.4': ext/date/php_date.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-104579@lists.php.net to get a copy of this message
Commit: 8dc7d22747970c813e53b332bad6784a367e3cfc Author: Nikita Popov <nikita.ppv@gmail.com> Tue, 12 Feb 2019 09:59:12 +0100 Parents: e7177ac067be24bf32d6a00ba377acf91df39118 e27af3bbea58b7fb9662e70f84a6cd784ee15896 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8dc7d22747970c813e53b332bad6784a367e3cfc Log: Merge branch 'PHP-7.4' Changed paths: MM ext/date/php_date.c Diff: diff --cc ext/date/php_date.c index 0c1ad6d,8bb310f..011454d --- a/ext/date/php_date.c +++ b/ext/date/php_date.c @@@ -5216,23 -5276,16 +5216,16 @@@ PHP_METHOD(DatePeriod, __wakeup /* }}} */ /* {{{ date_period_read_property */ -static zval *date_period_read_property(zval *object, zval *member, int type, void **cache_slot, zval *rv) +static zval *date_period_read_property(zend_object *object, zend_string *name, int type, void **cache_slot, zval *rv) { - zval *zv; if (type != BP_VAR_IS && type != BP_VAR_R) { zend_throw_error(NULL, "Retrieval of DatePeriod properties for modification is unsupported"); return &EG(uninitialized_zval); } - Z_OBJPROP_P(object); /* build properties hash table */ + object->handlers->get_properties(object); /* build properties hash table */ - zv = zend_std_read_property(object, name, type, cache_slot, rv); - if (Z_TYPE_P(zv) == IS_OBJECT && Z_OBJ_HANDLER_P(zv, clone_obj)) { - /* defensive copy */ - ZVAL_OBJ(zv, Z_OBJ_HANDLER_P(zv, clone_obj)(Z_OBJ_P(zv))); - } - - return zv; - return zend_std_read_property(object, member, type, cache_slot, rv); ++ return zend_std_read_property(object, name, type, cache_slot, rv); } /* }}} */

« previous php.cvs (#104579) next »