Add fix for laravel octance

Don't use imports for octane setup
Add return types
wip
wip

Author: mmachatschek

src/Middleware/ServerTimingMiddleware.php

@@ -3,8 +3,8 @@
 namespace BeyondCode\ServerTiming\Middleware;
 
 use Closure;
-use Illuminate\Http\Request;
 use BeyondCode\ServerTiming\ServerTiming;
+use Illuminate\Http\Request;
 use Illuminate\Support\Str;
 use Symfony\Component\HttpFoundation\Response;
 

src/ServerTiming.php

@@ -104,4 +104,11 @@ public function events(): array
         return $this->finishedEvents;
     }
 
+    public function reset(Stopwatch $stopwatch): void
+    {
+        $this->finishedEvents = [];
+        $this->startedEvents = [];
+        $this->stopwatch = $stopwatch;
+    }
+
 }

src/ServerTimingServiceProvider.php

@@ -14,6 +14,10 @@ public function boot(): void
         if ($this->app->runningInConsole()) {
             $this->registerPublishing();
         }
+
+        if (isset($_SERVER['LARAVEL_OCTANE'])) {
+            $this->setupOctane();
+        }
     }
 
     /**
@@ -32,4 +36,31 @@ protected function registerPublishing(): void
             __DIR__.'/config/config.php' => config_path('timing.php'),
         ], 'server-timing-config');
     }
+
+    protected function resetServerTiming(): void
+    {
+        /**
+         * @var ServerTiming $serverTiming
+         */
+        $serverTiming = $this->app->get(ServerTiming::class);
+        $serverTiming->reset(new \Symfony\Component\Stopwatch\Stopwatch());
+    }
+
+    protected function setupOctane(): void
+    {
+        /** @phpstan-ignore-next-line */
+        $this->app['events']->listen(\Laravel\Octane\Events\RequestReceived::class, function () {
+            $this->resetServerTiming();
+        });
+
+        /** @phpstan-ignore-next-line */
+        $this->app['events']->listen(\Laravel\Octane\Events\TaskReceived::class, function () {
+            $this->resetServerTiming();
+        });
+
+        /** @phpstan-ignore-next-line */
+        $this->app['events']->listen(\Laravel\Octane\Events\TickReceived::class, function () {
+            $this->resetServerTiming();
+        });
+    }
 }