Merge branch 'PHP-7.4'

diff --cc Zend/zend_constants.c
Simple merge

diff --cc ext/date/php_date.c
index 0c1ad6da70a06f7150ca6a81c06e5d2f2e98e0b7,8bb310f2a741028b9b94bccf79f9aee822e0b7ef..011454d16329e7104aa4d93512746762f4f64859
--- 1/ext/date/php_date.c
--- 2/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);
  }
  /* }}} */
  

diff --cc ext/exif/exif.c
Simple merge

diff --cc ext/ffi/ffi.c
index 715628b5e54b0080be576637fa4851264aee0976,2da7fd44736d3e28d56494ca105da86f9211f6f1..bae2a77ea5c9bc647ccf13098f944e157268b61a
--- 1/ext/ffi/ffi.c
--- 2/ext/ffi/ffi.c
+++ b/ext/ffi/ffi.c
@@@ -1113,11 -1134,11 +1113,11 @@@ static zval *zend_ffi_cdata_read_dim(ze
  }
  /* }}} */
  
 -static void zend_ffi_cdata_write_dim(zval *object, zval *offset, zval *value) /* {{{ */
 +static void zend_ffi_cdata_write_dim(zend_object *obj, zval *offset, zval *value) /* {{{ */
  {
 -      zend_ffi_cdata *cdata = (zend_ffi_cdata*)Z_OBJ_P(object);
 +      zend_ffi_cdata *cdata = (zend_ffi_cdata*)obj;
        zend_ffi_type  *type = ZEND_FFI_TYPE(cdata->type);
-       zend_long       dim = zval_get_long(offset);
+       zend_long       dim;
        void           *ptr;
        zend_ffi_flags  is_const;