From a1bc763a16ee8be109de5c9053fbc5eded53824e Mon Sep 17 00:00:00 2001
From: Igor Scheller <igor.scheller@igorshp.de>
Date: Sat, 25 Aug 2018 21:16:20 +0200
Subject: Added nikic/fast-route as routing dispatcher

---
 src/Middleware/Dispatcher.php | 26 +++-----------------------
 1 file changed, 3 insertions(+), 23 deletions(-)

(limited to 'src/Middleware/Dispatcher.php')

diff --git a/src/Middleware/Dispatcher.php b/src/Middleware/Dispatcher.php
index f2a5b5d5..48eb0948 100644
--- a/src/Middleware/Dispatcher.php
+++ b/src/Middleware/Dispatcher.php
@@ -12,6 +12,8 @@ use Psr\Http\Server\RequestHandlerInterface;
 
 class Dispatcher implements MiddlewareInterface, RequestHandlerInterface
 {
+    use ResolvesMiddlewareTrait;
+
     /** @var MiddlewareInterface[]|string[] */
     protected $stack;
 
@@ -70,10 +72,7 @@ class Dispatcher implements MiddlewareInterface, RequestHandlerInterface
             throw new LogicException('Middleware queue is empty');
         }
 
-        if (is_string($middleware)) {
-            $middleware = $this->resolveMiddleware($middleware);
-        }
-
+        $middleware = $this->resolveMiddleware($middleware);
         if (!$middleware instanceof MiddlewareInterface) {
             throw new InvalidArgumentException('Middleware is no instance of ' . MiddlewareInterface::class);
         }
@@ -81,25 +80,6 @@ class Dispatcher implements MiddlewareInterface, RequestHandlerInterface
         return $middleware->process($request, $this);
     }
 
-    /**
-     * Resolve the middleware with the container
-     *
-     * @param string $middleware
-     * @return MiddlewareInterface
-     */
-    protected function resolveMiddleware($middleware)
-    {
-        if (!$this->container instanceof Application) {
-            throw new InvalidArgumentException('Unable to resolve middleware ' . $middleware);
-        }
-
-        if ($this->container->has($middleware)) {
-            return $this->container->get($middleware);
-        }
-
-        return $this->container->make($middleware);
-    }
-
     /**
      * @param Application $container
      */
-- 
cgit v1.2.3-54-g00ecf