Merge pull request #48 from wirebox-platform/2.x

Support for PSR-15 RequestHandlerInterface for queue items

.travis.yml

@@ -6,7 +6,7 @@ before_script:
   - composer self-update
   - composer install
 script:
-  - phpunit --coverage-clover=coverage.clover
+  - php vendor/bin/phpunit --coverage-clover=coverage.clover
 after_script:
   - wget https://scrutinizer-ci.com/ocular.phar
   - php ocular.phar code-coverage:upload --format=php-clover coverage.clover

src/Runner.php

@@ -13,6 +13,7 @@
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Server\MiddlewareInterface;
+use Psr\Http\Server\RequestHandlerInterface;
 
 /**
  *
@@ -35,6 +36,10 @@ public function handle(ServerRequestInterface $request) : ResponseInterface
         if ($middleware instanceof MiddlewareInterface) {
             return $middleware->process($request, $this);
         }
+
+        if ($middleware instanceof RequestHandlerInterface) {
+            return $middleware->handle($request);
+        }
 
         return $middleware($request, $this);
     }

tests/RelayTest.php

@@ -84,4 +84,16 @@ public function testResolverEntries()
 
         $this->assertRelay(new Relay($queue, $resolver));
     }
+
+    public function testRequestHandlerInQueue()
+    {
+        $queue = [
+            new FakeMiddleware(),
+            new FakeMiddleware(),
+            new FakeMiddleware(),
+            $this->responder,
+        ];
+        $requestHandler = new Relay($queue);
+        $this->assertRelay(new Relay([$requestHandler]));
+    }
 }