Merge branch 'master' into default-mime-type

composer.json

@@ -15,12 +15,13 @@
     "require": {
         "php":"^5.6 || ^7.0",
         "psr/http-message":"^1.0",
-        "http-interop/http-factory":"^0.2",
-        "http-interop/http-middleware": "^0.4.1"
+        "http-interop/http-factory":"^0.3",
+        "http-interop/http-middleware": "^0.5",
+        "webimpress/http-middleware-compatibility": "^0.1.4"
     },
     "require-dev": {
         "phpunit/phpunit": "5.7",
-        "http-interop/http-factory-diactoros":"^0.2",
+        "http-interop/http-factory-diactoros":"^0.3",
         "aura/di": "^3.0"
     },
     "suggest": {

src/AssetAction.php

@@ -2,8 +2,8 @@
 namespace Hkt\Psr7Asset;
 
 use Psr\Http\Message\ServerRequestInterface;
-use Interop\Http\ServerMiddleware\MiddlewareInterface;
-use Interop\Http\ServerMiddleware\DelegateInterface;
+use Interop\Http\Server\MiddlewareInterface;
+use Interop\Http\Server\RequestHandlerInterface;
 
 /**
  *
@@ -64,12 +64,12 @@ public function __construct(
      *
      * @param ServerRequestInterface $request
      *
-     * @param DelegateInterface $delegate
+     * @param RequestHandlerInterface $delegate
      *
      * @return ResponseInterface
      *
      */
-    public function process(ServerRequestInterface $request, DelegateInterface $delegate)
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler)
     {
         $route = $this->router->match($request);
 
@@ -83,6 +83,6 @@ public function process(ServerRequestInterface $request, DelegateInterface $dele
             }
         }
 
-        return $delegate($request);
+        return $handler->handle($request);
     }
 }

tests/src/AssetActionTest.php

@@ -45,8 +45,8 @@ public function testProcess()
             [],
             []
         );
-        $delegate = new Delegate();
-        $actual = $this->action->process($request, $delegate);
+        $requestHandler = new RequestHandler();
+        $actual = $this->action->process($request, $requestHandler);
 
         $this->assertInstanceOf(ResponseInterface::class, $actual);
 

tests/src/RequestHandler.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace Hkt\Psr7Asset;
+
+use Interop\Http\Server\RequestHandlerInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Zend\Diactoros\Response;
+
+class RequestHandler implements RequestHandlerInterface
+{
+    public function handle(ServerRequestInterface $request)
+    {
+        return new Response(null, 404);
+    }
+}