Merge pull request #77 from skipperbent/development

[TASK] Added rewrite_uri parameter to Request class

src/Pecee/SimpleRouter/RouterBase.php

@@ -27,7 +27,7 @@ class RouterBase {
         $this->backStack = array();
         $this->controllerUrlMap = array();
         $this->baseCsrfVerifier = new BaseCsrfVerifier();
-        $this->request = new Request();
+        $this->request = Request::getInstance();
         $this->bootManagers = array();
 
         $csrf = new CsrfToken();
@@ -88,7 +88,7 @@ class RouterBase {
 
             $this->currentRoute = $route;
 
-            if($route instanceof RouterGroup && $route->matchRoute($this->request) && is_callable($route->getCallback())) {
+            if($route instanceof RouterGroup && is_callable($route->getCallback())) {
                 $group = $route;
                 $route->renderRoute($this->request);
                 $mergedSettings = array_merge($route->getMergeableSettings(), $settings);
@@ -108,6 +108,8 @@ class RouterBase {
 
     public function routeRequest() {
 
+        $originalUri = $this->request->getUri();
+
         // Initialize boot-managers
         if(count($this->bootManagers)) {
             /* @var $manager RouterBootManager */
@@ -151,6 +153,9 @@ class RouterBase {
 
                 $routeNotAllowed = false;
 
+                $this->request->rewrite_uri = $this->request->uri;
+                $this->request->setUri($originalUri);
+
                 $this->request->loadedRoute = $route;
                 $route->loadMiddleware($this->request);
 

src/Pecee/SimpleRouter/RouterEntry.php

@@ -202,7 +202,7 @@ abstract class RouterEntry {
      */
     public function addSettings(array $settings = null) {
         if(is_array($settings)) {
-            $this->settings = array_merge($settings, $this->settings);
+            $this->settings = array_merge($this->settings, $settings);
         }
         return $this;
     }