refactor: now you can write Services::routes()->loadRoutes()

Author: kenjis

system/CodeIgniter.php

@@ -730,8 +730,7 @@ public function displayPerformanceMetrics(string $output): string
     protected function tryToRouteIt(?RouteCollectionInterface $routes = null)
     {
         if ($routes === null) {
-            $routes = Services::routes();
-            $routes->loadRoutes();
+            $routes = Services::routes()->loadRoutes();
         }
 
         // $routes is defined in Config/Routes.php

system/Commands/Utilities/FilterCheck.php

@@ -85,8 +85,7 @@ public function run(array $params)
         $route  = $params[1];
 
         // Load Routes
-        $routes = Services::routes();
-        $routes->loadRoutes();
+        Services::routes()->loadRoutes();
 
         $filterCollector = new FilterCollector();
 

system/Commands/Utilities/Routes.php

@@ -75,10 +75,7 @@ class Routes extends BaseCommand
      */
     public function run(array $params)
     {
-        $routes = Services::routes();
-        $routes->loadRoutes();
-
-        $collection = $routes;
+        $collection = Services::routes()->loadRoutes();
         $methods    = [
             'get',
             'head',

system/Router/RouteCollection.php

@@ -1496,16 +1496,20 @@ public function shouldUseSupportedLocalesOnly(): bool
      * Loads main routes file and discover routes.
      *
      * Loads only once unless reset.
+     *
+     * @return $this
      */
-    public function loadRoutes(string $routesFile = APPPATH . 'Config/Routes.php'): void
+    public function loadRoutes(string $routesFile = APPPATH . 'Config/Routes.php')
     {
         if ($this->didDiscover) {
-            return;
+            return $this;
         }
 
         $routes = $this;
         require $routesFile;
 
         $this->discoverRoutes();
+
+        return $this;
     }
 }

system/Test/FeatureTestCase.php

@@ -177,7 +177,7 @@ public function call(string $method, string $path, ?array $params = null)
         // Initialize the RouteCollection
         if (! $routes = $this->routes) {
             $routes = Services::routes();
-            $routes->loadRoutes();
+            $routes->loadRoutes()->loadRoutes();
         }
 
         $routes->setHTTPVerb($method);

system/Test/FeatureTestTrait.php

@@ -166,8 +166,7 @@ public function call(string $method, string $path, ?array $params = null)
 
         // Initialize the RouteCollection
         if (! $routes = $this->routes) {
-            $routes = Services::routes();
-            $routes->loadRoutes();
+            $routes = Services::routes()->loadRoutes();
         }
 
         $routes->setHTTPVerb($method);

system/Test/FilterTestTrait.php

@@ -102,12 +102,7 @@ protected function setUpFilterTestTrait(): void
         $this->filters ??= new Filters($this->filtersConfig, $this->request, $this->response);
 
         if ($this->collection === null) {
-            // Load the RouteCollection from Config to gather App route info
-            // (creates $routes using the Service as a starting point)
-            $routes = Services::routes();
-            $routes->loadRoutes();
-
-            $this->collection = $routes;
+            $this->collection = Services::routes()->loadRoutes();
         }
 
         $this->doneFilterSetUp = true;

system/Test/bootstrap.php

@@ -92,5 +92,4 @@
 // Always load the URL helper, it should be used in most of apps.
 helper('url');
 
-$routes = Services::routes();
-$routes->loadRoutes();
+Services::routes()->loadRoutes();