Merge pull request #37 from Kanti/bugfix/middleware.in.total-multiple…

…-times
Kanti · Sep 14, 2023 · 6a464ee · 6a464ee
2 parents cb9d888 + 3125063
commit 6a464ee
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 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();
         }

diff --git a/phpstan.neon b/phpstan.neon
@@ -7,4 +7,4 @@ parameters:
   reportUnmatchedIgnoredErrors: false
   typo3:
       requestGetAttributeMapping:
-          server-timing:middleware:inward: Kanti\ServerTiming\Dto\StopWatch|null
+          middleware.in.total: Kanti\ServerTiming\Dto\StopWatch|null