Skip to content

Commit 1cfbb21

Browse files
nikicnikic
committed
Classify object handlers are required/optional
1 parent fc0aa26 commit 1cfbb21

File tree

13 files changed

+607
-1226
lines changed

13 files changed

+607
-1226
lines changed

‎UPGRADING.INTERNALS‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ PHP 7.4 INTERNALS UPGRADE NOTES
77
d. Removed zend_check_private()
88
e. php_win32_error_to_msg() memory management
99
f. get_properties_for() handler / Z_OBJDEBUG_P
10+
g. Required object handlers
1011

1112
2. Build system changes
1213
a. Abstract
@@ -98,6 +99,28 @@ PHP 7.4 INTERNALS UPGRADE NOTES
9899
// ...
99100
zend_release_properties(ht);
100101

102+
g. The following object handlers are now required (must be non-NULL):
103+
104+
* free_obj
105+
* dtor_obj
106+
* read_property
107+
* write_property
108+
* read_dimension
109+
* write_dimension
110+
* get_property_ptr_ptr
111+
* has_property
112+
* unset_property
113+
* has_dimension
114+
* unset_dimension
115+
* get_properties
116+
* get_method
117+
* get_constructor
118+
* get_class_name
119+
* get_gc
120+
121+
It is recommended to initialize object handler structures by copying the
122+
std object handlers and only overwriting those you want to change.
123+
101124
========================
102125
2. Build system changes
103126
========================

‎Zend/zend_API.c‎

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3114,7 +3114,7 @@ static zend_always_inline int zend_is_callable_check_func(int check_flags, zval
31143114
fcc->function_handler = zend_get_call_trampoline_func(ce_org, mname, 0);
31153115
call_via_handler = 1;
31163116
retval = 1;
3117-
} else if (fcc->object->handlers->get_method) {
3117+
} else {
31183118
fcc->function_handler = fcc->object->handlers->get_method(&fcc->object, mname, NULL);
31193119
if (fcc->function_handler) {
31203120
if (strict_class &&
@@ -3935,9 +3935,6 @@ ZEND_API void zend_update_property_ex(zend_class_entry *scope, zval *object, zen
39353935

39363936
EG(fake_scope) = scope;
39373937

3938-
if (!Z_OBJ_HT_P(object)->write_property) {
3939-
zend_error_noreturn(E_CORE_ERROR, "Property %s of class %s cannot be updated", ZSTR_VAL(name), ZSTR_VAL(Z_OBJCE_P(object)->name));
3940-
}
39413938
ZVAL_STR(&property, name);
39423939
Z_OBJ_HT_P(object)->write_property(object, &property, value, NULL);
39433940

@@ -3952,9 +3949,6 @@ ZEND_API void zend_update_property(zend_class_entry *scope, zval *object, const
39523949

39533950
EG(fake_scope) = scope;
39543951

3955-
if (!Z_OBJ_HT_P(object)->write_property) {
3956-
zend_error_noreturn(E_CORE_ERROR, "Property %s of class %s cannot be updated", name, ZSTR_VAL(Z_OBJCE_P(object)->name));
3957-
}
39583952
ZVAL_STRINGL(&property, name, name_length);
39593953
Z_OBJ_HT_P(object)->write_property(object, &property, value, NULL);
39603954
zval_ptr_dtor(&property);
@@ -3979,9 +3973,6 @@ ZEND_API void zend_unset_property(zend_class_entry *scope, zval *object, const c
39793973

39803974
EG(fake_scope) = scope;
39813975

3982-
if (!Z_OBJ_HT_P(object)->unset_property) {
3983-
zend_error_noreturn(E_CORE_ERROR, "Property %s of class %s cannot be unset", name, ZSTR_VAL(Z_OBJCE_P(object)->name));
3984-
}
39853976
ZVAL_STRINGL(&property, name, name_length);
39863977
Z_OBJ_HT_P(object)->unset_property(object, &property, 0);
39873978
zval_ptr_dtor(&property);
@@ -4143,10 +4134,6 @@ ZEND_API zval *zend_read_property_ex(zend_class_entry *scope, zval *object, zend
41434134

41444135
EG(fake_scope) = scope;
41454136

4146-
if (!Z_OBJ_HT_P(object)->read_property) {
4147-
zend_error_noreturn(E_CORE_ERROR, "Property %s of class %s cannot be read", ZSTR_VAL(name), ZSTR_VAL(Z_OBJCE_P(object)->name));
4148-
}
4149-
41504137
ZVAL_STR(&property, name);
41514138
value = Z_OBJ_HT_P(object)->read_property(object, &property, silent?BP_VAR_IS:BP_VAR_R, NULL, rv);
41524139

‎Zend/zend_builtin_functions.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1338,7 +1338,7 @@ ZEND_FUNCTION(method_exists)
13381338
if (zend_hash_exists(&ce->function_table, lcname)) {
13391339
zend_string_release_ex(lcname, 0);
13401340
RETURN_TRUE;
1341-
} else if (Z_TYPE_P(klass) == IS_OBJECT && Z_OBJ_HT_P(klass)->get_method != NULL) {
1341+
} else if (Z_TYPE_P(klass) == IS_OBJECT) {
13421342
zend_object *obj = Z_OBJ_P(klass);
13431343
zend_function *func = Z_OBJ_HT_P(klass)->get_method(&obj, method_name, NULL);
13441344
if (func != NULL) {
@@ -1401,7 +1401,6 @@ ZEND_FUNCTION(property_exists)
14011401
ZVAL_STR(&property_z, property);
14021402

14031403
if (Z_TYPE_P(object) == IS_OBJECT &&
1404-
Z_OBJ_HANDLER_P(object, has_property) &&
14051404
Z_OBJ_HANDLER_P(object, has_property)(object, &property_z, 2, NULL)) {
14061405
RETURN_TRUE;
14071406
}

0 commit comments

Comments
 (0)