com php-src: Specify get_property_ptr_ptr handler for DatePeriod: ext/date/php_date.c
| From: | Nikita Popov | Date: | Wed, 29 May 2019 07:51:15 +0000 |
| Subject: | com php-src: Specify get_property_ptr_ptr handler for DatePeriod: ext/date/php_date.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-106429@lists.php.net to get a copy of this message | ||
Commit: 3bd5b83615d47e480840d50fcaab31a5463cb314
Author: Nikita Popov <nikita.ppv@gmail.com> Wed, 29 May 2019 09:51:15 +0200
Parents: 5a0df6a414b6f07e4b7e5a04caa949f76a44ec0b
Branches: PHP-7.4 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=3bd5b83615d47e480840d50fcaab31a5463cb314
Log:
Specify get_property_ptr_ptr handler for DatePeriod
This handler is required on 7.4. Just return NULL from it to fall
back to read_property.
Changed paths:
M ext/date/php_date.c
Diff:
diff --git a/ext/date/php_date.c b/ext/date/php_date.c
index 9aa5343..94f173b 100644
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@ -662,6 +662,7 @@ static zval *date_interval_write_property(zval *object, zval *member, zval *valu
static zval *date_interval_get_property_ptr_ptr(zval *object, zval *member, int type, void
**cache_slot);
static zval *date_period_read_property(zval *object, zval *member, int type, void **cache_slot,
zval *rv);
static zval *date_period_write_property(zval *object, zval *member, zval *value, void
**cache_slot);
+static zval *date_period_get_property_ptr_ptr(zval *object, zval *member, int type, void
**cache_slot);
/* {{{ Module struct */
zend_module_entry date_module_entry = {
@@ -2178,7 +2179,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;
@@ -5344,3 +5345,11 @@ static zval *date_period_write_property(zval *object, zval *member, zval
*value,
return value;
}
/* }}} */
+
+/* {{{ date_period_get_property_ptr_ptr */
+static zval *date_period_get_property_ptr_ptr(zval *object, zval *member, int type, void
**cache_slot)
+{
+ /* Fall back to read_property handler. */
+ return NULL;
+}
+/* }}} */