diff --git a/.php_cs b/.php-cs-fixer.php
similarity index 77%
rename from .php_cs
rename to .php-cs-fixer.php
index 483979bc..fe5a040f 100644
--- a/.php_cs
+++ b/.php-cs-fixer.php
@@ -22,7 +22,8 @@ public function getRules(): array
             ],
             'blank_line_after_opening_tag' => true,
             'blank_line_after_namespace' => true,
-            'blank_line_before_return' => true,
+//            'blank_line_before_return' => true,
+            'blank_line_before_statement' => ['statements' => ['return']],
             'braces' => true,
             'cast_spaces' => true,
             'class_definition' => true,
@@ -34,16 +35,19 @@ public function getRules(): array
             'full_opening_tag' => true,
             'function_declaration' => true,
             'function_typehint_space' => true,
-            'hash_to_slash_comment' => true,
+//            'hash_to_slash_comment' => true,
+            'single_line_comment_style' => ['comment_types' => ['hash']],
             'header_comment' => false,
             'include' => true,
             'indentation_type' => true,
             'linebreak_after_opening_tag' => true,
             'line_ending' => true,
-            'lowercase_constants' => true,
+//            'lowercase_constants' => true,
+            'constant_case' => ['case' => 'lower'],
             'lowercase_keywords' => true,
             'method_argument_space' => true,
-            'method_separation' => true,
+//            'method_separation' => true,
+            'class_attributes_separation' => ['elements' => ['method' => 'one']],
             'modernize_types_casting' => true,
             'native_function_casing' => true,
             'new_with_braces' => true,
@@ -51,13 +55,16 @@ public function getRules(): array
             'no_blank_lines_after_class_opening' => true,
             'no_closing_tag' => true,
             'no_empty_statement' => true,
-            'no_extra_consecutive_blank_lines' => true,
+//            'no_extra_consecutive_blank_lines' => true,
+            'no_extra_blank_lines' => true,
             'no_leading_import_slash' => true,
             'no_leading_namespace_whitespace' => true,
             'no_multiline_whitespace_around_double_arrow' => true,
-            'no_multiline_whitespace_before_semicolons' => true,
+//            'no_multiline_whitespace_before_semicolons' => true,
+            'multiline_whitespace_before_semicolons' => true,
             'no_short_bool_cast' => true,
-            'no_short_echo_tag' => true,
+//            'no_short_echo_tag' => true,
+            'echo_tag_syntax' => true,
             'no_singleline_whitespace_before_semicolons' => true,
             'no_spaces_around_offset' => true,
             'no_trailing_comma_in_list_call' => true,
@@ -76,8 +83,12 @@ public function getRules(): array
             'object_operator_without_whitespace' => true,
             'ordered_imports' => true,
             'phpdoc_indent' => true,
-            'phpdoc_inline_tag' => true,
-            'psr4' => true,
+//            'phpdoc_inline_tag' => true,
+            'general_phpdoc_tag_rename' => true,
+            'phpdoc_inline_tag_normalizer' => true,
+            'phpdoc_tag_type' => true,
+//            'psr4' => true,
+            'psr_autoloading' => true,
             'return_type_declaration' => true,
             'semicolon_after_instruction' => true,
             'short_scalar_cast' => true,
@@ -92,7 +103,8 @@ public function getRules(): array
             'switch_case_semicolon_to_colon' => true,
             'switch_case_space' => true,
             'ternary_operator_spaces' => true,
-            'trailing_comma_in_multiline_array' => true,
+//            'trailing_comma_in_multiline_array' => true,
+            'trailing_comma_in_multiline' => true,
             'trim_array_spaces' => true,
             'unary_operator_spaces' => true,
             'visibility_required' => true,