From aa2124f655788dea3f15c3040f3201f2b64e14b0 Mon Sep 17 00:00:00 2001
From: Igor Scheller <igor.scheller@igorshp.de>
Date: Wed, 26 Sep 2018 20:49:31 +0200
Subject: RouteDispatcher: Allow installation into sub directory

---
 src/Middleware/RouteDispatcher.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/Middleware/RouteDispatcher.php b/src/Middleware/RouteDispatcher.php
index f14faea8..24a7906d 100644
--- a/src/Middleware/RouteDispatcher.php
+++ b/src/Middleware/RouteDispatcher.php
@@ -2,6 +2,7 @@
 
 namespace Engelsystem\Middleware;
 
+use Engelsystem\Http\Request;
 use FastRoute\Dispatcher as FastRouteDispatcher;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
@@ -44,7 +45,12 @@ class RouteDispatcher implements MiddlewareInterface
      */
     public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {
-        $route = $this->dispatcher->dispatch($request->getMethod(), urldecode($request->getUri()->getPath()));
+        $path = $request->getUri()->getPath();
+        if ($request instanceof Request) {
+            $path = $request->getPathInfo();
+        }
+
+        $route = $this->dispatcher->dispatch($request->getMethod(), urldecode($path));
 
         $status = $route[0];
         if ($status == FastRouteDispatcher::NOT_FOUND) {
-- 
cgit v1.2.3-54-g00ecf