diff --git a/composer.json b/composer.json index e72a9f6..62d263f 100644 --- a/composer.json +++ b/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": { diff --git a/src/AssetAction.php b/src/AssetAction.php index b1d8dd2..2f8580e 100644 --- a/src/AssetAction.php +++ b/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); } } diff --git a/tests/src/AssetActionTest.php b/tests/src/AssetActionTest.php index be86570..9e8a0e3 100644 --- a/tests/src/AssetActionTest.php +++ b/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); diff --git a/tests/src/Delegate.php b/tests/src/Delegate.php deleted file mode 100644 index 0f17977..0000000 --- a/tests/src/Delegate.php +++ /dev/null @@ -1,15 +0,0 @@ -setStatusCode(404); - } -} diff --git a/tests/src/RequestHandler.php b/tests/src/RequestHandler.php new file mode 100644 index 0000000..f658588 --- /dev/null +++ b/tests/src/RequestHandler.php @@ -0,0 +1,15 @@ +