Merge pull request #27 from basz/fix/http-middleware-compatibility

Fix/http middleware compatibility

composer.json

@@ -10,19 +10,26 @@
         {
             "name": "Paul M Jones",
             "email": "[email protected]"
+        },
+        {
+            "name": "Bas Kamer",
+            "email": "[email protected]"
         }
     ],
+    "config":            {
+        "sort-packages":       true
+    },
     "require": {
-        "php":"^5.6 || ^7.0",
-        "psr/http-message":"^1.0",
-        "http-interop/http-factory":"^0.3",
-        "http-interop/http-middleware": "^0.5",
+        "php": "^5.6 || ^7.0",
+        "http-interop/http-factory": "^0.3",
+        "psr/http-message": "^1.0",
         "webimpress/http-middleware-compatibility": "^0.1.4"
     },
     "require-dev": {
-        "phpunit/phpunit": "5.7",
-        "http-interop/http-factory-diactoros":"^0.3",
-        "aura/di": "^3.0"
+        "aura/di": "^3.0",
+        "http-interop/http-factory-diactoros": "^0.3",
+        "http-interop/http-middleware": "^0.5",
+        "phpunit/phpunit": "5.7"
     },
     "suggest": {
         "http-interop/http-factory-diactoros": "Use zend framework zend-diactoros as the psr7 implementaion",

src/AssetAction.php

@@ -1,9 +1,11 @@
 <?php
+
 namespace Hkt\Psr7Asset;
 
 use Psr\Http\Message\ServerRequestInterface;
-use Interop\Http\Server\MiddlewareInterface;
-use Interop\Http\Server\RequestHandlerInterface;
+use Webimpress\HttpMiddlewareCompatibility\HandlerInterface;
+use Webimpress\HttpMiddlewareCompatibility\MiddlewareInterface;
+use const Webimpress\HttpMiddlewareCompatibility\HANDLER_METHOD;
 
 /**
  *
@@ -64,12 +66,12 @@ public function __construct(
      *
      * @param ServerRequestInterface $request
      *
-     * @param RequestHandlerInterface $delegate
+     * @param HandlerInterface $handler
      *
      * @return ResponseInterface
      *
      */
-    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler)
+    public function process(ServerRequestInterface $request, HandlerInterface $handler)
     {
         $route = $this->router->match($request);
 
@@ -83,6 +85,6 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
             }
         }
 
-        return $handler->handle($request);
+        return $handler->{HANDLER_METHOD}($request);
     }
 }

tests/src/AssetActionTest.php

@@ -1,11 +1,9 @@
 <?php
 namespace Hkt\Psr7Asset;
 
-use Hkt\Psr7Asset\AssetResponder;
+use Http\Factory\Diactoros\ResponseFactory;
 use Psr\Http\Message\ResponseInterface;
-use Zend\Diactoros\Response;
 use Zend\Diactoros\ServerRequestFactory;
-use Http\Factory\Diactoros\ResponseFactory;
 
 class AssetActionTest extends \PHPUnit_Framework_TestCase
 {

tests/src/RequestHandler.php

@@ -2,11 +2,14 @@
 
 namespace Hkt\Psr7Asset;
 
-use Interop\Http\Server\RequestHandlerInterface;
 use Psr\Http\Message\ServerRequestInterface;
+use Webimpress\HttpMiddlewareCompatibility\HandlerInterface;
 use Zend\Diactoros\Response;
 
-class RequestHandler implements RequestHandlerInterface
+/**
+ * Class RequestHandler from http-interop/http-middleware:^0.5
+ */
+class RequestHandler implements HandlerInterface
 {
     public function handle(ServerRequestInterface $request)
     {