diff options
author | Nikita Popov <nikita.ppv@gmail.com> | 2019-05-29 09:52:43 +0200 |
---|---|---|
committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-05-29 09:52:43 +0200 |
commit | cf610347a7a44b292b59c3b9855e93b3d204d63e (patch) | |
tree | 50d98413185714b9fb0d9731c87c30dbc5488efe /ext/date/php_date.c | |
parent | 7c39ff8ef54cd82c2a9a97ff42e452aab6344d36 (diff) | |
parent | 3bd5b83615d47e480840d50fcaab31a5463cb314 (diff) | |
download | php-git-cf610347a7a44b292b59c3b9855e93b3d204d63e.tar.gz |
Merge branch 'PHP-7.4'
Diffstat (limited to 'ext/date/php_date.c')
-rw-r--r-- | ext/date/php_date.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/ext/date/php_date.c b/ext/date/php_date.c index edaab75361..e995b45341 100644 --- a/ext/date/php_date.c +++ b/ext/date/php_date.c @@ -662,6 +662,7 @@ static zval *date_interval_write_property(zend_object *object, zend_string *memb static zval *date_interval_get_property_ptr_ptr(zend_object *object, zend_string *member, int type, void **cache_slot); static zval *date_period_read_property(zend_object *object, zend_string *member, int type, void **cache_slot, zval *rv); static zval *date_period_write_property(zend_object *object, zend_string *member, zval *value, void **cache_slot); +static zval *date_period_get_property_ptr_ptr(zend_object *object, zend_string *member, int type, void **cache_slot); /* {{{ Module struct */ zend_module_entry date_module_entry = { @@ -2161,7 +2162,7 @@ static void date_register_classes(void) /* {{{ */ date_object_handlers_period.free_obj = date_object_free_storage_period; date_object_handlers_period.clone_obj = date_object_clone_period; date_object_handlers_period.get_properties = date_object_get_properties_period; - date_object_handlers_period.get_property_ptr_ptr = NULL; + date_object_handlers_period.get_property_ptr_ptr = date_period_get_property_ptr_ptr; date_object_handlers_period.get_gc = date_object_get_gc_period; date_object_handlers_period.read_property = date_period_read_property; date_object_handlers_period.write_property = date_period_write_property; @@ -5284,3 +5285,11 @@ static zval *date_period_write_property(zend_object *object, zend_string *name, return value; } /* }}} */ + +/* {{{ date_period_get_property_ptr_ptr */ +static zval *date_period_get_property_ptr_ptr(zend_object *object, zend_string *member, int type, void **cache_slot) +{ + /* Fall back to read_property handler. */ + return NULL; +} +/* }}} */ |