Merge pull request #8 from webimpress/feature/http-middleware-0.5

Added support for http-interop/http-middleware 0.5.0 (no BC Break)

Author: weierophinney

composer.json

@@ -21,11 +21,11 @@
         "forum": "https://discourse.zendframework.com/c/questions/expressive"
     },
     "require": {
-        "http-interop/http-middleware": "^0.4.1",
         "php": "^7.1",
         "psr/container": "^1.0",
         "psr/http-message": "^1.0.1",
-        "zendframework/zend-expressive-router": "^2.1.0"
+        "webimpress/http-middleware-compatibility": "^0.1.1",
+        "zendframework/zend-expressive-router": "^2.2"
     },
     "require-dev": {
         "phpunit/phpunit": "^6.0.8",

composer.lock

@@ -7,12 +7,14 @@
 
 namespace Zend\Expressive\Authorization;
 
-use Interop\Http\ServerMiddleware\DelegateInterface;
-use Interop\Http\ServerMiddleware\MiddlewareInterface as ServerMiddlewareInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
+use Webimpress\HttpMiddlewareCompatibility\HandlerInterface;
+use Webimpress\HttpMiddlewareCompatibility\MiddlewareInterface;
 
-class AuthorizationMiddleware implements ServerMiddlewareInterface
+use const Webimpress\HttpMiddlewareCompatibility\HANDLER_METHOD;
+
+class AuthorizationMiddleware implements MiddlewareInterface
 {
     /**
      * @var AuthorizationInterface
@@ -34,7 +36,7 @@ public function __construct(AuthorizationInterface $authorization, ResponseInter
      * {@inheritDoc}
      * @todo Use role/identity interface from zend-expressive-authentication once published.
      */
-    public function process(ServerRequestInterface $request, DelegateInterface $delegate)
+    public function process(ServerRequestInterface $request, HandlerInterface $handler)
     {
         $role = $request->getAttribute(AuthorizationInterface::class, false);
 
@@ -43,7 +45,7 @@ public function process(ServerRequestInterface $request, DelegateInterface $dele
         }
 
         return $this->authorization->isGranted($role, $request)
-            ? $delegate->process($request)
+            ? $handler->{HANDLER_METHOD}($request)
             : $this->responsePrototype->withStatus(403);
     }
 }

src/AuthorizationMiddleware.php

@@ -7,22 +7,23 @@
 
 namespace ZendTest\Expressive\Authorization;
 
-use Interop\Http\ServerMiddleware\DelegateInterface;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
+use Webimpress\HttpMiddlewareCompatibility\HandlerInterface;
 use Zend\Expressive\Authorization\AuthorizationInterface;
 use Zend\Expressive\Authorization\AuthorizationMiddleware;
-use Zend\Expressive\Router\RouteResult;
+
+use const Webimpress\HttpMiddlewareCompatibility\HANDLER_METHOD;
 
 class AuthorizationMiddlewareTest extends TestCase
 {
     protected function setUp()
     {
         $this->authorization = $this->prophesize(AuthorizationInterface::class);
         $this->request = $this->prophesize(ServerRequestInterface::class);
-        $this->delegate = $this->prophesize(DelegateInterface::class);
+        $this->delegate = $this->prophesize(HandlerInterface::class);
         $this->response = $this->prophesize(ResponseInterface::class);
     }
 
@@ -69,7 +70,7 @@ public function testProcessRoleGranted()
         $this->authorization->isGranted('foo', $this->request->reveal())->willReturn(true);
 
         $middleware = new AuthorizationMiddleware($this->authorization->reveal(), $this->response->reveal());
-        $this->delegate->process(Argument::any())->willReturn($this->response->reveal());
+        $this->delegate->{HANDLER_METHOD}(Argument::any())->willReturn($this->response->reveal());
 
         $response = $middleware->process(
             $this->request->reveal(),