Upgrade PHPUnit, psalm and Infection

.gitattributes

@@ -8,4 +8,5 @@
 /phpcs.xml.dist export-ignore
 /phpstan.neon.dist export-ignore
 /phpunit.xml.dist export-ignore
+/psalm.xml.dist export-ignore
 /tests export-ignore

.gitignore

@@ -1,9 +1,10 @@
 /.phpunit.result.cache
 /.phpcs-cache
+/composer.lock
 /infection.json
 /infection-log.txt
 /phpcs.xml
 /phpunit.xml
 /phpstan.neon
-/composer.lock
+/psalm.xml.dist
 /vendor/

composer.json

@@ -31,18 +31,18 @@
     },
     "require-dev": {
         "cdn77/coding-standard": "^4.0",
-        "infection/infection": "^0.16.0",
+        "infection/infection": "^0.20.1",
         "nyholm/psr7": "^1.2",
         "php-http/curl-client": "^2.1",
         "phpstan/extension-installer": "^1.0",
         "phpstan/phpstan": "0.12.40",
         "phpstan/phpstan-phpunit": "0.12.16",
         "phpstan/phpstan-strict-rules": "0.12.4",
-        "phpunit/phpunit": "~9.2.0",
-        "psalm/plugin-phpunit": "^0.11.0",
+        "phpunit/phpunit": "^9.4",
+        "psalm/plugin-phpunit": "^0.13.0",
         "simpod/php-coveralls-mirror": "^3.0",
         "thecodingmachine/phpstan-safe-rule": "^1.0",
-        "vimeo/psalm": "^3.9"
+        "vimeo/psalm": "^4.1"
     },
     "autoload": {
         "psr-4": {

phpunit.xml.dist

@@ -1,25 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
-         beStrictAboutChangesToGlobalState="true"
-         beStrictAboutOutputDuringTests="true"
-         beStrictAboutTodoAnnotatedTests="true"
-         bootstrap="tests/bootstrap.php"
-         colors="true"
-         verbose="true"
+<phpunit
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+    beStrictAboutChangesToGlobalState="true"
+    beStrictAboutOutputDuringTests="true"
+    beStrictAboutTodoAnnotatedTests="true"
+    bootstrap="tests/bootstrap.php"
+    colors="true"
+    verbose="true"
 >
+    <coverage>
+        <include>
+            <directory suffix=".php">./src</directory>
+        </include>
+    </coverage>
     <testsuites>
         <testsuite name="Tests">
             <directory>tests</directory>
         </testsuite>
     </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory suffix=".php">./src</directory>
-        </whitelist>
-    </filter>
-
     <php>
         <env name="CLICKHOUSE_HOST" value="http://127.0.0.1:28123" />
         <env name="CLICKHOUSE_USER" value="default" />

psalm.xml → psalm.xml.dist

@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <psalm
     totallyTyped="true"
-    resolveFromConfigFile="true"
     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"