From: VirtualTam <virtualtam@flibidi.net>
Date: Wed, 11 Oct 2017 19:35:17 +0000 (+0200)
Subject: Add EditorConfig configuration
X-Git-Tag: v0.9.4~45^2
X-Git-Url: https://git.immae.eu/?p=github%2Fshaarli%2FShaarli.git;a=commitdiff_plain;h=e9619cc4f8717c1b8b66f60998cf8402bb983349

Add EditorConfig configuration

EditorConfig allows specifying indentation, line feed and encoding
properties according to the type of file being edited.

Most editors support it out-of-the-box, or can benefit from it through a
plugin.

See:
- http://editorconfig.org/
- https://github.com/editorconfig/editorconfig
- https://github.com/editorconfig/editorconfig/wiki/EditorConfig-Properties

Signed-off-by: VirtualTam <virtualtam@flibidi.net>
---

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000..5abbd7bf
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,23 @@
+# EditorConfig: http://EditorConfig.org
+
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+indent_style = space
+indent_size = 4
+
+[*.{html,xml}]
+indent_size = 2
+
+[*.php]
+max_line_length = 100
+
+[Dockerfile]
+max_line_length = 80
+
+[Makefile]
+indent_style = tab
diff --git a/.gitattributes b/.gitattributes
index dd0e573c..93900602 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -24,6 +24,7 @@ Dockerfile      text
 *.min.js        binary
 
 # Exclude from Git archives
+.editorconfig   export-ignore
 .gitattributes  export-ignore
 .github         export-ignore
 .gitignore      export-ignore