🐛 fix middleware.in.total multiple times called

Kanti · Sep 14, 2023 · e5ee1e6 · e5ee1e6
1 parent cb9d888
commit e5ee1e6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Classes/Middleware/WrapMiddleware.php b/Classes/Middleware/WrapMiddleware.php
@@ -36,7 +36,7 @@ public function handle(ServerRequestInterface $request): ResponseInterface
         self::$middlewareIn = TimingUtility::stopWatch($this->isKernel ? 'requestHandler' : 'middleware.in', $this->info);
 
         if ($this->isKernel) {
-            TimingUtility::end('middleware.in.total');
+            $request->getAttribute('middleware.in.total')?->stop();
         }
 
         $response = $this->requestHandler->handle($request);

diff --git a/Classes/Middleware/XClassMiddlewareDispatcher.php b/Classes/Middleware/XClassMiddlewareDispatcher.php
@@ -34,7 +34,7 @@ public function handle(ServerRequestInterface $request): ResponseInterface
         $stop = TimingUtility::stopWatch('bootstrap');
         $stop->startTime = $_SERVER["REQUEST_TIME_FLOAT"];
         $stop->stop();
-        TimingUtility::start('middleware.in.total');
+        $request = $request->withAttribute('middleware.in.total', TimingUtility::stopWatch('middleware.in.total'));
         if ($this->tip instanceof WrapMiddleware) {
             $this->tip->isFirst();
         }