Adapt .editorconfig

- Add .json rule
- Add .xml rule

diff --git a/.editorconfig b/.editorconfig
index c4555b082156a4940945c53dfaaf11140ed44693..0cb6e3e97d5aeb7fe20f62128c5aa6d312241070 100644 (file)
--- a/.editorconfig
+++ b/.editorconfig
@@ -10,6 +10,7 @@ indent_style = tab
 trim_trailing_whitespace = true
 insert_final_newline = true
 quote_type = single
+max_line_length = off
 
 [*.js]
 quote_type = double
@@ -19,5 +20,13 @@ ij_javascript_use_double_quotes = true
 indent_style = space
 indent_size = 2
 
+[*.xml]
+indent_style = space
+indent_size = 4
+
+[*.json]
+indent_style = space
+indent_size = 2
+
 [composer.json]
-indent_size = tab
+indent_style = tab

diff --git a/composer.json b/composer.json
index c6746c1231c4f63827d664fe899248f53c0d6521..e4e6aa6f036f6c464e6196e7636273a2413d0dfa 100644 (file)
--- a/composer.json
+++ b/composer.json
@@ -132,7 +132,13 @@
                "test": "phpunit",
                "lint": "find . -name \\*.php -not -path './vendor/*' -not -path './view/asset/*' -print0 | xargs -0 -n1 php -l",
                "cs:install": "@composer install --working-dir=bin/dev/php-cs-fixer",
-               "cs:check": ["@cs:install", "bin/dev/php-cs-fixer/vendor/bin/php-cs-fixer fix --dry-run --diff"],
-               "cs:fix": ["@cs:install", "bin/dev/php-cs-fixer/vendor/bin/php-cs-fixer fix"]
+               "cs:check": [
+                       "@cs:install",
+                       "bin/dev/php-cs-fixer/vendor/bin/php-cs-fixer fix --dry-run --diff"
+               ],
+               "cs:fix": [
+                       "@cs:install",
+                       "bin/dev/php-cs-fixer/vendor/bin/php-cs-fixer fix"
+               ]
        }
 }

diff --git a/docblox.dist.xml b/docblox.dist.xml
index a2ea8e2cb7cc5e81d30a80631329a13516859c6c..aff0af91a7ce9202ada2fc7b1f6235357f5d0c76 100644 (file)
--- a/docblox.dist.xml
+++ b/docblox.dist.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <docblox>
-  <parser>
-    <target>data/output</target>
-  </parser>
-  <transformer>
-    <target>data/output</target>
-  </transformer>
-  <files>
-    <directory>.</directory>
-  </files>
+    <parser>
+        <target>data/output</target>
+    </parser>
+    <transformer>
+        <target>data/output</target>
+    </transformer>
+    <files>
+        <directory>.</directory>
+    </files>
 </docblox>