Merge branch 'PHP-7.4'

nikic · nikic · commit 60b724cbda5b · 2019-04-15T14:34:32.000+02:00
diff --git a/ext/com_dotnet/com_saproxy.c b/ext/com_dotnet/com_saproxy.c
@@ -77,9 +77,10 @@ static zval *saproxy_property_read(zend_object *object, zend_string *member, int
 	return rv;
 }
 
-static void saproxy_property_write(zend_object *object, zend_string *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(zend_object *object, zval *offset, int type, zval *rv)

Original file line number	Diff line number	Diff line change
`@@ -77,9 +77,10 @@ static zval saproxy_property_read(zend_object object, zend_string *member, int`
`77`	`77`	`return rv;`
`78`	`78`	`}`
`79`	`79`
`80`		`-static void saproxy_property_write(zend_object object, zend_string member, zval value, void *cache_slot)`
	`80`	`+static zval saproxy_property_write(zend_object object, zend_string member, zval value, void **cache_slot)`
`81`	`81`	`{`
`82`	`82`	`php_com_throw_exception(E_INVALIDARG, "safearray has no properties");`
	`83`	`+ return value;`
`83`	`84`	`}`
`84`	`85`
`85`	`86`	`static zval saproxy_read_dimension(zend_object object, zval offset, int type, zval rv)`