Merge pull request #219 from skipperbent/v3-development

V3 development

src/Pecee/Http/Request.php

@@ -3,8 +3,8 @@ namespace Pecee\Http;
 
 use Pecee\Http\Input\Input;
 use Pecee\SimpleRouter\Route\ILoadableRoute;
-use Pecee\SimpleRouter\Route\IRoute;
 use Pecee\SimpleRouter\Route\RouteUrl;
+use Pecee\SimpleRouter\SimpleRouter;
 
 class Request
 {
@@ -237,13 +237,25 @@ class Request
     {
         $this->rewriteRoute = $route;
 
+        $namespace = SimpleRouter::getDefaultNamespace();
+
+        if ($namespace !== null) {
+
+            if ($this->rewriteRoute->getNamespace() !== null) {
+                $namespace .= '\\' . $this->rewriteRoute->getNamespace();
+            }
+
+            $this->rewriteRoute->setDefaultNamespace($namespace);
+
+        }
+
         return $this;
     }
 
     /**
      * Get rewrite route
      *
-     * @return IRoute|null
+     * @return ILoadableRoute|null
      */
     public function getRewriteRoute()
     {
@@ -280,9 +292,7 @@ class Request
      */
     public function setRewriteCallback($callback)
     {
-        $this->rewriteRoute = new RouteUrl($this->uri, $callback);
-
-        return $this;
+        return $this->setRewriteRoute(new RouteUrl($this->uri, $callback));
     }
 
     /**

src/Pecee/SimpleRouter/Router.php

@@ -249,8 +249,11 @@ class Router
 
                     $route->loadMiddleware($this->request);
 
-                    if ($this->request->getRewriteRoute() !== null) {
-                        $this->request->getRewriteRoute()->renderRoute($this->request);
+                    $rewriteRoute = $this->request->getRewriteRoute();
+
+                    if ($rewriteRoute !== null) {
+                        $rewriteRoute->loadMiddleware($this->request);
+                        $rewriteRoute->renderRoute($this->request);
 
                         return;
                     }
@@ -306,8 +309,11 @@ class Router
 
             if ($handler->handleError($this->request, $e) !== null) {
 
-                if ($this->request->getRewriteRoute() !== null) {
-                    $this->request->getRewriteRoute()->renderRoute($this->request);
+                $rewriteRoute = $this->request->getRewriteRoute();
+
+                if ($rewriteRoute !== null) {
+                    $rewriteRoute->loadMiddleware($this->request);
+                    $rewriteRoute->renderRoute($this->request);
 
                     return;
                 }
@@ -334,7 +340,7 @@ class Router
 
             if ($includeEmpty === false) {
                 $getParams = array_filter($getParams, function ($item) {
-                    return (!empty($item));
+                    return (trim($item) !== false);
                 });
             }
 

src/Pecee/SimpleRouter/SimpleRouter.php

@@ -372,4 +372,13 @@ class SimpleRouter
         return $route;
     }
 
+    /**
+     * Get default namespace
+     * @return string
+     */
+    public static function getDefaultNamespace()
+    {
+        return static::$defaultNamespace;
+    }
+
 }