Merge pull request #18 from farbcodegmbh/fix/request-scopes

[Fix]: Per-Request Scoping of Shared States

Author: julian-farbcode

src/StatefulResourcesServiceProvider.php

@@ -25,22 +25,22 @@ public function configurePackage(Package $package): void
 
     public function bootingPackage(): void
     {
-        $states = config()->array('stateful-resources.states');
+        $states = config()->collection('stateful-resources.states');
 
         $this->app->singleton(StateRegistry::class, function () use ($states) {
             $registry = new StateRegistry;
 
-            foreach ($states as $state) {
+            $states->each(function (string|ResourceState $state) use ($registry) {
                 if ($state instanceof ResourceState) {
                     $state = $state->value;
                 }
                 $registry->register($state);
-            }
+            });
 
             return $registry;
         });
 
-        $this->app->singleton(ActiveState::class, function () {
+        $this->app->scoped(ActiveState::class, function () {
             return new ActiveState;
         });
     }

tests/Feature/SharedStateTest.php

@@ -201,3 +201,16 @@
 
     expect(ActiveState::getShared())->toBe('table');
 });
+
+it('resets the active state between requests', function () {
+    $cat = Cat::factory()->new()->createOne();
+
+    CatResource::state('table')->make($cat);
+
+    expect(ActiveState::getShared())->toBe('table');
+
+    simulateNewOctaneRequest();
+
+    expect(ActiveState::getShared())->toBe(app(StateRegistry::class)->getDefaultState());
+    expect(ActiveState::getForResource(CatResource::class))->toBe(app(StateRegistry::class)->getDefaultState());
+});

tests/Pest.php

@@ -1,9 +1,21 @@
 <?php
 
 use Farbcode\StatefulResources\Tests\TestCase;
+use Illuminate\Support\Facades\Facade;
 
 uses(TestCase::class)->in(__DIR__);
 
+/*
+|--------------------------------------------------------------------------
+| Utility Functions
+|--------------------------------------------------------------------------
+*/
+function simulateNewOctaneRequest(): void
+{
+    app()->forgetScopedInstances();
+    Facade::clearResolvedInstances();
+}
+
 /*
 |--------------------------------------------------------------------------
 | Expectations