Merge pull request #7 from middlewares/fix/callable-handlers

Allow any callable as a handler
middlewares · Feb 7, 2018 · 287dc0f · 287dc0f
2 parents 3aa692a + 2feeebc
commit 287dc0f
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/src/RequestHandler.php b/src/RequestHandler.php
@@ -30,7 +30,7 @@ class RequestHandler implements MiddlewareInterface
      */
     public function __construct(ContainerInterface $container = null)
     {
-        $this->container = $container;
+        $this->container = $container ?: new RequestHandlerContainer();
     }
 
     /**
@@ -51,8 +51,7 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
         $requestHandler = $request->getAttribute($this->handlerAttribute);
 
         if (is_string($requestHandler)) {
-            $container = $this->container ?: new RequestHandlerContainer();
-            $requestHandler = $container->get($requestHandler);
+            $requestHandler = $this->container->get($requestHandler);
         }
 
         if ($requestHandler instanceof MiddlewareInterface) {
@@ -63,7 +62,7 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
             return $requestHandler->handle($request);
         }
 
-        if ($requestHandler instanceof Closure) {
+        if (is_callable($requestHandler)) {
             return (new CallableHandler($requestHandler))->process($request, $handler);
         }