From: Nikita Popov <nikita.ppv@gmail.com>
Date: Wed, 29 May 2019 07:52:43 +0000 (+0200)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cf610347a7a44b292b59c3b9855e93b3d204d63e;p=php

Merge branch 'PHP-7.4'
---

cf610347a7a44b292b59c3b9855e93b3d204d63e
diff --cc ext/date/php_date.c
index edaab75361,94f173be87..e995b45341
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@@ -657,11 -657,12 +657,12 @@@ static HashTable *date_object_get_debug
  static void php_timezone_to_string(php_timezone_obj *tzobj, zval *zv);
  
  static int date_interval_compare_objects(zval *o1, zval *o2);
 -static zval *date_interval_read_property(zval *object, zval *member, int type, void **cache_slot, zval *rv);
 -static zval *date_interval_write_property(zval *object, zval *member, zval *value, void **cache_slot);
 -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);
 +static zval *date_interval_read_property(zend_object *object, zend_string *member, int type, void **cache_slot, zval *rv);
 +static zval *date_interval_write_property(zend_object *object, zend_string *member, zval *value, void **cache_slot);
 +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 = {
@@@ -5284,3 -5345,11 +5285,11 @@@ static zval *date_period_write_property
  	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)
++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;
+ }
+ /* }}} */