Merge pull request #872 from cakephp/4.x-fix-middleware-loading

fix middleware also being inserted in phpunit tests
cakephp · Jun 7, 2022 · 344fd1a · 344fd1a
2 parents df8dc9e + bd51c6d
commit 344fd1a
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/Plugin.php b/src/Plugin.php
@@ -33,7 +33,7 @@
 class Plugin extends BasePlugin
 {
     /**
-     * @var \DebugKit\ToolbarService
+     * @var \DebugKit\ToolbarService|null
      */
     protected $service;
 
@@ -66,7 +66,10 @@ public function bootstrap(PluginApplicationInterface $app): void
      */
     public function middleware(MiddlewareQueue $middlewareQueue): MiddlewareQueue
     {
-        $middlewareQueue->insertAt(0, new DebugKitMiddleware($this->service));
+        // Only insert middleware if Toolbar Service is available (not in phpunit run)
+        if ($this->service) {
+            $middlewareQueue->insertAt(0, new DebugKitMiddleware($this->service));
+        }
 
         return $middlewareQueue;
     }