Pass App's namespace into request.

svandragt · Jul 1, 2020 · fc7f42b · fc7f42b
1 parent 71b2f9a
commit fc7f42b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/App.php b/src/App.php
@@ -7,9 +7,11 @@ class App
     public $Security;
     public $Cache;
     public $Environment;
+    public $app_namespace;
 
-    public function __construct()
+    public function __construct($app_namespace = '')
     {
+        $this->app_namespace = $app_namespace;
         $this->Cache = new Cache();
         if ($this->Cache->hasExistingCachefile()) {
              $bytes = readfile($this->Cache->convertUrlpathToFilepath());
@@ -32,7 +34,7 @@ public function run()
 
         // Process request if not statically cached.
         $this->Cache->start();
-        new Request();
+        new Request($this->app_namespace);
         $this->Cache->end();
     }
 }
diff --git a/src/Request.php b/src/Request.php
@@ -15,12 +15,15 @@ class Request
 {
     protected $Controller;
 
-    public function __construct()
+    public function __construct($app_namespace)
     {
 
         // Route to controller
         $args                 = explode("/", $this->pathInfo());
         $controller_class     = 'Controller' . ucfirst($args[1]);
+        if (!empty($app_namespace)) {
+            $controller_class = $app_namespace . '\\' . $controller_class;
+        }
         $controller_arguments = array_slice($args, 2);
         if (class_exists($controller_class, true)) {
             $this->Controller = new $controller_class($this, $controller_arguments);