diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 000000000..a43d2a4ff
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,9 @@
+root = true
+
+[*.php]
+indent_style = space
+indent_size = 4
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
diff --git a/.php_cs.dist b/.php_cs.dist
index be116019d..13298b538 100644
--- a/.php_cs.dist
+++ b/.php_cs.dist
@@ -3,7 +3,7 @@ $finder = array_reduce(
     [
         __DIR__ . '/src/',
         __DIR__ . '/bin/',
-        __DIR__ . '/tests/'
+        __DIR__ . '/tests/',
     ],
     function (PhpCsFixer\Finder $finder, $dir) {
         return $finder->in($dir);
diff --git a/composer.json b/composer.json
index 2b7622f22..e4797dfe1 100644
--- a/composer.json
+++ b/composer.json
@@ -35,6 +35,7 @@
         "standards": "php ./vendor/friendsofphp/php-cs-fixer/php-cs-fixer fix --verbose --allow-risky=yes",
         "tests": [
             "php ./vendor/squizlabs/php_codesniffer/bin/phpcs",
+            "php ./vendor/friendsofphp/php-cs-fixer/php-cs-fixer fix --verbose --allow-risky=yes --dry-run .php_cs.dist",
             "php ./vendor/friendsofphp/php-cs-fixer/php-cs-fixer fix --verbose --allow-risky=yes --dry-run",
             "phpunit"
         ]