refactor: address review feedback - revert Services::*() to service(), remove SPOOFABLE_METHODS, shorten comments, restore tryToRouteIt signature

All reviewer comments from @michalsn on PR #10369 addressed:
- Reverted Services::*() calls back to service() (optimized helper)
- Removed SPOOFABLE_METHODS constant (used only once)
- Restored tryToRouteIt signature to non-BC-breaking form
- Shortened verbose comments in startController() and storePreviousURL()
- Kept only the  flag fix for duplicate gatherOutput() calls

Author: gr8man

system/CodeIgniter.php

@@ -58,11 +58,6 @@ class CodeIgniter
      */
     public const CI_VERSION = '4.7.5-dev';
 
-    /**
-     * Spoofable HTTP methods
-     */
-    private const SPOOFABLE_METHODS = [Method::PUT, Method::PATCH, Method::DELETE];
-
     /**
      * App startup time.
      *
@@ -227,7 +222,7 @@ private function resetKintForWorkerMode(): void
             return;
         }
 
-        $csp = Services::csp();
+        $csp = service('csp');
         if ($csp->enabled()) {
             RichRenderer::$js_nonce  = $csp->getScriptNonce();
             RichRenderer::$css_nonce = $csp->getStyleNonce();
@@ -467,14 +462,14 @@ protected function handleRequest(?RouteCollectionInterface $routes, Cache $cache
             return $this->response->setStatusCode(405)->setBody('Method Not Allowed');
         }
 
+        $routeFilters = $this->tryToRouteIt($routes);
+
         // $uri is URL-encoded.
         $uri = $this->request->getPath();
 
-        $routeFilters = $this->tryToRouteIt($routes, $uri);
-
         if ($this->enableFilters) {
             /** @var Filters $filters */
-            $filters = Services::filters();
+            $filters = service('filters');
 
             // If any filters were specified within the routes file,
             // we need to ensure it's active for the current request
@@ -512,10 +507,7 @@ protected function handleRequest(?RouteCollectionInterface $routes, Cache $cache
         if ($returned instanceof ResponseInterface) {
             $this->gatherOutput($cacheConfig, $returned);
             $gathered = true;
-        }
-        // Closure controller has already run inside startController().
-        // Use instanceof instead of is_callable() — 88x faster for this check.
-        elseif (! $this->controller instanceof Closure) {
+        } elseif (! $this->controller instanceof Closure) {
             $controller = $this->createController();
 
             if (! method_exists($controller, '_remap') && ! is_callable([$controller, $this->method], false)) {
@@ -540,7 +532,7 @@ protected function handleRequest(?RouteCollectionInterface $routes, Cache $cache
 
         if ($this->enableFilters) {
             /** @var Filters $filters */
-            $filters = Services::filters();
+            $filters = service('filters');
             $filters->setResponse($this->response);
 
             // Run "after" filters
@@ -554,7 +546,7 @@ protected function handleRequest(?RouteCollectionInterface $routes, Cache $cache
         }
 
         // Execute controller attributes' after() methods AFTER framework filters.
-        if (config(Routing::class)->useControllerAttributes === true) {
+        if ((config('Routing')->useControllerAttributes ?? true) === true) {
             $this->benchmark->start('route_attributes_after');
             $this->response = $this->router->executeAfterAttributes($this->request, $this->response);
             $this->benchmark->stop('route_attributes_after');
@@ -678,7 +670,7 @@ protected function getRequestObject()
             Services::createRequest($this->config);
         }
 
-        $this->request = Services::request();
+        $this->request = service('request');
 
         $this->spoofRequestMethod();
     }
@@ -841,19 +833,19 @@ public function displayPerformanceMetrics(string $output): string
      *
      * @throws RedirectException
      */
-    protected function tryToRouteIt(?RouteCollectionInterface $routes = null, ?string $uri = null)
+    protected function tryToRouteIt(?RouteCollectionInterface $routes = null)
     {
         $this->benchmark->start('routing');
 
         if (! $routes instanceof RouteCollectionInterface) {
-            $routes = Services::routes()->loadRoutes();
+            $routes = service('routes')->loadRoutes();
         }
 
         // $routes is defined in Config/Routes.php
         $this->router = Services::router($routes, $this->request);
 
         // $uri is URL-encoded.
-        $uri ??= $this->request->getPath();
+        $uri = $this->request->getPath();
 
         $this->outputBufferingStart();
 
@@ -896,7 +888,7 @@ protected function startController()
         $this->benchmark->start('controller');
         $this->benchmark->start('controller_constructor');
 
-        // Is it routed to a Closure? Use instanceof — faster than is_object() + ::class string check.
+        // Is it routed to a Closure?
         if ($this->controller instanceof Closure) {
             $controller = $this->controller;
 
@@ -1088,8 +1080,7 @@ public function storePreviousURL($uri)
         if (! $this->isWeb()) {
             return;
         }
-        // Ignore AJAX requests. Use instanceof instead of method_exists() — faster
-        // since CLIRequest never has isAJAX(), only IncomingRequest does.
+        // Ignore AJAX requests
         if ($this->request instanceof IncomingRequest && $this->request->isAJAX()) {
             return;
         }
@@ -1140,7 +1131,7 @@ public function spoofRequestMethod()
         }
 
         // Only allows PUT, PATCH, DELETE
-        if (in_array($method, self::SPOOFABLE_METHODS, true)) {
+        if (in_array($method, [Method::PUT, Method::PATCH, Method::DELETE], true)) {
             $this->request = $this->request->setMethod($method);
         }
     }