Skip to content

Commit 94ee4f9

Browse files
bwoebibwoebi
committed
Port all internally used classes to use default_object_handlers
Signed-off-by: Bob Weinand <[email protected]>
1 parent 800c667 commit 94ee4f9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+108
-115
lines changed

‎Zend/zend_inheritance.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1472,6 +1472,7 @@ ZEND_API void zend_do_inheritance_ex(zend_class_entry *ce, zend_class_entry *par
14721472
zend_string_release_ex(ce->parent_name, 0);
14731473
}
14741474
ce->parent = parent_ce;
1475+
ce->default_object_handlers = parent_ce->default_object_handlers;
14751476
ce->ce_flags |= ZEND_ACC_RESOLVED_PARENT;
14761477

14771478
/* Inherit properties */

‎Zend/zend_iterators.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ static const zend_object_handlers iterator_object_handlers = {
5757
ZEND_API void zend_register_iterator_wrapper(void)
5858
{
5959
INIT_CLASS_ENTRY(zend_iterator_class_entry, "__iterator_wrapper", NULL);
60+
zend_iterator_class_entry.default_object_handlers = &iterator_object_handlers;
6061
}
6162

6263
static void iter_wrapper_free(zend_object *object)
@@ -83,7 +84,6 @@ static HashTable *iter_wrapper_get_gc(zend_object *object, zval **table, int *n)
8384
ZEND_API void zend_iterator_init(zend_object_iterator *iter)
8485
{
8586
zend_object_std_init(&iter->std, &zend_iterator_class_entry);
86-
iter->std.handlers = &iterator_object_handlers;
8787
}
8888

8989
ZEND_API void zend_iterator_dtor(zend_object_iterator *iter)

‎ext/com_dotnet/com_extension.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,18 +184,22 @@ PHP_MINIT_FUNCTION(com_dotnet)
184184

185185
php_com_saproxy_class_entry = register_class_com_safearray_proxy();
186186
/* php_com_saproxy_class_entry->constructor->common.fn_flags |= ZEND_ACC_PROTECTED; */
187+
php_com_saproxy_class_entry->default_object_handlers = &php_com_saproxy_handlers;
187188
php_com_saproxy_class_entry->get_iterator = php_com_saproxy_iter_get;
188189

189190
php_com_variant_class_entry = register_class_variant();
191+
php_com_variant_class_entry->default_object_handlers = &php_com_object_handlers;
190192
php_com_variant_class_entry->create_object = php_com_object_new;
191193
php_com_variant_class_entry->get_iterator = php_com_iter_get;
192194

193195
tmp = register_class_com(php_com_variant_class_entry);
196+
tmp->default_object_handlers = &php_com_object_handlers;
194197
tmp->create_object = php_com_object_new;
195198
tmp->get_iterator = php_com_iter_get;
196199

197200
#if HAVE_MSCOREE_H
198201
tmp = register_class_dotnet(php_com_variant_class_entry);
202+
tmp->default_object_handlers = &php_com_object_handlers;
199203
tmp->create_object = php_com_object_new;
200204
tmp->get_iterator = php_com_iter_get;
201205
#endif

‎ext/com_dotnet/com_handlers.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -627,7 +627,6 @@ zend_object* php_com_object_new(zend_class_entry *ce)
627627
obj->ce = ce;
628628

629629
zend_object_std_init(&obj->zo, ce);
630-
obj->zo.handlers = &php_com_object_handlers;
631630

632631
obj->typeinfo = NULL;
633632

‎ext/com_dotnet/com_misc.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ PHP_COM_DOTNET_API void php_com_wrap_dispatch(zval *z, IDispatch *disp,
6161
IDispatch_GetTypeInfo(V_DISPATCH(&obj->v), 0, LANG_NEUTRAL, &obj->typeinfo);
6262

6363
zend_object_std_init(&obj->zo, php_com_variant_class_entry);
64-
obj->zo.handlers = &php_com_object_handlers;
6564
ZVAL_OBJ(z, &obj->zo);
6665
}
6766

@@ -85,7 +84,6 @@ PHP_COM_DOTNET_API void php_com_wrap_variant(zval *z, VARIANT *v,
8584
}
8685

8786
zend_object_std_init(&obj->zo, php_com_variant_class_entry);
88-
obj->zo.handlers = &php_com_object_handlers;
8987
ZVAL_OBJ(z, &obj->zo);
9088
}
9189

‎ext/com_dotnet/com_persist.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -709,7 +709,6 @@ static zend_object* helper_new(zend_class_entry *ce)
709709
memset(helper, 0, sizeof(*helper));
710710

711711
zend_object_std_init(&helper->std, helper_ce);
712-
helper->std.handlers = &helper_handlers;
713712

714713
return &helper->std;
715714
}
@@ -722,6 +721,7 @@ void php_com_persist_minit(INIT_FUNC_ARGS)
722721

723722
helper_ce = register_class_COMPersistHelper();
724723
helper_ce->create_object = helper_new;
724+
helper_ce->default_object_handlers = &helper_handlers;
725725

726726
le_istream = zend_register_list_destructors_ex(istream_dtor,
727727
NULL, "com_dotnet_istream_wrapper", module_number);

‎ext/com_dotnet/com_saproxy.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,6 @@ void php_com_saproxy_create(zend_object *com_object, zval *proxy_out, zval *inde
440440
ZVAL_DUP(&proxy->indices[proxy->dimensions-1], index);
441441

442442
zend_object_std_init(&proxy->std, php_com_saproxy_class_entry);
443-
proxy->std.handlers = &php_com_saproxy_handlers;
444443
ZVAL_OBJ(proxy_out, &proxy->std);
445444
}
446445

‎ext/com_dotnet/php_com_dotnet_internal.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ void php_com_object_enable_event_sink(php_com_dotnet_object *obj, bool enable);
7878
/* com_saproxy.c */
7979
zend_object_iterator *php_com_saproxy_iter_get(zend_class_entry *ce, zval *object, int by_ref);
8080
void php_com_saproxy_create(zend_object *com_object, zval *proxy_out, zval *index);
81+
extern zend_object_handlers php_com_saproxy_handlers;
8182

8283
/* com_olechar.c */
8384
PHP_COM_DOTNET_API zend_string *php_com_olestring_to_string(OLECHAR *olestring, int codepage);

‎ext/curl/interface.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -398,6 +398,7 @@ PHP_MINIT_FUNCTION(curl)
398398

399399
curl_ce = register_class_CurlHandle();
400400
curl_ce->create_object = curl_create_object;
401+
curl_ce->default_object_handlers = &curl_object_handlers;
401402

402403
memcpy(&curl_object_handlers, &std_object_handlers, sizeof(zend_object_handlers));
403404
curl_object_handlers.offset = XtOffsetOf(php_curl, std);
@@ -426,7 +427,6 @@ static zend_object *curl_create_object(zend_class_entry *class_type) {
426427

427428
zend_object_std_init(&intern->std, class_type);
428429
object_properties_init(&intern->std, class_type);
429-
intern->std.handlers = &curl_object_handlers;
430430

431431
return &intern->std;
432432
}

‎ext/curl/multi.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -512,14 +512,11 @@ PHP_FUNCTION(curl_multi_setopt)
512512

513513
/* CurlMultiHandle class */
514514

515-
static zend_object_handlers curl_multi_handlers;
516-
517515
static zend_object *curl_multi_create_object(zend_class_entry *class_type) {
518516
php_curlm *intern = zend_object_alloc(sizeof(php_curlm), class_type);
519517

520518
zend_object_std_init(&intern->std, class_type);
521519
object_properties_init(&intern->std, class_type);
522-
intern->std.handlers = &curl_multi_handlers;
523520

524521
return &intern->std;
525522
}
@@ -582,8 +579,11 @@ static HashTable *curl_multi_get_gc(zend_object *object, zval **table, int *n)
582579
return zend_std_get_properties(object);
583580
}
584581

582+
static zend_object_handlers curl_multi_handlers;
583+
585584
void curl_multi_register_handlers(void) {
586585
curl_multi_ce->create_object = curl_multi_create_object;
586+
curl_multi_ce->default_object_handlers = &curl_multi_handlers;
587587

588588
memcpy(&curl_multi_handlers, &std_object_handlers, sizeof(zend_object_handlers));
589589
curl_multi_handlers.offset = XtOffsetOf(php_curlm, std);

‎ext/curl/share.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -136,14 +136,11 @@ PHP_FUNCTION(curl_share_strerror)
136136

137137
/* CurlShareHandle class */
138138

139-
static zend_object_handlers curl_share_handlers;
140-
141139
static zend_object *curl_share_create_object(zend_class_entry *class_type) {
142140
php_curlsh *intern = zend_object_alloc(sizeof(php_curlsh), class_type);
143141

144142
zend_object_std_init(&intern->std, class_type);
145143
object_properties_init(&intern->std, class_type);
146-
intern->std.handlers = &curl_share_handlers;
147144

148145
return &intern->std;
149146
}
@@ -161,8 +158,11 @@ void curl_share_free_obj(zend_object *object)
161158
zend_object_std_dtor(&sh->std);
162159
}
163160

161+
static zend_object_handlers curl_share_handlers;
162+
164163
void curl_share_register_handlers(void) {
165164
curl_share_ce->create_object = curl_share_create_object;
165+
curl_share_ce->default_object_handlers = &curl_share_handlers;
166166

167167
memcpy(&curl_share_handlers, &std_object_handlers, sizeof(zend_object_handlers));
168168
curl_share_handlers.offset = XtOffsetOf(php_curlsh, std);

‎ext/date/php_date.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1722,6 +1722,7 @@ static void date_register_classes(void) /* {{{ */
17221722

17231723
date_ce_date = register_class_DateTime(date_ce_interface);
17241724
date_ce_date->create_object = date_object_new_date;
1725+
date_ce_date->default_object_handlers = &date_object_handlers_date;
17251726
memcpy(&date_object_handlers_date, &std_object_handlers, sizeof(zend_object_handlers));
17261727
date_object_handlers_date.offset = XtOffsetOf(php_date_obj, std);
17271728
date_object_handlers_date.free_obj = date_object_free_storage_date;
@@ -1732,6 +1733,7 @@ static void date_register_classes(void) /* {{{ */
17321733

17331734
date_ce_immutable = register_class_DateTimeImmutable(date_ce_interface);
17341735
date_ce_immutable->create_object = date_object_new_date;
1736+
date_ce_immutable->default_object_handlers = &date_object_handlers_date;
17351737
memcpy(&date_object_handlers_immutable, &std_object_handlers, sizeof(zend_object_handlers));
17361738
date_object_handlers_immutable.clone_obj = date_object_clone_date;
17371739
date_object_handlers_immutable.compare = date_object_compare_date;
@@ -1740,6 +1742,7 @@ static void date_register_classes(void) /* {{{ */
17401742

17411743
date_ce_timezone = register_class_DateTimeZone();
17421744
date_ce_timezone->create_object = date_object_new_timezone;
1745+
date_ce_timezone->default_object_handlers = &date_object_handlers_timezone;
17431746
memcpy(&date_object_handlers_timezone, &std_object_handlers, sizeof(zend_object_handlers));
17441747
date_object_handlers_timezone.offset = XtOffsetOf(php_timezone_obj, std);
17451748
date_object_handlers_timezone.free_obj = date_object_free_storage_timezone;
@@ -1751,6 +1754,7 @@ static void date_register_classes(void) /* {{{ */
17511754

17521755
date_ce_interval = register_class_DateInterval();
17531756
date_ce_interval->create_object = date_object_new_interval;
1757+
date_ce_interval->default_object_handlers = &date_object_handlers_interval;
17541758
memcpy(&date_object_handlers_interval, &std_object_handlers, sizeof(zend_object_handlers));
17551759
date_object_handlers_interval.offset = XtOffsetOf(php_interval_obj, std);
17561760
date_object_handlers_interval.free_obj = date_object_free_storage_interval;
@@ -1765,6 +1769,7 @@ static void date_register_classes(void) /* {{{ */
17651769

17661770
date_ce_period = register_class_DatePeriod(zend_ce_aggregate);
17671771
date_ce_period->create_object = date_object_new_period;
1772+
date_ce_period->default_object_handlers = &date_object_handlers_period;
17681773
date_ce_period->get_iterator = date_object_period_get_iterator;
17691774
memcpy(&date_object_handlers_period, &std_object_handlers, sizeof(zend_object_handlers));
17701775
date_object_handlers_period.offset = XtOffsetOf(php_period_obj, std);
@@ -1782,7 +1787,6 @@ static zend_object *date_object_new_date(zend_class_entry *class_type) /* {{{ */
17821787

17831788
zend_object_std_init(&intern->std, class_type);
17841789
object_properties_init(&intern->std, class_type);
1785-
intern->std.handlers = &date_object_handlers_date;
17861790

17871791
return &intern->std;
17881792
} /* }}} */
@@ -1923,7 +1927,6 @@ static zend_object *date_object_new_timezone(zend_class_entry *class_type) /* {{
19231927

19241928
zend_object_std_init(&intern->std, class_type);
19251929
object_properties_init(&intern->std, class_type);
1926-
intern->std.handlers = &date_object_handlers_timezone;
19271930

19281931
return &intern->std;
19291932
} /* }}} */
@@ -2076,7 +2079,6 @@ static zend_object *date_object_new_interval(zend_class_entry *class_type) /* {{
20762079

20772080
zend_object_std_init(&intern->std, class_type);
20782081
object_properties_init(&intern->std, class_type);
2079-
intern->std.handlers = &date_object_handlers_interval;
20802082

20812083
return &intern->std;
20822084
} /* }}} */
@@ -2169,8 +2171,6 @@ static zend_object *date_object_new_period(zend_class_entry *class_type) /* {{{
21692171
zend_object_std_init(&intern->std, class_type);
21702172
object_properties_init(&intern->std, class_type);
21712173

2172-
intern->std.handlers = &date_object_handlers_period;
2173-
21742174
return &intern->std;
21752175
} /* }}} */
21762176

‎ext/dom/php_dom.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -660,6 +660,7 @@ PHP_MINIT_FUNCTION(dom)
660660

661661
dom_nodelist_class_entry = register_class_DOMNodeList(zend_ce_aggregate, zend_ce_countable);
662662
dom_nodelist_class_entry->create_object = dom_nnodemap_objects_new;
663+
dom_nodelist_class_entry->default_object_handlers = &dom_nnodemap_object_handlers;
663664
dom_nodelist_class_entry->get_iterator = php_dom_get_iterator;
664665

665666
zend_hash_init(&dom_nodelist_prop_handlers, 0, NULL, dom_dtor_prop_handler, 1);
@@ -668,6 +669,7 @@ PHP_MINIT_FUNCTION(dom)
668669

669670
dom_namednodemap_class_entry = register_class_DOMNamedNodeMap(zend_ce_aggregate, zend_ce_countable);
670671
dom_namednodemap_class_entry->create_object = dom_nnodemap_objects_new;
672+
dom_namednodemap_class_entry->default_object_handlers = &dom_nnodemap_object_handlers;
671673
dom_namednodemap_class_entry->get_iterator = php_dom_get_iterator;
672674

673675
zend_hash_init(&dom_namednodemap_prop_handlers, 0, NULL, dom_dtor_prop_handler, 1);
@@ -1039,8 +1041,6 @@ zend_object *dom_nnodemap_objects_new(zend_class_entry *class_type) /* {{{ */
10391041
objmap->local = NULL;
10401042
objmap->ns = NULL;
10411043

1042-
intern->std.handlers = &dom_nnodemap_object_handlers;
1043-
10441044
return &intern->std;
10451045
}
10461046
/* }}} */

‎ext/enchant/enchant.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ static zend_object *enchant_broker_create_object(zend_class_entry *class_type) {
6161

6262
zend_object_std_init(&intern->std, class_type);
6363
object_properties_init(&intern->std, class_type);
64-
intern->std.handlers = &enchant_broker_handlers;
6564

6665
return &intern->std;
6766
}
@@ -80,7 +79,6 @@ static zend_object *enchant_dict_create_object(zend_class_entry *class_type) {
8079

8180
zend_object_std_init(&intern->std, class_type);
8281
object_properties_init(&intern->std, class_type);
83-
intern->std.handlers = &enchant_dict_handlers;
8482

8583
return &intern->std;
8684
}
@@ -191,6 +189,7 @@ PHP_MINIT_FUNCTION(enchant)
191189
{
192190
enchant_broker_ce = register_class_EnchantBroker();
193191
enchant_broker_ce->create_object = enchant_broker_create_object;
192+
enchant_broker_ce->default_object_handlers = &enchant_broker_handlers;
194193

195194
memcpy(&enchant_broker_handlers, &std_object_handlers, sizeof(zend_object_handlers));
196195
enchant_broker_handlers.offset = XtOffsetOf(enchant_broker, std);
@@ -200,6 +199,7 @@ PHP_MINIT_FUNCTION(enchant)
200199

201200
enchant_dict_ce = register_class_EnchantDictionary();
202201
enchant_dict_ce->create_object = enchant_dict_create_object;
202+
enchant_dict_ce->default_object_handlers = &enchant_dict_handlers;
203203

204204
memcpy(&enchant_dict_handlers, &std_object_handlers, sizeof(zend_object_handlers));
205205
enchant_dict_handlers.offset = XtOffsetOf(enchant_dict, std);

‎ext/ffi/ffi.c

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,7 @@ static zend_always_inline void zend_ffi_object_init(zend_object *object, zend_cl
234234
GC_SET_REFCOUNT(object, 1);
235235
GC_TYPE_INFO(object) = GC_OBJECT | (IS_OBJ_DESTRUCTOR_CALLED << GC_FLAGS_SHIFT);
236236
object->ce = ce;
237+
object->handlers = ce->default_object_handlers;
237238
object->properties = NULL;
238239
zend_objects_store_put(object);
239240
}
@@ -246,7 +247,6 @@ static zend_object *zend_ffi_cdata_new(zend_class_entry *class_type) /* {{{ */
246247
cdata = emalloc(sizeof(zend_ffi_cdata));
247248

248249
zend_ffi_object_init(&cdata->std, class_type);
249-
cdata->std.handlers = &zend_ffi_cdata_handlers;
250250

251251
cdata->type = NULL;
252252
cdata->ptr = NULL;
@@ -495,7 +495,6 @@ static zend_never_inline zend_ffi_cdata *zend_ffi_cdata_to_zval_slow_ptr(void *p
495495
zend_ffi_cdata *cdata = emalloc(sizeof(zend_ffi_cdata));
496496

497497
zend_ffi_object_init(&cdata->std, zend_ffi_cdata_ce);
498-
cdata->std.handlers = &zend_ffi_cdata_handlers;
499498
cdata->type = type;
500499
cdata->flags = flags;
501500
cdata->ptr = (void*)&cdata->ptr_holder;
@@ -2174,7 +2173,6 @@ static zend_object *zend_ffi_ctype_new(zend_class_entry *class_type) /* {{{ */
21742173
ctype = emalloc(sizeof(zend_ffi_ctype));
21752174

21762175
zend_ffi_object_init(&ctype->std, class_type);
2177-
ctype->std.handlers = &zend_ffi_ctype_handlers;
21782176

21792177
ctype->type = NULL;
21802178

@@ -2261,7 +2259,6 @@ static zend_object *zend_ffi_new(zend_class_entry *class_type) /* {{{ */
22612259
ffi = emalloc(sizeof(zend_ffi));
22622260

22632261
zend_ffi_object_init(&ffi->std, class_type);
2264-
ffi->std.handlers = &zend_ffi_handlers;
22652262

22662263
ffi->lib = NULL;
22672264
ffi->symbols = NULL;
@@ -2473,7 +2470,6 @@ static zval *zend_ffi_read_var(zend_object *obj, zend_string *var_name, int read
24732470

24742471
cdata = emalloc(sizeof(zend_ffi_cdata));
24752472
zend_ffi_object_init(&cdata->std, zend_ffi_cdata_ce);
2476-
cdata->std.handlers = &zend_ffi_cdata_handlers;
24772473
cdata->type = ZEND_FFI_TYPE_MAKE_OWNED(new_type);
24782474
cdata->flags = ZEND_FFI_FLAG_CONST;
24792475
cdata->ptr_holder = sym->addr;
@@ -5305,6 +5301,7 @@ ZEND_MINIT_FUNCTION(ffi)
53055301

53065302
zend_ffi_ce = register_class_FFI();
53075303
zend_ffi_ce->create_object = zend_ffi_new;
5304+
zend_ffi_ce->default_object_handlers = &zend_ffi_handlers;
53085305

53095306
memcpy(&zend_ffi_new_fn, zend_hash_str_find_ptr(&zend_ffi_ce->function_table, "new", sizeof("new")-1), sizeof(zend_internal_function));
53105307
zend_ffi_new_fn.fn_flags &= ~ZEND_ACC_STATIC;
@@ -5336,6 +5333,7 @@ ZEND_MINIT_FUNCTION(ffi)
53365333

53375334
zend_ffi_cdata_ce = register_class_FFI_CData();
53385335
zend_ffi_cdata_ce->create_object = zend_ffi_cdata_new;
5336+
zend_ffi_cdata_ce->default_object_handlers = &zend_ffi_cdata_handlers;
53395337
zend_ffi_cdata_ce->get_iterator = zend_ffi_cdata_get_iterator;
53405338

53415339
memcpy(&zend_ffi_cdata_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
@@ -5410,6 +5408,7 @@ ZEND_MINIT_FUNCTION(ffi)
54105408

54115409
zend_ffi_ctype_ce = register_class_FFI_CType();
54125410
zend_ffi_ctype_ce->create_object = zend_ffi_ctype_new;
5411+
zend_ffi_ctype_ce->default_object_handlers = &zend_ffi_ctype_handlers;
54135412

54145413
memcpy(&zend_ffi_ctype_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
54155414
zend_ffi_ctype_handlers.get_constructor = zend_fake_get_constructor;

‎ext/fileinfo/fileinfo.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ PHP_FILEINFO_API zend_object *finfo_objects_new(zend_class_entry *class_type)
8989

9090
zend_object_std_init(&intern->zo, class_type);
9191
object_properties_init(&intern->zo, class_type);
92-
intern->zo.handlers = &finfo_object_handlers;
9392

9493
return &intern->zo;
9594
}
@@ -108,6 +107,7 @@ PHP_MINIT_FUNCTION(finfo)
108107
{
109108
finfo_class_entry = register_class_finfo();
110109
finfo_class_entry->create_object = finfo_objects_new;
110+
finfo_class_entry->default_object_handlers = &finfo_object_handlers;
111111

112112
/* copy the standard object handlers to you handler table */
113113
memcpy(&finfo_object_handlers, &std_object_handlers, sizeof(zend_object_handlers));

0 commit comments

Comments
 (0)