diff --git a/.editorconfig b/.editorconfig
index fd0c5b1d..2c9ddc3c 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -38,6 +38,6 @@ indent_style = space
 indent_size = 2
 trim_trailing_whitespace = false
 
-[.travis.yml]
+[*.yml]
 indent_style = space
-indent_size = 4
+indent_size = 2
diff --git a/.php_cs b/.php_cs
index 9dc9322e..560e2512 100644
--- a/.php_cs
+++ b/.php_cs
@@ -15,9 +15,9 @@ return Symfony\CS\Config\Config::create()
     ->fixers(['concat_with_spaces', 'long_array_syntax', 'standardize_not_equal',
               'operators_spaces', 'duplicate_semicolon',
               'remove_leading_slash_use', 'align_equals',
-              'single_array_no_trailing_comma', 'phpdoc_indent', 'phpdoc_scalar',
-              'phpdoc_to_comment', 'phpdoc_trim',
+              'single_array_no_trailing_comma', 'phpdoc_indent', 'phpdoc_order',
+              'phpdoc_scalar', 'phpdoc_to_comment', 'phpdoc_trim',
               'phpdoc_types', 'print_to_echo', 'self_accessor', 'single_quote',
-              'spaces_cast', 'ternary_spaces', 'phpdoc_order'])
+              'spaces_cast', 'ternary_spaces'])
     ->finder($finder)
 ;
diff --git a/.styleci.yml b/.styleci.yml
index eac39fb8..002616bd 100644
--- a/.styleci.yml
+++ b/.styleci.yml
@@ -5,6 +5,8 @@ risky: false
 enabled:
   - no_empty_comment
   - align_equals
+  - long_array_syntax
+  - concat_with_spaces
 
 disabled:
   - blank_line_after_opening_tag