Skip to content

Commit 78129bd

Browse files
GirgiasGirgias
committed
Whitespace revert + code move revert
1 parent e0bf71b commit 78129bd

File tree

1 file changed

+26
-26
lines changed

1 file changed

+26
-26
lines changed

‎Zend/zend_API.c

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1549,8 +1549,8 @@ ZEND_API void object_properties_init_ex(zend_object *object, HashTable *properti
15491549
ZEND_HASH_MAP_FOREACH_STR_KEY_VAL(properties, key, prop) {
15501550
property_info = zend_get_property_info(object->ce, key, 1);
15511551
if (property_info != ZEND_WRONG_PROPERTY_INFO &&
1552-
property_info &&
1553-
(property_info->flags & ZEND_ACC_STATIC) == 0) {
1552+
property_info &&
1553+
(property_info->flags & ZEND_ACC_STATIC) == 0) {
15541554
zval *slot = OBJ_PROP(object, property_info->offset);
15551555

15561556
if (UNEXPECTED(ZEND_TYPE_IS_SET(property_info->type))) {
@@ -2275,7 +2275,7 @@ ZEND_API void zend_collect_module_handlers(void) /* {{{ */
22752275
}
22762276
} ZEND_HASH_FOREACH_END();
22772277
module_request_startup_handlers = (zend_module_entry**)malloc(
2278-
sizeof(zend_module_entry*) *
2278+
sizeof(zend_module_entry*) *
22792279
(startup_count + 1 +
22802280
shutdown_count + 1 +
22812281
post_deactivate_count + 1));
@@ -2301,8 +2301,8 @@ ZEND_API void zend_collect_module_handlers(void) /* {{{ */
23012301
/* Collect internal classes with static members */
23022302
ZEND_HASH_MAP_FOREACH_PTR(CG(class_table), ce) {
23032303
if (ce->type == ZEND_INTERNAL_CLASS &&
2304-
ce->default_static_members_count > 0) {
2305-
class_count++;
2304+
ce->default_static_members_count > 0) {
2305+
class_count++;
23062306
}
23072307
} ZEND_HASH_FOREACH_END();
23082308

@@ -2314,8 +2314,8 @@ ZEND_API void zend_collect_module_handlers(void) /* {{{ */
23142314
if (class_count) {
23152315
ZEND_HASH_MAP_FOREACH_PTR(CG(class_table), ce) {
23162316
if (ce->type == ZEND_INTERNAL_CLASS &&
2317-
ce->default_static_members_count > 0) {
2318-
class_cleanup_handlers[--class_count] = ce;
2317+
ce->default_static_members_count > 0) {
2318+
class_cleanup_handlers[--class_count] = ce;
23192319
}
23202320
} ZEND_HASH_FOREACH_END();
23212321
}
@@ -2791,7 +2791,7 @@ ZEND_API zend_result zend_register_functions(zend_class_entry *scope, const zend
27912791
zend_internal_arg_info *arg_info = &reg_function->internal_function.arg_info[i];
27922792
ZEND_ASSERT(arg_info->name && "Parameter must have a name");
27932793
if (ZEND_TYPE_IS_SET(arg_info->type)) {
2794-
reg_function->common.fn_flags |= ZEND_ACC_HAS_TYPE_HINTS;
2794+
reg_function->common.fn_flags |= ZEND_ACC_HAS_TYPE_HINTS;
27952795
}
27962796
#if ZEND_DEBUG
27972797
for (uint32_t j = 0; j < i; j++) {
@@ -2807,14 +2807,14 @@ ZEND_API zend_result zend_register_functions(zend_class_entry *scope, const zend
28072807

28082808
/* Rebuild arginfos if parameter/property types and/or a return type are used */
28092809
if (reg_function->common.arg_info &&
2810-
(reg_function->common.fn_flags & (ZEND_ACC_HAS_RETURN_TYPE|ZEND_ACC_HAS_TYPE_HINTS))) {
2811-
/* Treat return type as an extra argument */
2812-
num_args++;
2810+
(reg_function->common.fn_flags & (ZEND_ACC_HAS_RETURN_TYPE|ZEND_ACC_HAS_TYPE_HINTS))) {
28132811
/* convert "const char*" class type names into "zend_string*" */
28142812
uint32_t i;
28152813
zend_arg_info *arg_info = reg_function->common.arg_info - 1;
28162814
zend_arg_info *new_arg_info;
28172815

2816+
/* Treat return type as an extra argument */
2817+
num_args++;
28182818
new_arg_info = malloc(sizeof(zend_arg_info) * num_args);
28192819
memcpy(new_arg_info, arg_info, sizeof(zend_arg_info) * num_args);
28202820
reg_function->common.arg_info = new_arg_info + 1;
@@ -3432,8 +3432,8 @@ static bool zend_is_callable_check_class(zend_string *name, zend_class_entry *sc
34323432
if (!fcc->object) {
34333433
fcc->object = zend_get_this_object(frame);
34343434
}
3435-
*strict_class = 1;
3436-
ret = 1;
3435+
*strict_class = 1;
3436+
ret = 1;
34373437
}
34383438
} else if ((ce = zend_lookup_class(name)) != NULL) {
34393439
zend_class_entry *scope = get_scope(frame);
@@ -3548,8 +3548,8 @@ static zend_always_inline bool zend_is_callable_check_func(zval *callable, zend_
35483548
zend_object *object = zend_get_this_object(frame);
35493549

35503550
if (object &&
3551-
instanceof_function(object->ce, scope) &&
3552-
instanceof_function(scope, fcc->calling_scope)) {
3551+
instanceof_function(object->ce, scope) &&
3552+
instanceof_function(scope, fcc->calling_scope)) {
35533553
fcc->object = object;
35543554
fcc->called_scope = object->ce;
35553555
} else {
@@ -3592,7 +3592,7 @@ static zend_always_inline bool zend_is_callable_check_func(zval *callable, zend_
35923592

35933593
lmname = zend_string_tolower(mname);
35943594
if (strict_class &&
3595-
fcc->calling_scope &&
3595+
fcc->calling_scope &&
35963596
zend_string_equals_literal(lmname, ZEND_CONSTRUCTOR_FUNC_NAME)) {
35973597
fcc->function_handler = fcc->calling_scope->constructor;
35983598
if (fcc->function_handler) {
@@ -3602,10 +3602,10 @@ static zend_always_inline bool zend_is_callable_check_func(zval *callable, zend_
36023602
fcc->function_handler = Z_PTR_P(zv);
36033603
retval = 1;
36043604
if ((fcc->function_handler->op_array.fn_flags & ZEND_ACC_CHANGED) &&
3605-
!strict_class) {
3605+
!strict_class) {
36063606
scope = get_scope(frame);
36073607
if (scope &&
3608-
instanceof_function(fcc->function_handler->common.scope, scope)) {
3608+
instanceof_function(fcc->function_handler->common.scope, scope)) {
36093609

36103610
zv = zend_hash_find(&scope->function_table, lmname);
36113611
if (zv != NULL) {
@@ -3619,9 +3619,9 @@ static zend_always_inline bool zend_is_callable_check_func(zval *callable, zend_
36193619
}
36203620
}
36213621
if (!(fcc->function_handler->common.fn_flags & ZEND_ACC_PUBLIC) &&
3622-
(fcc->calling_scope &&
3623-
((fcc->object && fcc->calling_scope->__call) ||
3624-
(!fcc->object && fcc->calling_scope->__callstatic)))) {
3622+
(fcc->calling_scope &&
3623+
((fcc->object && fcc->calling_scope->__call) ||
3624+
(!fcc->object && fcc->calling_scope->__callstatic)))) {
36253625
scope = get_scope(frame);
36263626
if (fcc->function_handler->common.scope != scope) {
36273627
if ((fcc->function_handler->common.fn_flags & ZEND_ACC_PRIVATE)
@@ -3643,8 +3643,8 @@ static zend_always_inline bool zend_is_callable_check_func(zval *callable, zend_
36433643
fcc->function_handler = fcc->object->handlers->get_method(&fcc->object, mname, NULL);
36443644
if (fcc->function_handler) {
36453645
if (strict_class &&
3646-
(!fcc->function_handler->common.scope ||
3647-
!instanceof_function(ce_org, fcc->function_handler->common.scope))) {
3646+
(!fcc->function_handler->common.scope ||
3647+
!instanceof_function(ce_org, fcc->function_handler->common.scope))) {
36483648
zend_release_fcall_info_cache(fcc);
36493649
} else {
36503650
retval = 1;
@@ -3664,7 +3664,7 @@ static zend_always_inline bool zend_is_callable_check_func(zval *callable, zend_
36643664
if (call_via_handler && !fcc->object) {
36653665
zend_object *object = zend_get_this_object(frame);
36663666
if (object &&
3667-
instanceof_function(object->ce, fcc->calling_scope)) {
3667+
instanceof_function(object->ce, fcc->calling_scope)) {
36683668
fcc->object = object;
36693669
}
36703670
}
@@ -4133,7 +4133,7 @@ ZEND_API zend_property_info *zend_declare_typed_property(zend_class_entry *ce, z
41334133
}
41344134
if (access_type & ZEND_ACC_STATIC) {
41354135
if ((property_info_ptr = zend_hash_find_ptr(&ce->properties_info, name)) != NULL &&
4136-
(property_info_ptr->flags & ZEND_ACC_STATIC) != 0) {
4136+
(property_info_ptr->flags & ZEND_ACC_STATIC) != 0) {
41374137
property_info->offset = property_info_ptr->offset;
41384138
zval_ptr_dtor(&ce->default_static_members_table[property_info->offset]);
41394139
zend_hash_del(&ce->properties_info, name);
@@ -4151,7 +4151,7 @@ ZEND_API zend_property_info *zend_declare_typed_property(zend_class_entry *ce, z
41514151
} else {
41524152
zval *property_default_ptr;
41534153
if ((property_info_ptr = zend_hash_find_ptr(&ce->properties_info, name)) != NULL &&
4154-
(property_info_ptr->flags & ZEND_ACC_STATIC) == 0) {
4154+
(property_info_ptr->flags & ZEND_ACC_STATIC) == 0) {
41554155
property_info->offset = property_info_ptr->offset;
41564156
zval_ptr_dtor(&ce->default_properties_table[OBJ_PROP_TO_NUM(property_info->offset)]);
41574157
zend_hash_del(&ce->properties_info, name);

0 commit comments

Comments
 (0)