diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 000000000..6218332b6
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,16 @@
+# see: https://editorconfig.org/
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 4
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.md]
+trim_trailing_whitespace = false
+
+[Makefile]
+indent_style = tab
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000..34b1b5881
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,10 @@
+/docker export-ignore
+/examples export-ignore
+/tests export-ignore
+/.* export-ignore
+/*dist export-ignore
+/code-of-conduct.md
+/CODEOWNERS export-ignore
+/CONTRIBUTING.md export-ignore
+/docker-compose* export-ignore
+/Makefile export-ignore
diff --git a/phpstan.neon b/phpstan.neon
deleted file mode 100644
index c8a60e9d3..000000000
--- a/phpstan.neon
+++ /dev/null
@@ -1,7 +0,0 @@
-parameters:
-    level: 4
-    paths:
-        -   Context
-        -   api
-        -   contrib
-        -   sdk
\ No newline at end of file
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
new file mode 100644
index 000000000..abd49ec32
--- /dev/null
+++ b/phpstan.neon.dist
@@ -0,0 +1,7 @@
+parameters:
+    level: 4
+    paths:
+        - Context
+        - api
+        - contrib
+        - sdk
diff --git a/psalm.xml b/psalm.xml.dist
similarity index 100%
rename from psalm.xml
rename to psalm.xml.dist