Working on auto-routing of namespaced controllers.

application/Controllers/Home.php

@@ -2,7 +2,6 @@
 
 class Home extends \CodeIgniter\Controller
 {
-
 	public function index()
 	{
 		echo view('welcome_message');

system/CodeIgniter.php

@@ -496,13 +496,8 @@ protected function startController()
 			}
 			else
 			{
-				// Try to load manually.
-				include APPPATH.'Controllers/'.$this->router->directory().$this->controller.'.php';
-
-				// Try to autoload the class, both with and
-				// without the namespace
-				if ( (! class_exists($this->controller, true) )
-					 || $this->method[0] === '_')
+				// Try to autoload the class
+				if ( ! class_exists($this->controller, true) || $this->method[0] === '_')
 				{
 					throw new PageNotFoundException('Controller or its method is not found.');
 				}

system/Router/Router.php

@@ -400,6 +400,16 @@ public function autoRoute(string $uri)
 		{
 			$this->params = $segments;
 		}
+
+		// Load the file so that it's available for CodeIgniter.
+		include APPPATH.'Controllers/'.$this->directory.$this->controller.'.php';
+
+		// Ensure the controller stores the fully-qualified class name
+		// We have to check for a length over 1, since by default it will be '\'
+		if (strpos($this->controller, '\\') === false && strlen($this->collection->getDefaultNamespace()) > 1)
+		{
+			$this->controller = str_replace('/', '\\', $this->collection->getDefaultNamespace().$this->directory.$this->controller);
+		}
 	}
 
 	//--------------------------------------------------------------------