Merge branch 'PHP-8.2'

devnexen · devnexen · commit ad7d3c888d87 · 2023-02-24T17:03:50.000Z
diff --git a/Zend/zend_API.c b/Zend/zend_API.c
@@ -4785,7 +4785,7 @@ ZEND_API zend_result zend_update_static_property_ex(zend_class_entry *scope, zen
 ZEND_API zend_result zend_update_static_property(zend_class_entry *scope, const char *name, size_t name_length, zval *value) /* {{{ */
 {
 	zend_string *key = zend_string_init(name, name_length, 0);
-	bool retval = zend_update_static_property_ex(scope, key, value);
+	zend_result retval = zend_update_static_property_ex(scope, key, value);
 	zend_string_efree(key);
 	return retval;
 }

Original file line number	Diff line number	Diff line change
`@@ -4785,7 +4785,7 @@ ZEND_API zend_result zend_update_static_property_ex(zend_class_entry *scope, zen`
`4785`	`4785`	`ZEND_API zend_result zend_update_static_property(zend_class_entry scope, const char name, size_t name_length, zval value) / {{{ */`
`4786`	`4786`	`{`
`4787`	`4787`	`zend_string *key = zend_string_init(name, name_length, 0);`
`4788`		`- bool retval = zend_update_static_property_ex(scope, key, value);`
	`4788`	`+ zend_result retval = zend_update_static_property_ex(scope, key, value);`
`4789`	`4789`	`zend_string_efree(key);`
`4790`	`4790`	`return retval;`
`4791`	`4791`	`}`