From b8d5106f4e956701b7ac5776293ade100f028358 Mon Sep 17 00:00:00 2001
From: Simon Sessingo <simon.sessingoe@gmail.com>
Date: Tue, 27 Feb 2018 00:00:54 +0100
Subject: [PATCH 1/3] Removed getPath from url.

---
 src/Pecee/SimpleRouter/Router.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Pecee/SimpleRouter/Router.php b/src/Pecee/SimpleRouter/Router.php
index 070ae2c..2fdc421 100644
--- a/src/Pecee/SimpleRouter/Router.php
+++ b/src/Pecee/SimpleRouter/Router.php
@@ -235,7 +235,7 @@ class Router
                 $this->request->setHasRewrite(false);
             }
 
-            $url = ($this->request->getRewriteUrl() !== null) ? $this->request->getRewriteUrl() : $this->request->getUrl()->getPath();
+            $url = ($this->request->getRewriteUrl() !== null) ? $this->request->getRewriteUrl() : $this->request->getUrl();
 
             /* @var $route ILoadableRoute */
             foreach ($this->processedRoutes as $key => $route) {

From b051bcf02b83e5d1f383870da874b4e19eff2e80 Mon Sep 17 00:00:00 2001
From: Simon Sessingo <simon.sessingoe@gmail.com>
Date: Tue, 27 Feb 2018 00:12:45 +0100
Subject: [PATCH 2/3] Stop router from processing routes if no valid route is
 found.

---
 src/Pecee/SimpleRouter/SimpleRouter.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Pecee/SimpleRouter/SimpleRouter.php b/src/Pecee/SimpleRouter/SimpleRouter.php
index 45f9951..0c67c2c 100644
--- a/src/Pecee/SimpleRouter/SimpleRouter.php
+++ b/src/Pecee/SimpleRouter/SimpleRouter.php
@@ -48,6 +48,11 @@ class SimpleRouter
      */
     public static function start()
     {
+        // Stop processing routes if no valid route is found.
+        if(static::request()->getUrl()->getPath() === null) {
+            return;
+        }
+
         echo static::router()->routeRequest();
     }
 

From 98bf95bfc9819b016d7ca13f81838be0e84e5dc0 Mon Sep 17 00:00:00 2001
From: Simon Sessingo <simon.sessingoe@gmail.com>
Date: Tue, 27 Feb 2018 00:14:01 +0100
Subject: [PATCH 3/3] Added back getPath.

---
 src/Pecee/SimpleRouter/Router.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Pecee/SimpleRouter/Router.php b/src/Pecee/SimpleRouter/Router.php
index 2fdc421..070ae2c 100644
--- a/src/Pecee/SimpleRouter/Router.php
+++ b/src/Pecee/SimpleRouter/Router.php
@@ -235,7 +235,7 @@ class Router
                 $this->request->setHasRewrite(false);
             }
 
-            $url = ($this->request->getRewriteUrl() !== null) ? $this->request->getRewriteUrl() : $this->request->getUrl();
+            $url = ($this->request->getRewriteUrl() !== null) ? $this->request->getRewriteUrl() : $this->request->getUrl()->getPath();
 
             /* @var $route ILoadableRoute */
             foreach ($this->processedRoutes as $key => $route) {