diff --git a/.editorconfig b/.editorconfig
index 45fdfda9..2663e540 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -10,7 +10,7 @@ root = true
 
 [*]
 indent_style = space
-indent_size = 2
+indent_size = 4
 end_of_line = LF
 charset = utf-8
 trim_trailing_whitespace = true
@@ -22,4 +22,10 @@ trim_trailing_whitespace = false
 
 [*.php]
 indent_style = space
-indent_size = 4
\ No newline at end of file
+indent_size = 4
+
+[composer.json]
+indent_style = tab
+
+[{.codeclimate.yml,.travis.yml}]
+indent_size = 2
diff --git a/.php_cs.dist b/.php_cs.dist
new file mode 100644
index 00000000..d80e5d66
--- /dev/null
+++ b/.php_cs.dist
@@ -0,0 +1,8 @@
+<?php
+
+return PhpCsFixer\Config::create()
+    ->setRules([
+        '@Symfony' => true,
+        'array_syntax' => ['syntax' => 'short'],
+    ])
+;