From 5f81c85d52b8871aac64e31f57f691b9ac2a9bd0 Mon Sep 17 00:00:00 2001 From: Adrian Suter Date: Mon, 6 Jan 2020 19:46:46 +0100 Subject: [PATCH 1/2] Rename phpcs.xml --- .gitattributes | 2 +- phpcs.xml => phpcs.xml.dist | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename phpcs.xml => phpcs.xml.dist (100%) diff --git a/.gitattributes b/.gitattributes index f0f02a5..0741735 100644 --- a/.gitattributes +++ b/.gitattributes @@ -9,5 +9,5 @@ /.gitattributes export-ignore /.gitignore export-ignore /.travis.yml export-ignore -/phpcs.xml export-ignore +/phpcs.xml.dist export-ignore /phpunit.xml.dist export-ignore diff --git a/phpcs.xml b/phpcs.xml.dist similarity index 100% rename from phpcs.xml rename to phpcs.xml.dist From 180765650269c72141fdacceb458a755cdd9ab7c Mon Sep 17 00:00:00 2001 From: Adrian Suter Date: Mon, 6 Jan 2020 19:49:41 +0100 Subject: [PATCH 2/2] Add .editorconfig --- .editorconfig | 15 +++++++++++++++ .gitattributes | 1 + 2 files changed, 16 insertions(+) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..6537ca4 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,15 @@ +root = true + +[*] +charset = utf-8 +end_of_line = lf +insert_final_newline = true +indent_style = space +indent_size = 4 +trim_trailing_whitespace = true + +[*.md] +trim_trailing_whitespace = false + +[*.{yml,yaml}] +indent_size = 2 diff --git a/.gitattributes b/.gitattributes index 0741735..2653f49 100644 --- a/.gitattributes +++ b/.gitattributes @@ -6,6 +6,7 @@ /docs export-ignore /tests export-ignore /.coveralls.yml export-ignore +/.editorconfig export-ignore /.gitattributes export-ignore /.gitignore export-ignore /.travis.yml export-ignore