diff --git a/.editorconfig b/.editorconfig
index 969f536a0..744e82c79 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -473,7 +473,7 @@ ij_continuation_indent_size = 2
 indent_style = tab
 ij_continuation_indent_size = 4
 ij_smart_tabs = true
-ij_php_align_assignments = false
+ij_php_align_assignments = true
 ij_php_align_class_constants = false
 ij_php_align_group_field_declarations = false
 ij_php_align_inline_comments = false
@@ -486,8 +486,8 @@ ij_php_align_multiline_for = true
 ij_php_align_multiline_parameters = true
 ij_php_align_multiline_parameters_in_calls = false
 ij_php_align_multiline_ternary_operation = false
-ij_php_align_phpdoc_comments = false
-ij_php_align_phpdoc_param_names = false
+ij_php_align_phpdoc_comments = true
+ij_php_align_phpdoc_param_names = true
 ij_php_anonymous_brace_style = next_line
 ij_php_api_weight = 28
 ij_php_array_initializer_new_line_after_left_brace = false
@@ -545,7 +545,7 @@ ij_php_if_lparen_on_next_line = false
 ij_php_if_rparen_on_next_line = false
 ij_php_ignore_weight = 28
 ij_php_import_sorting = alphabetic
-ij_php_indent_break_from_case = true
+ij_php_indent_break_from_case = false
 ij_php_indent_case_from_switch = true
 ij_php_indent_code_in_php_tags = false
 ij_php_internal_weight = 28