Add resolved state tracking to Loop

Author: fsmonter

src/Loop.php

@@ -20,6 +20,8 @@ class Loop
 
     protected string $context = '';
 
+    protected bool $hasBeenResolved = false;
+
     public function __construct()
     {
         $this->tools = new ToolCollection;
@@ -36,7 +38,9 @@ public function context(string $context): static
 
     public function tool(Tool $tool): static
     {
-        $this->tools->push($tool);
+        if (! $this->hasBeenResolved) {
+            $this->tools->push($tool);
+        }
 
         $this->storeRegistration(function (Loop $loop) use ($tool) {
             $loop->tools->push($tool);
@@ -47,8 +51,10 @@ public function tool(Tool $tool): static
 
     public function toolkit(Toolkit $toolkit): static
     {
-        foreach ($toolkit->getTools() as $tool) {
-            $this->tools->push($tool);
+        if (! $this->hasBeenResolved) {
+            foreach ($toolkit->getTools() as $tool) {
+                $this->tools->push($tool);
+            }
         }
 
         $this->storeRegistration(function (Loop $loop) use ($toolkit) {
@@ -132,4 +138,14 @@ protected function storeRegistration(callable $callback): void
         $registrations[] = $callback;
         app()->instance('loop.registrations', $registrations);
     }
+
+    public function markAsResolved(): void
+    {
+        $this->hasBeenResolved = true;
+    }
+
+    public function hasBeenResolved(): bool
+    {
+        return $this->hasBeenResolved;
+    }
 }

src/LoopServiceProvider.php

@@ -46,9 +46,10 @@ public function packageBooted(): void
          * Set up container resolving hook to replay tool registrations for Octane compatibility
          */
         $this->app->resolving(Loop::class, function ($loop, $app) {
+            $loop->markAsResolved();
+
             if ($app->bound('loop.registrations')) {
                 $registrations = $app->make('loop.registrations');
-
                 if (is_array($registrations)) {
                     foreach ($registrations as $registration) {
                         if (is_callable($registration)) {