From 765204f55265e8bd27e4fc356b7ac88a52935a21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20Sessing=C3=B8?= <simon.sessingoe@gmail.com>
Date: Fri, 15 Jan 2016 10:34:59 +0100
Subject: [PATCH] [FEATURE] Moved loadedRoute to request so it can be easily
 overwritten from middleware.

---
 src/Pecee/SimpleRouter/RouterBase.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Pecee/SimpleRouter/RouterBase.php b/src/Pecee/SimpleRouter/RouterBase.php
index 90af6dc..5fdd7aa 100644
--- a/src/Pecee/SimpleRouter/RouterBase.php
+++ b/src/Pecee/SimpleRouter/RouterBase.php
@@ -15,7 +15,6 @@ class RouterBase {
     protected $processedRoutes;
     protected $controllerUrlMap;
     protected $backStack;
-    protected $loadedRoute;
     protected $defaultNamespace;
     protected $baseCsrfVerifier;
 
@@ -144,9 +143,10 @@ class RouterBase {
 
                 $routeNotAllowed = false;
 
-                $this->loadedRoute = $route;
+                $this->request->loadedRoute = $route;
                 $route->loadMiddleware($this->request);
-                $route->renderRoute($this->request);
+
+                $this->request->loadedRoute->renderRoute($this->request);
                 break;
             }
         }
@@ -155,7 +155,7 @@ class RouterBase {
             throw new RouterException('Route or method not allowed', 403);
         }
 
-        if(!$this->loadedRoute) {
+        if(!$this->request->loadedRoute) {
             throw new RouterException(sprintf('Route not found: %s', $this->request->getUri()), 404);
         }
     }
@@ -178,8 +178,8 @@ class RouterBase {
      * @return RouterEntry
      */
     public function getLoadedRoute() {
-        if(!($this->loadedRoute instanceof RouterGroup)) {
-            return $this->loadedRoute;
+        if(!($this->request->loadedRoute instanceof RouterGroup)) {
+            return $this->request->loadedRoute;
         }
         return null;
     }
@@ -327,8 +327,8 @@ class RouterBase {
             return $url;
         }
 
-        if($controller === null && $this->loadedRoute !== null) {
-            return $this->processUrl($this->loadedRoute, $this->loadedRoute->getMethod(), $parameters, $getParams);
+        if($controller === null && $this->request->loadedRoute !== null) {
+            return $this->processUrl($this->request->loadedRoute, $this->request->loadedRoute->getMethod(), $parameters, $getParams);
         }
 
         $c = '';