Allow specifying the location of Routing files within modules.

Author: lonnieezell

system/Config/Routing.php

@@ -27,6 +27,16 @@ class Routing extends BaseConfig
         APPPATH . 'Routes.php',
     ];
 
+    /**
+     * When discovering routes within "modules", or namespaces other
+     * than "App", this is the path relative to the module's root
+     * directory.
+     *
+     * Default: 'Routes.php'
+     * Legacy: 'Config/Routes.php'
+     */
+    public string $modulePath = 'Routes.php';
+
     /**
      * The default namespace to use for Controllers when no other
      * namespace has been specified.

system/Router/RouteCollection.php

@@ -94,6 +94,12 @@ class RouteCollection implements RouteCollectionInterface
      */
     protected array $routeFiles = [];
 
+    /**
+     * The path to the file that contains
+     * the route definitions within "modules".
+     */
+    protected string $modulePath;
+
     /**
      * Defined placeholders that can be used
      * within the
@@ -263,6 +269,7 @@ public function __construct(FileLocator $locator, Modules $moduleConfig, Routing
         $this->override404        = $routing->override404;
         $this->autoRoute          = $routing->autoRoute;
         $this->routeFiles         = $routing->routeFiles;
+        $this->modulePath         = $routing->modulePath;
         $this->prioritize         = $routing->prioritize;
     }
 
@@ -320,7 +327,12 @@ protected function discoverRoutes()
         $routes = $this;
 
         if ($this->moduleConfig->shouldDiscover('routes')) {
-            $files = $this->fileLocator->search('Config/Routes.php');
+            if (empty($this->modulePath)) {
+                log_message('warning', 'Routes module path is not set in Config/Routing.php.');
+                return;
+            }
+
+            $files = $this->fileLocator->search($this->modulePath);
 
             foreach ($files as $file) {
                 // Don't include our main file again...

tests/system/Router/RouteCollectionTest.php

@@ -51,6 +51,7 @@ protected function getCollector(array $config = [], array $files = [], $moduleCo
 
         $routerConfig                   = new \Config\Routing();
         $routerConfig->defaultNamespace = '\\';
+        $routerConfig->modulePath       = 'Config/Routes.php';
 
         return (new RouteCollection($loader, $moduleConfig, $routerConfig))->setHTTPVerb('get');
     }

tests/system/Router/RouterTest.php

@@ -36,7 +36,12 @@ protected function setUp(): void
 
         $moduleConfig          = new Modules();
         $moduleConfig->enabled = false;
-        $this->collection      = new RouteCollection(Services::locator(), $moduleConfig);
+
+        $routerConfig                   = new \Config\Routing();
+        $routerConfig->defaultNamespace = '\\';
+        $routerConfig->modulePath       = 'Config/Routes.php';
+
+        $this->collection      = new RouteCollection(Services::locator(), $moduleConfig, $routerConfig);
 
         $routes = [
             '/'                                               => 'Home::index',

user_guide_src/source/general/modules.rst

@@ -154,6 +154,8 @@ the **Modules** config file, described above.
 When working with modules, it can be a problem if the routes in the application contain wildcards.
 In that case, see :ref:`routing-priority`.
 
+By default, route files are named **Routes.php** and are located in the root directory of the module. You can change this by setting the ``$modulePath`` variable in the **Routing** config file to path to the file, relative to the module's root directory. For example, if you wanted to put your routes in a file named **Routes.php** in the module's ``Config`` directory, you would set the ``$modulePath`` variable to ``Config/Routes.php``.
+
 Filters
 =======
 

user_guide_src/source/installation/upgrade_433.rst

@@ -40,6 +40,7 @@ To clean up the routing system, the following changes were made:
     - New ``app/Config/Routing.php`` file that holds the settings that used to be in the Routes file.
     - The ``app/Config/Routes.php`` file was simplified so that it only contains the routes without settings and verbiage to clutter the file.
     - The ``app/Config/Routes.php`` file was moved to ``app/Routes.php`` to make it easier to find. When upgrading, you can change the ``app/Config/Routing.php` file, ``$routeFiles`` property to point to the old location if you prefer.
+    - Any module ``Routes.php`` files are expected to be in the namespace's root directory now. To adjust this to match the functionality of existing projects, you can cahnge the ``$modulePath`` property in ``app/Config/Routing.php`` to ``'Config/Routes.php'``.
     - The environment-specific routes files are no longer loaded automatically. To load those, you must add them to the ``$routeFiles`` property in ``app/Config/Routing.php``.
 
 Config