refactor: internal cleanup and tooling alignment

Author: datamweb

app/Config/Toolbar.php

@@ -1,14 +1,5 @@
 <?php
 
-/**
- * This file is part of CodeIgniter 4 framework.
- *
- * (c) CodeIgniter Foundation <[email protected]>
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
 namespace Config;
 
 use CodeIgniter\Config\BaseConfig;
@@ -144,12 +135,12 @@ class Toolbar extends BaseConfig
      * (such as infinite loops or "Maximum call stack size exceeded").
      *
      * Any request containing one of the following headers is treated as a
-     * client-managed or partial request, and the Debug Toolbar injection is skipped.s
+     * client-managed or partial request, and the Debug Toolbar injection is skipped.
      *
      * @var list<string>
      */
     public array $disableOnHeaders = [
-        'HX-Request',        // HTMX partial requests
-        'X-Up-Version',  // Unpoly partial requests
+        'HX-Request',    // HTMX partial requests
+        'X-Up-Version', // Unpoly partial requests
     ];
 }

system/Boot.php

@@ -145,8 +145,8 @@ public static function bootTest(Paths $paths): void
         static::loadEnvironmentBootstrap($paths, false);
 
         static::loadCommonFunctionsMock();
-
         static::loadCommonFunctions();
+
         static::loadAutoloader();
         static::setExceptionHandler();
         static::initializeKint();
@@ -262,6 +262,11 @@ protected static function loadCommonFunctions(): void
         require_once SYSTEMPATH . 'Common.php';
     }
 
+    protected static function loadCommonFunctionsMock(): void
+    {
+        require_once SYSTEMPATH . 'Test/Mock/MockCommon.php';
+    }
+
     /**
      * The autoloader allows all the pieces to work together in the framework.
      * We have to load it here, though, so that the config files can use the
@@ -391,12 +396,4 @@ protected static function runCommand(Console $console): int
 
         return is_int($exit) ? $exit : EXIT_SUCCESS;
     }
-
-    protected static function loadCommonFunctionsMock(): void
-    {
-        // Require system/Test/Mock/MockCommon.php
-        if (is_file(SYSTEMPATH . 'Test/Mock/MockCommon.php')) {
-            require_once SYSTEMPATH . 'Test/Mock/MockCommon.php';
-        }
-    }
 }

tests/system/Debug/ToolbarTest.php

@@ -33,14 +33,12 @@ final class ToolbarTest extends CIUnitTestCase
     private ToolbarConfig $config;
     private ?IncomingRequest $request    = null;
     private ?ResponseInterface $response = null;
-    private bool $originalIsCli;
 
     protected function setUp(): void
     {
         parent::setUp();
         Services::reset();
 
-        $this->originalIsCli = is_cli();
         is_cli(false);
 
         $this->config = new ToolbarConfig();
@@ -56,8 +54,8 @@ protected function setUp(): void
 
     protected function tearDown(): void
     {
-        // Restore original is_cli state
-        is_cli($this->originalIsCli);
+        // Restore is_cli state
+        is_cli();
 
         parent::tearDown();
     }