Skip to content

Commit 344fd1a

Browse files
authored
Merge pull request #872 from cakephp/4.x-fix-middleware-loading
fix middleware also being inserted in phpunit tests
2 parents df8dc9e + bd51c6d commit 344fd1a

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

src/Plugin.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
class Plugin extends BasePlugin
3434
{
3535
/**
36-
* @var \DebugKit\ToolbarService
36+
* @var \DebugKit\ToolbarService|null
3737
*/
3838
protected $service;
3939

@@ -66,7 +66,10 @@ public function bootstrap(PluginApplicationInterface $app): void
6666
*/
6767
public function middleware(MiddlewareQueue $middlewareQueue): MiddlewareQueue
6868
{
69-
$middlewareQueue->insertAt(0, new DebugKitMiddleware($this->service));
69+
// Only insert middleware if Toolbar Service is available (not in phpunit run)
70+
if ($this->service) {
71+
$middlewareQueue->insertAt(0, new DebugKitMiddleware($this->service));
72+
}
7073

7174
return $middlewareQueue;
7275
}

0 commit comments

Comments
 (0)