Skip to content

Commit 955c721

Browse files
GirgiasGirgias
committed
Nit + whitespaces
1 parent 12a3e1e commit 955c721

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;
@@ -3449,8 +3449,8 @@ static bool zend_is_callable_check_class(zend_string *name, zend_class_entry *sc
34493449
zend_object *object = zend_get_this_object(frame);
34503450

34513451
if (object &&
3452-
instanceof_function(object->ce, scope) &&
3453-
instanceof_function(scope, ce)) {
3452+
instanceof_function(object->ce, scope) &&
3453+
instanceof_function(scope, ce)) {
34543454
fcc->object = object;
34553455
fcc->called_scope = object->ce;
34563456
} else {
@@ -3555,8 +3555,8 @@ static zend_always_inline bool zend_is_callable_check_func(zval *callable, zend_
35553555
zend_object *object = zend_get_this_object(frame);
35563556

35573557
if (object &&
3558-
instanceof_function(object->ce, scope) &&
3559-
instanceof_function(scope, fcc->calling_scope)) {
3558+
instanceof_function(object->ce, scope) &&
3559+
instanceof_function(scope, fcc->calling_scope)) {
35603560
fcc->object = object;
35613561
fcc->called_scope = object->ce;
35623562
} else {
@@ -3599,7 +3599,7 @@ static zend_always_inline bool zend_is_callable_check_func(zval *callable, zend_
35993599

36003600
lmname = zend_string_tolower(mname);
36013601
if (strict_class &&
3602-
fcc->calling_scope &&
3602+
fcc->calling_scope &&
36033603
zend_string_equals_literal(lmname, ZEND_CONSTRUCTOR_FUNC_NAME)) {
36043604
fcc->function_handler = fcc->calling_scope->constructor;
36053605
if (fcc->function_handler) {
@@ -3609,10 +3609,10 @@ static zend_always_inline bool zend_is_callable_check_func(zval *callable, zend_
36093609
fcc->function_handler = Z_PTR_P(zv);
36103610
retval = 1;
36113611
if ((fcc->function_handler->op_array.fn_flags & ZEND_ACC_CHANGED) &&
3612-
!strict_class) {
3612+
!strict_class) {
36133613
scope = get_scope(frame);
36143614
if (scope &&
3615-
instanceof_function(fcc->function_handler->common.scope, scope)) {
3615+
instanceof_function(fcc->function_handler->common.scope, scope)) {
36163616

36173617
zv = zend_hash_find(&scope->function_table, lmname);
36183618
if (zv != NULL) {
@@ -3626,9 +3626,9 @@ static zend_always_inline bool zend_is_callable_check_func(zval *callable, zend_
36263626
}
36273627
}
36283628
if (!(fcc->function_handler->common.fn_flags & ZEND_ACC_PUBLIC) &&
3629-
(fcc->calling_scope &&
3630-
((fcc->object && fcc->calling_scope->__call) ||
3631-
(!fcc->object && fcc->calling_scope->__callstatic)))) {
3629+
(fcc->calling_scope &&
3630+
((fcc->object && fcc->calling_scope->__call) ||
3631+
(!fcc->object && fcc->calling_scope->__callstatic)))) {
36323632
scope = get_scope(frame);
36333633
if (fcc->function_handler->common.scope != scope) {
36343634
if ((fcc->function_handler->common.fn_flags & ZEND_ACC_PRIVATE)
@@ -3650,8 +3650,8 @@ static zend_always_inline bool zend_is_callable_check_func(zval *callable, zend_
36503650
fcc->function_handler = fcc->object->handlers->get_method(&fcc->object, mname, NULL);
36513651
if (fcc->function_handler) {
36523652
if (strict_class &&
3653-
(!fcc->function_handler->common.scope ||
3654-
!instanceof_function(ce_org, fcc->function_handler->common.scope))) {
3653+
(!fcc->function_handler->common.scope ||
3654+
!instanceof_function(ce_org, fcc->function_handler->common.scope))) {
36553655
zend_release_fcall_info_cache(fcc);
36563656
} else {
36573657
retval = 1;
@@ -3671,7 +3671,7 @@ static zend_always_inline bool zend_is_callable_check_func(zval *callable, zend_
36713671
if (call_via_handler && !fcc->object) {
36723672
zend_object *object = zend_get_this_object(frame);
36733673
if (object &&
3674-
instanceof_function(object->ce, fcc->calling_scope)) {
3674+
instanceof_function(object->ce, fcc->calling_scope)) {
36753675
fcc->object = object;
36763676
}
36773677
}
@@ -4140,7 +4140,7 @@ ZEND_API zend_property_info *zend_declare_typed_property(zend_class_entry *ce, z
41404140
}
41414141
if (access_type & ZEND_ACC_STATIC) {
41424142
if ((property_info_ptr = zend_hash_find_ptr(&ce->properties_info, name)) != NULL &&
4143-
(property_info_ptr->flags & ZEND_ACC_STATIC) != 0) {
4143+
(property_info_ptr->flags & ZEND_ACC_STATIC) != 0) {
41444144
property_info->offset = property_info_ptr->offset;
41454145
zval_ptr_dtor(&ce->default_static_members_table[property_info->offset]);
41464146
zend_hash_del(&ce->properties_info, name);
@@ -4158,7 +4158,7 @@ ZEND_API zend_property_info *zend_declare_typed_property(zend_class_entry *ce, z
41584158
} else {
41594159
zval *property_default_ptr;
41604160
if ((property_info_ptr = zend_hash_find_ptr(&ce->properties_info, name)) != NULL &&
4161-
(property_info_ptr->flags & ZEND_ACC_STATIC) == 0) {
4161+
(property_info_ptr->flags & ZEND_ACC_STATIC) == 0) {
41624162
property_info->offset = property_info_ptr->offset;
41634163
zval_ptr_dtor(&ce->default_properties_table[OBJ_PROP_TO_NUM(property_info->offset)]);
41644164
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)