diff --git a/composer.json b/composer.json
index eadbaad..f3a32c9 100644
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,7 @@
     "require": {
         "php": "^7.4|^8.0",
         "httpsoft/http-emitter": "^1.0",
-        "psr/container": "^1.0",
+        "psr/container": "^1.0|^2.0",
         "psr/http-message": "^1.0",
         "psr/http-server-handler": "^1.0",
         "psr/http-server-middleware": "^1.0"
@@ -30,8 +30,8 @@
         "devanych/di-container": "^2.1",
         "httpsoft/http-message": "^1.0",
         "phpunit/phpunit": "^9.5",
-        "squizlabs/php_codesniffer": "^3.6",
-        "vimeo/psalm": "^4.9"
+        "squizlabs/php_codesniffer": "^3.7",
+        "vimeo/psalm": "^5.3"
     },
     "provide": {
         "psr/http-message-implementation": "1.0",
diff --git a/phpcs.xml b/phpcs.xml.dist
similarity index 100%
rename from phpcs.xml
rename to phpcs.xml.dist
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index fba9e4b..0cba771 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,32 +1,33 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <phpunit
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/8.5/phpunit.xsd"
-    bootstrap="./vendor/autoload.php"
-    executionOrder="depends,defects"
+    bootstrap="vendor/autoload.php"
+    executionOrder="random"
     beStrictAboutCoversAnnotation="true"
     beStrictAboutOutputDuringTests="true"
     beStrictAboutTodoAnnotatedTests="true"
     convertWarningsToExceptions="true"
     convertNoticesToExceptions="true"
     convertErrorsToExceptions="true"
+    resolveDependencies="true"
     stopOnFailure="false"
+    failOnWarning="true"
+    failOnRisky="true"
     verbose="true"
     colors="true"
 >
     <php>
-        <ini name="error_reporting" value="-1" />
+        <ini name="error_reporting" value="-1"/>
     </php>
 
     <testsuites>
         <testsuite name="HttpSoft Runner Test Suite">
-            <directory>./tests/</directory>
+            <directory>tests</directory>
         </testsuite>
     </testsuites>
 
-    <filter>
-        <whitelist>
-            <directory suffix=".php">./src/</directory>
-        </whitelist>
-    </filter>
+    <coverage processUncoveredFiles="true">
+        <include>
+            <directory suffix=".php">src</directory>
+        </include>
+    </coverage>
 </phpunit>
diff --git a/psalm.xml b/psalm.xml.dist
similarity index 65%
rename from psalm.xml
rename to psalm.xml.dist
index 5a95a3a..e2bf9e6 100644
--- a/psalm.xml
+++ b/psalm.xml.dist
@@ -1,11 +1,15 @@
 <?xml version="1.0"?>
 <psalm
-    errorLevel="1"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
+    findUnusedPsalmSuppress="true"
+    errorLevel="1"
 >
     <projectFiles>
-        <directory name="src" />
+        <directory name="src"/>
+        <ignoreFiles>
+            <directory name="vendor"/>
+        </ignoreFiles>
     </projectFiles>
 </psalm>
diff --git a/tests/MiddlewareResolverTest.php b/tests/MiddlewareResolverTest.php
index 0b915b8..33ee794 100644
--- a/tests/MiddlewareResolverTest.php
+++ b/tests/MiddlewareResolverTest.php
@@ -300,7 +300,7 @@ public function get($id)
                 };
             }
 
-            public function has($id)
+            public function has($id): bool
             {
                 return array_key_exists($id, $this->dependencies);
             }