Skip to content

Commit 9cac68d

Browse files
committed
Merge branch 'PHP-8.1' into PHP-8.2
2 parents 512abc2 + 8959ff3 commit 9cac68d

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

NEWS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ PHP NEWS
1313
function after bailout). (trowski)
1414
. Fixed SSA object type update for compound assignment opcodes. (nielsdos)
1515
. Fixed language scanner generation build. (Daniel Black)
16+
. Fixed zend_update_static_property() calling zend_update_static_property_ex()
17+
misleadingly with the wrong return type. (nielsdos)
1618

1719
- Curl:
1820
. Fixed deprecation warning at compile time. (Max Kellermann)

Zend/zend_API.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4735,7 +4735,7 @@ ZEND_API zend_result zend_update_static_property_ex(zend_class_entry *scope, zen
47354735
ZEND_API zend_result zend_update_static_property(zend_class_entry *scope, const char *name, size_t name_length, zval *value) /* {{{ */
47364736
{
47374737
zend_string *key = zend_string_init(name, name_length, 0);
4738-
bool retval = zend_update_static_property_ex(scope, key, value);
4738+
zend_result retval = zend_update_static_property_ex(scope, key, value);
47394739
zend_string_efree(key);
47404740
return retval;
47414741
}

0 commit comments

Comments
 (0)