Skip to content

Commit 6210d5c

Browse files
authored
Voidify zend_std_unset_static_property() (#22809)
1 parent b043ea3 commit 6210d5c

2 files changed

Lines changed: 2 additions & 3 deletions

File tree

Zend/zend_object_handlers.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2178,10 +2178,9 @@ ZEND_API zval *zend_std_get_static_property(zend_class_entry *ce, zend_string *p
21782178
return zend_std_get_static_property_with_info(ce, property_name, type, &prop_info);
21792179
}
21802180

2181-
ZEND_API ZEND_COLD bool zend_std_unset_static_property(const zend_class_entry *ce, const zend_string *property_name) /* {{{ */
2181+
ZEND_API ZEND_COLD void zend_std_unset_static_property(const zend_class_entry *ce, const zend_string *property_name) /* {{{ */
21822182
{
21832183
zend_throw_error(NULL, "Attempt to unset static property %s::$%s", ZSTR_VAL(ce->name), ZSTR_VAL(property_name));
2184-
return 0;
21852184
}
21862185
/* }}} */
21872186

Zend/zend_object_handlers.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ ZEND_API void zend_class_init_statics(zend_class_entry *ce);
249249
ZEND_API zend_function *zend_std_get_static_method(const zend_class_entry *ce, zend_string *function_name_strval, const zval *key);
250250
ZEND_API zval *zend_std_get_static_property_with_info(zend_class_entry *ce, zend_string *property_name, int type, struct _zend_property_info **prop_info);
251251
ZEND_API zval *zend_std_get_static_property(zend_class_entry *ce, zend_string *property_name, int type);
252-
ZEND_API ZEND_COLD bool zend_std_unset_static_property(const zend_class_entry *ce, const zend_string *property_name);
252+
ZEND_API ZEND_COLD void zend_std_unset_static_property(const zend_class_entry *ce, const zend_string *property_name);
253253
ZEND_API zend_function *zend_std_get_constructor(zend_object *object);
254254
ZEND_API struct _zend_property_info *zend_get_property_info(const zend_class_entry *ce, zend_string *member, int silent);
255255
ZEND_API HashTable *zend_std_get_properties(zend_object *object);

0 commit comments

Comments
 (0)