diff --git a/.editorconfig b/.editorconfig
index 7aebc83..64ed669 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,11 +1,15 @@
-# EditorConfig is awesome: http://EditorConfig.org
 root = true
 
 [*]
-end_of_line = lf
-insert_final_newline = true
-
-[**.{php,md}]
 charset = utf-8
+end_of_line = lf
 indent_style = space
 indent_size = 4
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.md]
+max_line_length = 80
+
+[*.{json,yml}]
+indent_size = 2
diff --git a/.gitattributes b/.gitattributes
index de4f67d..feb9596 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,9 +1,11 @@
+/.github export-ignore
+/.gitlab export-ignore
 /.gitattributes export-ignore
 /.gitignore export-ignore
-/.github export-ignore
-/.php-cs-fixer.php export-ignore
 /.editorconfig export-ignore
+/.php-cs-fixer.php export-ignore
+/phpstan.neon export-ignore
+/phpstan-baseline.neon export-ignore
 /phpunit.xml export-ignore
 /phpunit.xml.dist export-ignore
-/phpstan.neon export-ignore
 /tests export-ignore
diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php
index b62b596..e5fa3e8 100644
--- a/.php-cs-fixer.php
+++ b/.php-cs-fixer.php
@@ -21,9 +21,9 @@ return (new PhpCsFixer\Config())
     ->setUsingCache(true)
     ->setRiskyAllowed(true)
     ->setRules([
+        '@PSR12' => true,
         '@PHP71Migration' => true,
         '@PHPUnit75Migration:risky' => true,
-        '@PSR12' => true,
         'header_comment' => ['header' => $fileHeaderComment],
     ])
     ->setFinder(
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
new file mode 100644
index 0000000..e69de29
diff --git a/phpstan.neon b/phpstan.neon
index bfd0251..56214f5 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -1,13 +1,17 @@
+includes:
+    - phpstan-baseline.neon
+
 parameters:
-  level: 5
-  checkMissingIterableValueType: false
-  checkFunctionNameCase: true
-  reportUnmatchedIgnoredErrors: false
-  checkGenericClassInNonGenericObjectType: false
-  inferPrivatePropertyTypeFromConstructor: true
-  treatPhpDocTypesAsCertain: false
-  paths:
-    - src
-    - tests
-  ignoreErrors:
-    - '#PHPDoc tag .* has invalid value.*#'
+    level: 5
+    checkMissingIterableValueType: false
+    checkFunctionNameCase: true
+    reportUnmatchedIgnoredErrors: false
+    checkGenericClassInNonGenericObjectType: false
+    inferPrivatePropertyTypeFromConstructor: true
+    treatPhpDocTypesAsCertain: false
+    paths:
+        - src
+        - tests
+    ignoreErrors:
+        - '#PHPDoc tag .* has invalid value.*#'
+        - '#Unsafe usage of new static\(\).#'
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 16a418d..faa4886 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,24 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit backupGlobals="false"
-         backupStaticAttributes="false"
          bootstrap="./tests/bootstrap.php"
          colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
+         failOnRisky="true"
+         failOnWarning="true"
 >
     <testsuites>
         <testsuite name="All">
-            <directory>./tests/</directory>
+            <directory>tests</directory>
         </testsuite>
     </testsuites>
-    <filter>
-        <whitelist>
-            <directory suffix=".php">src/</directory>
-        </whitelist>
-    </filter>
+    <coverage>
+        <include>
+            <directory suffix=".php">src</directory>
+        </include>
+        <exclude>
+            <directory>src/data</directory>
+        </exclude>
+        <report>
+            <clover outputFile="clover.xml"/>
+        </report>
+    </coverage>
     <php>
         <env name="XDB_PATH" value="../assets/ip2region.xdb"/>
     </php>