Merge pull request #129 from spatie/fix/scoped-settings-cache-instances

Switch to using scoped instances instead of singletons

Author: rubenvanassche

composer.json

@@ -54,7 +54,11 @@
         "test-coverage": "vendor/bin/pest --coverage"
     },
     "config": {
-        "sort-packages": true
+        "sort-packages": true,
+        "allow-plugins": {
+            "pestphp/pest-plugin": true,
+            "phpstan/extension-installer": true
+        }
     },
     "extra": {
         "laravel": {

src/LaravelSettingsServiceProvider.php

@@ -57,7 +57,7 @@ public function register(): void
             config('settings.cache.ttl')
         ));
 
-        $this->app->singleton(SettingsMapper::class);
+        $this->app->scoped(SettingsMapper::class);
 
         $settingsContainer = app(SettingsContainer::class);
         $settingsContainer->registerBindings();

src/SettingsContainer.php

@@ -25,7 +25,7 @@ public function registerBindings(): void
         $cache = $this->container->make(SettingsCache::class);
 
         $this->getSettingClasses()->each(function (string $settingClass) use ($cache) {
-            $this->container->singleton($settingClass, function () use ($cache, $settingClass) {
+            $this->container->scoped($settingClass, function () use ($cache, $settingClass) {
                 if ($cache->has($settingClass)) {
                     try {
                         return $cache->get($settingClass);