diff --git a/composer.json b/composer.json
index 05829f4..6d87135 100644
--- a/composer.json
+++ b/composer.json
@@ -36,7 +36,7 @@
         "ext-dbase": "For dbf files parsing"
     },
     "require-dev": {
-        "phpmyadmin/coding-standard": "^3.0.0",
+        "phpmyadmin/coding-standard": "^3.1",
         "phpstan/extension-installer": "^1.4",
         "phpstan/phpstan": "^1.12",
         "phpstan/phpstan-deprecation-rules": "^1.2",
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
index dbc162a..8e83c76 100644
--- a/phpcs.xml.dist
+++ b/phpcs.xml.dist
@@ -7,25 +7,30 @@
     <arg name="colors"/>
     <arg name="extensions" value="php"/>
 
+    <!-- Make sniff report relative -->
+    <arg name="basepath" value="."/>
+
     <file>examples</file>
     <file>src</file>
     <file>tests</file>
 
-    <exclude-pattern>*/examples/index.php</exclude-pattern>
+    <exclude-pattern>examples/index.php</exclude-pattern>
+
+    <rule ref="PhpMyAdmin"/>
 
-    <rule ref="PhpMyAdmin">
-        <exclude name="SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingTraversableTypeHintSpecification"/>
-        <exclude name="SlevomatCodingStandard.TypeHints.PropertyTypeHint.MissingTraversableTypeHintSpecification"/>
-        <exclude name="SlevomatCodingStandard.TypeHints.ReturnTypeHint.MissingTraversableTypeHintSpecification"/>
-        <exclude name="SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingNativeTypeHint"/>
-        <exclude name="SlevomatCodingStandard.TypeHints.ReturnTypeHint.MissingNativeTypeHint"/>
+    <rule ref="SlevomatCodingStandard.TypeHints.ReturnTypeHint.UselessAnnotation">
+        <exclude-pattern>src/ShapeRecord.php</exclude-pattern>
+        <exclude-pattern>tests/UtilTest.php</exclude-pattern>
+        <exclude-pattern>tests/ShapeFileTest.php</exclude-pattern>
     </rule>
 
-    <rule ref="SlevomatCodingStandard.ControlStructures.RequireSingleLineCondition"/>
-    <rule ref="SlevomatCodingStandard.Functions.RequireSingleLineCall"/>
-    <rule ref="SlevomatCodingStandard.Whitespaces.DuplicateSpaces">
-        <properties>
-            <property name="ignoreSpacesInComment" value="true"/>
-        </properties>
+    <rule ref="SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingTraversableTypeHintSpecification">
+        <severity>4</severity>
+    </rule>
+    <rule ref="SlevomatCodingStandard.TypeHints.PropertyTypeHint.MissingTraversableTypeHintSpecification">
+        <severity>4</severity>
+    </rule>
+    <rule ref="SlevomatCodingStandard.TypeHints.ReturnTypeHint.MissingTraversableTypeHintSpecification">
+        <severity>4</severity>
     </rule>
 </ruleset>