update to final psr-15, support expressive 3 only

Author: prolic

composer.json

@@ -11,20 +11,20 @@
         "psr-15"
     ],
     "require": {
-        "php": ">=5.6",
-        "http-interop/http-middleware": "^0.4.1",
+        "php": ">=7",
+        "psr/http-server-handler": "^1.0",
+        "psr/http-server-middleware": "^1.0",
         "maximebf/debugbar": "^1.4",
-        "php-middleware/double-pass-compatibility": "^1.0",
         "psr/container": "^1.0",
         "psr/http-message": "^1.0",
         "zendframework/zend-diactoros": "^1.1.3"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.7.19 || ^6.1.3",
+        "phpunit/phpunit": "^6.6",
         "mikey179/vfsStream": "^1.6.4",
         "slim/slim": "^3.0",
-        "zendframework/zend-expressive": "^1.0 || ^2.0",
-        "zendframework/zend-expressive-fastroute": "^1.0 || ^2.0",
+        "zendframework/zend-expressive": "^3.0",
+        "zendframework/zend-expressive-fastroute": "^3.0",
         "zendframework/zend-servicemanager": "^3.3"
     },
     "autoload": {

src/PhpDebugBarMiddleware.php

@@ -3,13 +3,12 @@
 namespace PhpMiddleware\PhpDebugBar;
 
 use DebugBar\JavascriptRenderer as DebugBarRenderer;
-use Interop\Http\ServerMiddleware\DelegateInterface;
-use Interop\Http\ServerMiddleware\MiddlewareInterface;
 use PhpMiddleware\DoublePassCompatibilityTrait;
 use Psr\Http\Message\MessageInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\UriInterface;
+use Psr\Http\Server\MiddlewareInterface;
 use Slim\Http\Uri;
 use Zend\Diactoros\Response;
 use Zend\Diactoros\Response\HtmlResponse;
@@ -23,8 +22,6 @@
  */
 class PhpDebugBarMiddleware implements MiddlewareInterface
 {
-    use DoublePassCompatibilityTrait;
-
     protected $debugBarRenderer;
 
     public function __construct(DebugBarRenderer $debugbarRenderer)
@@ -35,13 +32,13 @@ public function __construct(DebugBarRenderer $debugbarRenderer)
     /**
      * @inheritDoc
      */
-    public function process(ServerRequestInterface $request, DelegateInterface $delegate)
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {
         if ($staticFile = $this->getStaticFile($request->getUri())) {
             return $staticFile;
         }
 
-        $response = $delegate->process($request);
+        $response = $handler->handle($request);
 
         if (!$this->isHtmlAccepted($request)) {
             return $response;