Updated coding style to match local setup.

.editorconfig

@@ -581,7 +581,7 @@ ij_php_align_assignments = false
 ij_php_align_class_constants = false
 ij_php_align_group_field_declarations = false
 ij_php_align_inline_comments = false
-ij_php_align_key_value_pairs = false
+ij_php_align_key_value_pairs = true
 ij_php_align_multiline_array_initializer_expression = false
 ij_php_align_multiline_binary_operation = false
 ij_php_align_multiline_chained_methods = false
@@ -598,23 +598,24 @@ ij_php_array_initializer_new_line_after_left_brace = false
 ij_php_array_initializer_right_brace_on_new_line = false
 ij_php_array_initializer_wrap = off
 ij_php_assignment_wrap = off
+ij_php_attributes_wrap = off
 ij_php_author_weight = 28
 ij_php_binary_operation_sign_on_next_line = false
 ij_php_binary_operation_wrap = off
-ij_php_blank_lines_after_class_header = 0
+ij_php_blank_lines_after_class_header = 1
 ij_php_blank_lines_after_function = 1
 ij_php_blank_lines_after_imports = 1
 ij_php_blank_lines_after_opening_tag = 0
 ij_php_blank_lines_after_package = 0
-ij_php_blank_lines_around_class = 1
+ij_php_blank_lines_around_class = 2
 ij_php_blank_lines_around_constants = 0
 ij_php_blank_lines_around_field = 0
 ij_php_blank_lines_around_method = 1
 ij_php_blank_lines_before_class_end = 0
 ij_php_blank_lines_before_imports = 1
-ij_php_blank_lines_before_method_body = 0
+ij_php_blank_lines_before_method_body = 1
 ij_php_blank_lines_before_package = 1
-ij_php_blank_lines_before_return_statement = 0
+ij_php_blank_lines_before_return_statement = 1
 ij_php_blank_lines_between_imports = 0
 ij_php_block_brace_style = next_line
 ij_php_call_parameters_new_line_after_left_paren = false
@@ -627,8 +628,8 @@ ij_php_comma_after_last_array_element = false
 ij_php_concat_spaces = true
 ij_php_copyright_weight = 28
 ij_php_deprecated_weight = 28
-ij_php_do_while_brace_force = never
-ij_php_else_if_style = as_is
+ij_php_do_while_brace_force = always
+ij_php_else_if_style = combine
 ij_php_else_on_new_line = true
 ij_php_example_weight = 28
 ij_php_extends_keyword_wrap = off
@@ -636,14 +637,14 @@ ij_php_extends_list_wrap = off
 ij_php_fields_default_visibility = private
 ij_php_filesource_weight = 28
 ij_php_finally_on_new_line = true
-ij_php_for_brace_force = never
+ij_php_for_brace_force = always
 ij_php_for_statement_new_line_after_left_paren = false
 ij_php_for_statement_right_paren_on_new_line = false
 ij_php_for_statement_wrap = off
 ij_php_force_short_declaration_array_style = false
 ij_php_global_weight = 28
 ij_php_group_use_wrap = on_every_item
-ij_php_if_brace_force = never
+ij_php_if_brace_force = always
 ij_php_if_lparen_on_next_line = false
 ij_php_if_rparen_on_next_line = false
 ij_php_ignore_weight = 28
@@ -661,15 +662,16 @@ ij_php_keep_first_column_comment = true
 ij_php_keep_indents_on_empty_lines = false
 ij_php_keep_line_breaks = true
 ij_php_keep_rparen_and_lbrace_on_one_line = false
-ij_php_keep_simple_methods_in_one_line = false
+ij_php_keep_simple_classes_in_one_line = false
+ij_php_keep_simple_methods_in_one_line = true
 ij_php_lambda_brace_style = next_line
 ij_php_license_weight = 28
 ij_php_line_comment_add_space = false
 ij_php_line_comment_at_first_column = true
 ij_php_link_weight = 28
-ij_php_lower_case_boolean_const = false
+ij_php_lower_case_boolean_const = true
 ij_php_lower_case_keywords = true
-ij_php_lower_case_null_const = false
+ij_php_lower_case_null_const = true
 ij_php_method_brace_style = next_line
 ij_php_method_call_chain_wrap = off
 ij_php_method_parameters_new_line_after_left_paren = false
@@ -708,12 +710,12 @@ ij_php_space_after_colon_in_return_type = true
 ij_php_space_after_comma = true
 ij_php_space_after_for_semicolon = true
 ij_php_space_after_quest = true
-ij_php_space_after_type_cast = false
+ij_php_space_after_type_cast = true
 ij_php_space_after_unary_not = false
 ij_php_space_before_array_initializer_left_brace = false
 ij_php_space_before_catch_keyword = true
 ij_php_space_before_catch_left_brace = true
-ij_php_space_before_catch_parentheses = true
+ij_php_space_before_catch_parentheses = false
 ij_php_space_before_class_left_brace = true
 ij_php_space_before_closure_left_parenthesis = true
 ij_php_space_before_colon = true
@@ -766,7 +768,7 @@ ij_php_spaces_within_parentheses = false
 ij_php_spaces_within_short_echo_tags = true
 ij_php_spaces_within_switch_parentheses = false
 ij_php_spaces_within_while_parentheses = false
-ij_php_special_else_if_treatment = false
+ij_php_special_else_if_treatment = true
 ij_php_subpackage_weight = 28
 ij_php_ternary_operation_signs_on_next_line = false
 ij_php_ternary_operation_wrap = off
@@ -779,8 +781,8 @@ ij_php_uses_weight = 28
 ij_php_var_weight = 28
 ij_php_variable_naming_style = mixed
 ij_php_version_weight = 28
-ij_php_while_brace_force = never
-ij_php_while_on_new_line = false
+ij_php_while_brace_force = always
+ij_php_while_on_new_line = true
 
 [{*.har,*.jsb2,*.jsb3,*.json,.babelrc,.eslintrc,.stylelintrc,bowerrc,composer.lock,jest.config}]
 indent_size = 2