Merge branch 'clean-router-config' of github.com:codeigniter4/CodeIgniter4 into clean-router-config

Author: lonnieezell

system/Router/RouteCollection.php

@@ -273,7 +273,7 @@ public function __construct(FileLocator $locator, Modules $moduleConfig, Routing
      *
      * @return $this
      */
-    public function loadRoutes(string $routesFile = APPPATH . 'Routes.php')
+    public function loadRoutes(string $routesFile = APPPATH . 'Config/Routes.php')
     {
         if ($this->didDiscover) {
             return $this;

user_guide_src/source/changelogs/v4.3.3.rst

@@ -16,18 +16,6 @@ SECURITY
 - **Text Helper:** The :php:func:`random_string()` type **alpha**, **alnum**,
   **numeric** and **nozero** are now cryptographically secure.
 
-BREAKING
-********
-
-Message Changes
-***************
-
-Changes
-*******
-
-Deprecations
-************
-
 Bugs Fixed
 **********
 

user_guide_src/source/incoming/routing.rst

@@ -22,7 +22,7 @@ First, let's look at Defined Route Routing. If you want to use Auto Routing, see
 Setting Routing Rules
 *********************
 
-Routing rules are defined in the **app/Routes.php** file. In it you'll see that
+Routing rules are defined in the **app/Config/Routes.php** file. In it you'll see that
 it creates an instance of the RouteCollection class (``$routes``) that permits you to specify your own routing criteria.
 Routes can be specified using placeholders or Regular Expressions.
 
@@ -408,7 +408,7 @@ The value for the filter can be a string or an array of strings:
 
 See :doc:`Controller Filters <filters>` for more information on setting up filters.
 
-.. Warning:: If you set filters to routes in **app/Routes.php**
+.. Warning:: If you set filters to routes in **app/Config/Routes.php**
     (not in **app/Config/Filters.php**), it is recommended to disable Auto Routing (Legacy).
     When :ref:`auto-routing-legacy` is enabled, it may be possible that a controller can be accessed
     via a different URL than the configured route,
@@ -584,7 +584,7 @@ When no defined route is found that matches the URI, the system will attempt to
 controllers and methods when Auto Routing is enabled.
 
 You can disable this automatic matching, and restrict routes
-to only those defined by you, by setting the ``$autoRoute`` option to false:
+to only those defined by you, by setting the ``$autoRoute`` property to false:
 
 .. literalinclude:: routing/050.php
 
@@ -600,7 +600,7 @@ a valid class/method pair, just like you would show in any route, or a Closure:
 
 .. literalinclude:: routing/051.php
 
-Using the ``set404Override`` method within the routes file, you can use closures. Defining the override in the Routing file is restricted to class/method pairs.
+Using the ``$override404`` property within the routing config file, you can use closures. Defining the override in the Routing file is restricted to class/method pairs.
 
 .. note:: The ``set404Override()`` method does not change the Response status code to ``404``.
     If you don't set the status code in the controller you set, the default status code ``200``
@@ -677,7 +677,7 @@ See :ref:`Auto Routing in Controllers <controller-auto-routing-improved>` for mo
 Configuration Options
 =====================
 
-These options are available at the top of **app/Routes.php**.
+These options are available at the top of **app/Config/Routes.php**.
 
 Default Controller
 ------------------
@@ -720,7 +720,7 @@ Auto Routing (Legacy)
 Auto Routing (Legacy) is a routing system from CodeIgniter 3.
 It can automatically route HTTP requests based on conventions and execute the corresponding controller methods.
 
-It is recommended that all routes are defined in the **app/Routes.php** file,
+It is recommended that all routes are defined in the **app/Config/Routes.php** file,
 or to use :ref:`auto-routing-improved`,
 
 .. warning:: To prevent misconfiguration and miscoding, we recommend that you do not use
@@ -734,7 +734,7 @@ Enable Auto Routing (Legacy)
 
 Since v4.2.0, the auto-routing is disabled by default.
 
-To use it, you need to change the setting ``setAutoRoute()`` option to true in **app/Routes.php**::
+To use it, you need to change the setting ``$autoRoute`` option to true in **app/Config/Routing.php**::
 
     $routes->setAutoRoute(true);
 
@@ -761,7 +761,7 @@ See :ref:`Auto Routing (Legacy) in Controllers <controller-auto-routing-legacy>`
 Configuration Options (Legacy)
 ==============================
 
-These options are available at the top of **app/Routes.php**.
+These options are available at the top of **app/Config/Routes.php**.
 
 Default Controller (Legacy)
 ---------------------------

user_guide_src/source/installation/upgrade_440.rst

@@ -68,7 +68,6 @@ Routing
 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.
     - 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

user_guide_src/source/tutorial/static_pages.rst

@@ -136,7 +136,7 @@ We have made the controller. The next thing is to set routing rules.
 Routing associates a URI with a controller's method.
 
 Let's do that. Open the routing file located at
-**app/Routes.php**.
+**app/Config/Routes.php**.
 
 The only line there to start with should be: