refactor: update test and other

Author: datamweb

app/Config/Toolbar.php

@@ -150,8 +150,6 @@ class Toolbar extends BaseConfig
      */
     public array $disableOnHeaders = [
         'HX-Request',        // HTMX partial requests
-        'X-Unpoly-Request',  // Unpoly partial requests
-        'Turbo-Frame',       // Turbo Frames
-        'Turbo-Visit',       // Turbo Drive navigation
+        'X-Up-Version',  // Unpoly partial requests
     ];
 }

system/Boot.php

@@ -144,14 +144,13 @@ public static function bootTest(Paths $paths): void
         static::loadDotEnv($paths);
         static::loadEnvironmentBootstrap($paths, false);
 
+        static::loadCommonFunctionsMock();
+
         static::loadCommonFunctions();
         static::loadAutoloader();
         static::setExceptionHandler();
         static::initializeKint();
         static::autoloadHelpers();
-
-        // Global test helpers and mocks for all tests
-        require_once ROOTPATH . 'tests/_support/MockCommon.php';
     }
 
     /**
@@ -392,4 +391,12 @@ 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';
+        }
+    }
 }

system/Debug/Toolbar.php

@@ -391,13 +391,6 @@ public function prepare(?RequestInterface $request = null, ?ResponseInterface $r
 
             $config = config(ToolbarConfig::class);
 
-            foreach ($config->disableOnHeaders as $header) {
-                if ($request->hasHeader($header)) {
-                    $this->isCustomAjax = true;
-                    break;
-                }
-            }
-
             $toolbar = service('toolbar', $config);
             $stats   = $app->getPerformanceStats();
             $data    = $toolbar->run(
@@ -420,6 +413,14 @@ public function prepare(?RequestInterface $request = null, ?ResponseInterface $r
 
             $format = $response->getHeaderLine('content-type');
 
+            foreach ($config->disableOnHeaders as $header) {
+                if ($request->hasHeader($header)) {
+                    $this->isCustomAjax = true;
+
+                    continue;
+                }
+            }
+
             // Non-HTML formats should not include the debugbar
             // then we send headers saying where to find the debug data
             // for this response

tests/_support/MockCommon.php

@@ -33,12 +33,15 @@ 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();
-        is_cli();
+
+        $this->originalIsCli = is_cli();
+        is_cli(false);
 
         $this->config = new ToolbarConfig();
 
@@ -54,7 +57,7 @@ protected function setUp(): void
     protected function tearDown(): void
     {
         // Restore original is_cli state
-        is_cli();
+        is_cli($this->originalIsCli);
 
         parent::tearDown();
     }