Merge branch '4.x' into 4.next

Author: ADmad

.github/workflows/deploy_docs_4x.yml

@@ -19,4 +19,5 @@ jobs:
         uses: dokku/github-action@master
         with:
           git_remote_url: 'ssh://[email protected]:22/debugkit-docs-4'
+          git_push_flags: '-f'
           ssh_private_key: ${{ secrets.DOKKU_SSH_PRIVATE_KEY }}

docs/en/index.rst

@@ -291,6 +291,20 @@ to include the panel::
 The above would load all the default panels as well as the ``AppPanel``, and
 ``MyCustomPanel`` panel from ``MyPlugin``.
 
+Accessing Toolbar without a frontend
+====================================
+
+If you have an application which only provides an API (and therefore no frontend)
+the usual way of accessing the toolbar can't be used.
+
+Instead you have to call http://localhost/debug-kit/toolbar/``<debugkit-id>``
+
+The ``<debugkit-id>`` can be found inside the HTTP headers of your API response. It should look something like that::
+
+    X-DEBUGKIT-ID: 5ef39604-ad5d-4ca4-85d8-8595e52373bb
+
+So you would have to call http://localhost/debug-kit/toolbar/5ef39604-ad5d-4ca4-85d8-8595e52373bb
+
 Helper Functions
 ================
 

src/Plugin.php

@@ -47,7 +47,7 @@ public function bootstrap(PluginApplicationInterface $app): void
     {
         $service = new ToolbarService(EventManager::instance(), (array)Configure::read('DebugKit'));
 
-        if (!$service->isEnabled() || php_sapi_name() === 'cli' || php_sapi_name() === 'phpdbg') {
+        if (!$service->isEnabled()) {
             return;
         }
 

src/ToolbarService.php

@@ -100,9 +100,14 @@ public function registry()
      */
     public function isEnabled()
     {
-        $enabled = (bool)Configure::read('debug');
+        if (isset($GLOBALS['__PHPUNIT_BOOTSTRAP'])) {
+            return false;
+        }
+        $enabled = (bool)Configure::read('debug')
+                && !$this->isSuspiciouslyProduction()
+                && php_sapi_name() !== 'phpdbg';
 
-        if ($enabled && !$this->isSuspiciouslyProduction()) {
+        if ($enabled) {
             return true;
         }
         $force = $this->getConfig('forceEnable');

tests/TestCase/Middleware/DebugKitMiddlewareTest.php

@@ -52,6 +52,8 @@ public function setUp(): void
         $connection = ConnectionManager::get('test');
         $this->skipIf($connection->getDriver() instanceof Sqlite, 'Schema insertion/removal breaks SQLite');
         $this->oldConfig = Configure::read('DebugKit');
+        $this->restore = $GLOBALS['__PHPUNIT_BOOTSTRAP'];
+        unset($GLOBALS['__PHPUNIT_BOOTSTRAP']);
     }
 
     /**
@@ -64,6 +66,7 @@ public function tearDown(): void
         parent::tearDown();
 
         Configure::write('DebugKit', $this->oldConfig);
+        $GLOBALS['__PHPUNIT_BOOTSTRAP'] = $this->restore;
     }
 
     protected function handler()

tests/TestCase/ToolbarServiceTest.php

@@ -58,6 +58,8 @@ public function setUp(): void
 
         $connection = ConnectionManager::get('test');
         $this->skipIf($connection->getDriver() instanceof Sqlite, 'Schema insertion/removal breaks SQLite');
+        $this->restore = $GLOBALS['__PHPUNIT_BOOTSTRAP'];
+        unset($GLOBALS['__PHPUNIT_BOOTSTRAP']);
     }
 
     /**
@@ -69,6 +71,7 @@ public function tearDown(): void
     {
         parent::tearDown();
         putenv('HTTP_HOST=');
+        $GLOBALS['__PHPUNIT_BOOTSTRAP'] = $this->restore;
     }
 
     /**

webroot/css/style.css

@@ -605,7 +605,7 @@ strong {
 .is-active .c-toolbar {
     width: 100%;
     border-radius: 0;
-    overflow: auto;
+    overflow: hidden;
     padding-right: 40px;
 }