Merge branch 'PHP-7.4'

diff --cc ext/com_dotnet/com_saproxy.c
index ebef6430a37d9826bbd2c0ab585aa53548584cb6,15f68367c48dd68b15db97a2049cdcd599650735..06aa1254c6f6b45f8eaab1cca2c0da6c2ed7e6e1
--- 1/ext/com_dotnet/com_saproxy.c
--- 2/ext/com_dotnet/com_saproxy.c
+++ b/ext/com_dotnet/com_saproxy.c
@@@ -77,14 -78,15 +77,15 @@@ static zval *saproxy_property_read(zend
        return rv;
  }
  
- static void saproxy_property_write(zend_object *object, zend_string *member, zval *value, void **cache_slot)
 -static zval *saproxy_property_write(zval *object, zval *member, zval *value, void **cache_slot)
++static zval *saproxy_property_write(zend_object *object, zend_string *member, zval *value, void **cache_slot)
  {
        php_com_throw_exception(E_INVALIDARG, "safearray has no properties");
+       return value;
  }
  
 -static zval *saproxy_read_dimension(zval *object, zval *offset, int type, zval *rv)
 +static zval *saproxy_read_dimension(zend_object *object, zval *offset, int type, zval *rv)
  {
 -      php_com_saproxy *proxy = SA_FETCH(object);
 +      php_com_saproxy *proxy = (php_com_saproxy*) object;
        UINT dims, i;
        SAFEARRAY *sa;
        LONG ubound, lbound;