✨ enable controller discovery in 'app/Controllers' directory

Signed-off-by: otengkwame <[email protected]>

Author: otengkwame

CodeIgniter/Framework/core/CodeIgniter.php

@@ -403,10 +403,24 @@ function &get_instance()
 $class = ucfirst($RTR->class);
 $method = $RTR->method;
 
-if (empty($class) or !file_exists(APPPATH . 'controllers/' . $RTR->directory . $class . '.php')) {
+// Specify default paths to load controllers when they are not module controllers
+$corePathController = APPPATH . 'controllers/' . $RTR->directory . $class . '.php';
+$appRootController = APPROOT . 'Controllers/' . $RTR->directory . $class . '.php';
+
+if (
+	(empty($class) or !file_exists($corePathController))
+	and (empty($class) or !file_exists($appRootController))
+) {
 	$e404 = true;
 } else {
-	require_once(APPPATH . 'controllers/' . $RTR->directory . $class . '.php');
+
+	if (file_exists($corePathController)) {
+		require_once($corePathController);
+	}
+
+	if (file_exists($appRootController)) {
+		require_once($appRootController);
+	}
 
 	if (!class_exists($class, false) or $method[0] === '_' or method_exists('CI_Controller', $method)) {
 		$e404 = true;

MX/Router.php

@@ -191,7 +191,12 @@ public function locate($segments)
 		}
 
 		if( ! empty($this->directory)) return;
-		
+
+		// /* controller exists in App/Controllers directory? */
+		// if (is_file(APPROOT . 'Controllers/' . ucfirst($module) . $ext)) {
+		// 	$directory = $module;
+		// }
+
 		/* controller exists in commands directory? */
 		if (is_file(APPPATH . 'controllers/'.$commands_directory.'/' . ucfirst($module) . $ext)) {
 			$directory = $module;
@@ -229,6 +234,10 @@ public function locate($segments)
 			return array_slice($segments, 1);
 		}
 
+		if (is_file(APPROOT . 'Controllers/' . ucfirst($module) . $ext)) {
+			return $segments;
+		}
+
 		/* application controller exists? */
 		if (is_file(APPPATH.'controllers/'.ucfirst($module).$ext))
 		{