Merge e506840 into 6f2aa98

composer.json

@@ -21,17 +21,16 @@
     "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"
     },
     "require-dev": {
-        "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",

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>

psalm.xml → 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>

tests/MiddlewareResolverTest.php

@@ -5,7 +5,6 @@
 namespace HttpSoft\Tests\Runner;
 
 use ArgumentCountError;
-use Devanych\Di\Container;
 use HttpSoft\Message\Response;
 use HttpSoft\Message\ServerRequest;
 use HttpSoft\Runner\Exception\InvalidMiddlewareResolverHandlerException;
@@ -274,14 +273,6 @@ public function testResolveClassNameHandlerWithDependenciesPassingContainerWitho
         $middleware->process($this->request, $this->handler);
     }
 
-    public function testResolveClassNameHandlerWithDependenciesPassingContainerWithAutoWiringToConstructor(): void
-    {
-        $resolver = new MiddlewareResolver(new Container());
-        $middleware = $resolver->resolve(RequestHandlerAutoWiring::class);
-        $this->assertInstanceOf(MiddlewareInterface::class, $middleware);
-        $this->assertInstanceOf(ResponseInterface::class, $middleware->process($this->request, $this->handler));
-    }
-
     /**
      * @return ContainerInterface
      */
@@ -300,7 +291,7 @@ public function get($id)
                 };
             }
 
-            public function has($id)
+            public function has($id): bool
             {
                 return array_key_exists($id, $this->dependencies);
             }