Skip to content

Commit 21a75ab

Browse files
GirgiasGirgias
committed
Nit + whitespaces
1 parent e239a68 commit 21a75ab

File tree

2 files changed

+25
-25
lines changed

2 files changed

+25
-25
lines changed

‎Zend/zend_API.c

Lines changed: 24 additions & 24 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
}
@@ -2795,7 +2795,7 @@ ZEND_API zend_result zend_register_functions(zend_class_entry *scope, const zend
27952795
if (ZEND_TYPE_IS_ITERABLE_FALLBACK(arg_info->type)) {
27962796
rebuild_arginfo = true;
27972797
}
2798-
reg_function->common.fn_flags |= ZEND_ACC_HAS_TYPE_HINTS;
2798+
reg_function->common.fn_flags |= ZEND_ACC_HAS_TYPE_HINTS;
27992799
}
28002800
#if ZEND_DEBUG
28012801
for (uint32_t j = 0; j < i; j++) {
@@ -2810,7 +2810,7 @@ ZEND_API zend_result zend_register_functions(zend_class_entry *scope, const zend
28102810
}
28112811

28122812
if (reg_function->common.arg_info &&
2813-
(reg_function->common.fn_flags & (ZEND_ACC_HAS_RETURN_TYPE|ZEND_ACC_HAS_TYPE_HINTS))) {
2813+
(reg_function->common.fn_flags & (ZEND_ACC_HAS_RETURN_TYPE|ZEND_ACC_HAS_TYPE_HINTS))) {
28142814
/* Treat return type as an extra argument */
28152815
num_args++;
28162816
rebuild_arginfo = true;
@@ -3437,8 +3437,8 @@ static bool zend_is_callable_check_class(zend_string *name, zend_class_entry *sc
34373437
zend_object *object = zend_get_this_object(frame);
34383438

34393439
if (object &&
3440-
instanceof_function(object->ce, scope) &&
3441-
instanceof_function(scope, ce)) {
3440+
instanceof_function(object->ce, scope) &&
3441+
instanceof_function(scope, ce)) {
34423442
fcc->object = object;
34433443
fcc->called_scope = object->ce;
34443444
} else {
@@ -3543,8 +3543,8 @@ static zend_always_inline bool zend_is_callable_check_func(zval *callable, zend_
35433543
zend_object *object = zend_get_this_object(frame);
35443544

35453545
if (object &&
3546-
instanceof_function(object->ce, scope) &&
3547-
instanceof_function(scope, fcc->calling_scope)) {
3546+
instanceof_function(object->ce, scope) &&
3547+
instanceof_function(scope, fcc->calling_scope)) {
35483548
fcc->object = object;
35493549
fcc->called_scope = object->ce;
35503550
} else {
@@ -3587,7 +3587,7 @@ static zend_always_inline bool zend_is_callable_check_func(zval *callable, zend_
35873587

35883588
lmname = zend_string_tolower(mname);
35893589
if (strict_class &&
3590-
fcc->calling_scope &&
3590+
fcc->calling_scope &&
35913591
zend_string_equals_literal(lmname, ZEND_CONSTRUCTOR_FUNC_NAME)) {
35923592
fcc->function_handler = fcc->calling_scope->constructor;
35933593
if (fcc->function_handler) {
@@ -3597,10 +3597,10 @@ static zend_always_inline bool zend_is_callable_check_func(zval *callable, zend_
35973597
fcc->function_handler = Z_PTR_P(zv);
35983598
retval = 1;
35993599
if ((fcc->function_handler->op_array.fn_flags & ZEND_ACC_CHANGED) &&
3600-
!strict_class) {
3600+
!strict_class) {
36013601
scope = get_scope(frame);
36023602
if (scope &&
3603-
instanceof_function(fcc->function_handler->common.scope, scope)) {
3603+
instanceof_function(fcc->function_handler->common.scope, scope)) {
36043604

36053605
zv = zend_hash_find(&scope->function_table, lmname);
36063606
if (zv != NULL) {
@@ -3614,9 +3614,9 @@ static zend_always_inline bool zend_is_callable_check_func(zval *callable, zend_
36143614
}
36153615
}
36163616
if (!(fcc->function_handler->common.fn_flags & ZEND_ACC_PUBLIC) &&
3617-
(fcc->calling_scope &&
3618-
((fcc->object && fcc->calling_scope->__call) ||
3619-
(!fcc->object && fcc->calling_scope->__callstatic)))) {
3617+
(fcc->calling_scope &&
3618+
((fcc->object && fcc->calling_scope->__call) ||
3619+
(!fcc->object && fcc->calling_scope->__callstatic)))) {
36203620
scope = get_scope(frame);
36213621
if (fcc->function_handler->common.scope != scope) {
36223622
if ((fcc->function_handler->common.fn_flags & ZEND_ACC_PRIVATE)
@@ -3638,8 +3638,8 @@ static zend_always_inline bool zend_is_callable_check_func(zval *callable, zend_
36383638
fcc->function_handler = fcc->object->handlers->get_method(&fcc->object, mname, NULL);
36393639
if (fcc->function_handler) {
36403640
if (strict_class &&
3641-
(!fcc->function_handler->common.scope ||
3642-
!instanceof_function(ce_org, fcc->function_handler->common.scope))) {
3641+
(!fcc->function_handler->common.scope ||
3642+
!instanceof_function(ce_org, fcc->function_handler->common.scope))) {
36433643
zend_release_fcall_info_cache(fcc);
36443644
} else {
36453645
retval = 1;
@@ -3659,7 +3659,7 @@ static zend_always_inline bool zend_is_callable_check_func(zval *callable, zend_
36593659
if (call_via_handler && !fcc->object) {
36603660
zend_object *object = zend_get_this_object(frame);
36613661
if (object &&
3662-
instanceof_function(object->ce, fcc->calling_scope)) {
3662+
instanceof_function(object->ce, fcc->calling_scope)) {
36633663
fcc->object = object;
36643664
}
36653665
}
@@ -4128,7 +4128,7 @@ ZEND_API zend_property_info *zend_declare_typed_property(zend_class_entry *ce, z
41284128
}
41294129
if (access_type & ZEND_ACC_STATIC) {
41304130
if ((property_info_ptr = zend_hash_find_ptr(&ce->properties_info, name)) != NULL &&
4131-
(property_info_ptr->flags & ZEND_ACC_STATIC) != 0) {
4131+
(property_info_ptr->flags & ZEND_ACC_STATIC) != 0) {
41324132
property_info->offset = property_info_ptr->offset;
41334133
zval_ptr_dtor(&ce->default_static_members_table[property_info->offset]);
41344134
zend_hash_del(&ce->properties_info, name);
@@ -4146,7 +4146,7 @@ ZEND_API zend_property_info *zend_declare_typed_property(zend_class_entry *ce, z
41464146
} else {
41474147
zval *property_default_ptr;
41484148
if ((property_info_ptr = zend_hash_find_ptr(&ce->properties_info, name)) != NULL &&
4149-
(property_info_ptr->flags & ZEND_ACC_STATIC) == 0) {
4149+
(property_info_ptr->flags & ZEND_ACC_STATIC) == 0) {
41504150
property_info->offset = property_info_ptr->offset;
41514151
zval_ptr_dtor(&ce->default_properties_table[OBJ_PROP_TO_NUM(property_info->offset)]);
41524152
zend_hash_del(&ce->properties_info, name);

‎ext/reflection/php_reflection.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3137,7 +3137,7 @@ ZEND_METHOD(ReflectionUnionType, getTypes)
31373137
if (type_mask & MAY_BE_OBJECT) {
31383138
append_type_mask(return_value, MAY_BE_OBJECT);
31393139
}
3140-
if ((type_mask & MAY_BE_ARRAY)) {
3140+
if (type_mask & MAY_BE_ARRAY) {
31413141
append_type_mask(return_value, MAY_BE_ARRAY);
31423142
}
31433143
if (type_mask & MAY_BE_STRING) {

0 commit comments

Comments
 (0)