diff --git a/.dev-tools/composer.json b/.dev-tools/composer.json
index eda33f36..994e6e2a 100644
--- a/.dev-tools/composer.json
+++ b/.dev-tools/composer.json
@@ -9,7 +9,7 @@
         "mi-schi/phpmd-extension": "^4.3",
         "phpmd/phpmd": "^2.15",
         "phpstan/extension-installer": "^1.4.3",
-        "phpstan/phpstan": "^2.1.8",
+        "phpstan/phpstan": "^2.1.10",
         "phpstan/phpstan-phpunit": "^2.0.4",
         "phpstan/phpstan-strict-rules": "^2.0.4",
         "shipmonk/composer-dependency-analyser": "^1.8.2",
diff --git a/.dev-tools/composer.lock b/.dev-tools/composer.lock
index 2e39745a..84005db0 100644
--- a/.dev-tools/composer.lock
+++ b/.dev-tools/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "9a66f07992e3415481408de1f22cc730",
+    "content-hash": "9e85ad166f191fa280289e8bebe52665",
     "packages": [
         {
             "name": "colinodell/json5",
@@ -985,16 +985,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "2.1.8",
+            "version": "2.1.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "f9adff3b87c03b12cc7e46a30a524648e497758f"
+                "reference": "051a3b6b9b80df4ba3a7f801a8b53ad7d8f1c15f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/f9adff3b87c03b12cc7e46a30a524648e497758f",
-                "reference": "f9adff3b87c03b12cc7e46a30a524648e497758f"
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/051a3b6b9b80df4ba3a7f801a8b53ad7d8f1c15f",
+                "reference": "051a3b6b9b80df4ba3a7f801a8b53ad7d8f1c15f"
             },
             "require": {
                 "php": "^7.4|^8.0"
diff --git a/.gitattributes b/.gitattributes
index a8fcf2e1..5580d7c4 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2,6 +2,6 @@
 
 /.* export-ignore
 /tests/ export-ignore
-/phpunit.xml.dist export-ignore
+/phpunit.xml export-ignore
 
 * text eol=lf
diff --git a/.gitignore b/.gitignore
index 207f97e0..4fbb073c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
 /vendor/
 /composer.lock
-/phpunit.xml
diff --git a/phpunit.xml.dist b/phpunit.xml
similarity index 96%
rename from phpunit.xml.dist
rename to phpunit.xml
index f23a9b89..44e38ed2 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml
@@ -3,7 +3,6 @@
 <phpunit xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
          xsi:noNamespaceSchemaLocation='./vendor/phpunit/phpunit/phpunit.xsd'
          bootstrap='./tests/autoload.php'
-         cacheDirectory='.phpunit.cache'
          cacheResult='false'
          colors='true'
          displayDetailsOnTestsThatTriggerDeprecations='true'