refactor: extract protectDefinedCliRoutes() method

codeigniter4 · Apr 10, 2022 · 6a39da0 · 6a39da0
1 parent b9b9cfc
commit 6a39da0
Showing 1 changed file with 17 additions and 12 deletions.
diff --git a/system/Router/AutoRouterImproved.php b/system/Router/AutoRouterImproved.php
@@ -162,6 +162,23 @@ public function getRoute(string $uri): array
         );
 
         // Ensure routes registered via $routes->cli() are not accessible via web.
+        $this->protectDefinedCliRoutes();
+
+        // Check _remao()
+        $this->checkRemap();
+
+        // Check parameters
+        try {
+            $this->checkParameters($uri);
+        } catch (ReflectionException $e) {
+            throw PageNotFoundException::forControllerNotFound($this->controller, $this->method);
+        }
+
+        return [$this->directory, $this->controller, $this->method, $this->params];
+    }
+
+    private function protectDefinedCliRoutes()
+    {
         if ($this->httpVerb !== 'cli') {
             $controller = strtolower($this->controller);
             $methodName = strtolower($this->method);
@@ -186,18 +203,6 @@ public function getRoute(string $uri): array
                 }
             }
         }
-
-        // Check _remao()
-        $this->checkRemap();
-
-        // Check parameters
-        try {
-            $this->checkParameters($uri);
-        } catch (ReflectionException $e) {
-            throw PageNotFoundException::forControllerNotFound($this->controller, $this->method);
-        }
-
-        return [$this->directory, $this->controller, $this->method, $this->params];
     }
 
     private function checkParameters(string $uri)