Fix phpunit.xml.dist and psalm.xml.dist

Author: Evgeniy Zyubin

composer.json

@@ -34,7 +34,7 @@
         "psr/http-message": "^1.0",
         "psr/http-server-handler": "^1.0",
         "psr/http-server-middleware": "^1.0",
-        "psr/log": "^1.1 || ^2.0 || ^3.0"
+        "psr/log": "^1.1|^2.0|^3.0"
     },
     "require-dev": {
         "devanych/di-container": "^2.1",
@@ -58,6 +58,12 @@
             "HttpSoft\\Tests\\Basis\\": "tests/"
         }
     },
+    "config": {
+        "sort-packages": true,
+        "allow-plugins": {
+            "composer/package-versions-deprecated": true
+        }
+    },
     "scripts": {
         "test": "phpunit --colors=always",
         "static": "psalm",

phpunit.xml.dist

@@ -1,15 +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"
-         bootstrap="vendor/autoload.php"
-         executionOrder="depends,defects"
-         beStrictAboutCoversAnnotation="true"
-         beStrictAboutOutputDuringTests="true"
-         beStrictAboutTodoAnnotatedTests="true"
-         failOnRisky="true"
-         failOnWarning="true"
-         verbose="true"
-         colors="true">
+<phpunit
+     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"/>
+    </php>
+
     <testsuites>
         <testsuite name="HttpSoft Basis Test Suite">
             <directory>tests</directory>

psalm.xml.dist

@@ -1,5 +1,6 @@
 <?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"