Change blink handle for 'all' as it clashes with handles of 'all' (#136)

Co-authored-by: Jason Varga <[email protected]>

Author: ryanmitchell

src/Assets/AssetContainerRepository.php

@@ -13,10 +13,10 @@ class AssetContainerRepository extends StacheRepository
 
     public function all(): Collection
     {
-        return Blink::once('eloquent-assetcontainers-all', function () {
+        return Blink::once('eloquent-assetcontainers', function () {
             return app('statamic.eloquent.assets.container_model')::all()
                 ->map(function ($model) {
-                    return Blink::once("eloquent-assetcontainers-{$model->handle}", function () use ($model) {
+                    return Blink::once("eloquent-assetcontainer-{$model->handle}", function () use ($model) {
                         return app(AssetContainerContract::class)->fromModel($model);
                     });
                 });
@@ -25,7 +25,7 @@ public function all(): Collection
 
     public function findByHandle(string $handle): ?AssetContainerContract
     {
-        return Blink::once("eloquent-assetcontainers-{$handle}", function () use ($handle) {
+        return Blink::once("eloquent-assetcontainer-{$handle}", function () use ($handle) {
             $model = app('statamic.eloquent.assets.container_model')::whereHandle($handle)->first();
 
             if (! $model) {
@@ -45,15 +45,15 @@ public function save(AssetContainerContract $container)
     {
         $container->save();
 
-        Blink::forget("eloquent-assetcontainers-{$container->handle()}");
+        Blink::forget("eloquent-assetcontainer-{$container->handle()}");
     }
 
     public function delete($container)
     {
         $container->delete();
 
-        Blink::forget("eloquent-assetcontainers-{$container->handle()}");
-        Blink::forget('eloquent-assetcontainers-all');
+        Blink::forget("eloquent-assetcontainer-{$container->handle()}");
+        Blink::forget('eloquent-assetcontainers');
     }
 
     public static function bindings(): array

src/Collections/CollectionRepository.php

@@ -25,7 +25,7 @@ public function updateEntryUris($collection, $ids = null)
 
     public function all(): IlluminateCollection
     {
-        return Blink::once('eloquent-collections-all', function () {
+        return Blink::once('eloquent-collections', function () {
             return $this->transform(app('statamic.eloquent.collections.model')::all());
         });
     }
@@ -50,7 +50,7 @@ public function save($entry)
         $model->save();
 
         Blink::forget("eloquent-collection-{$model->handle}");
-        Blink::forget('eloquent-collections-all');
+        Blink::forget('eloquent-collections');
 
         $entry->model($model->fresh());
     }
@@ -61,7 +61,7 @@ public function delete($entry)
         $model->delete();
 
         Blink::forget("eloquent-collection-{$model->handle}");
-        Blink::forget('eloquent-collections-all');
+        Blink::forget('eloquent-collections');
     }
 
     protected function transform($items, $columns = [])

src/Fields/FieldsetRepository.php

@@ -11,7 +11,7 @@ class FieldsetRepository extends StacheRepository
 {
     public function all(): Collection
     {
-        return Blink::once('eloquent-fieldsets-all', function () {
+        return Blink::once('eloquent-fieldsets', function () {
             if (count($models = app('statamic.eloquent.blueprints.fieldset_model')::get() ?? collect()) === 0) {
                 return collect();
             }
@@ -66,6 +66,6 @@ public function deleteModel($fieldset)
         }
 
         Blink::forget("eloquent-fieldset-{$model->handle}");
-        Blink::forget('eloquent-fieldsets-all');
+        Blink::forget('eloquent-fieldsets');
     }
 }

src/Globals/GlobalRepository.php

@@ -38,7 +38,7 @@ public function findByHandle($handle): ?GlobalSetContract
 
     public function all(): GlobalCollection
     {
-        return Blink::once('eloquent-globalsets-all', function () {
+        return Blink::once('eloquent-globalsets', function () {
             return $this->transform(app('statamic.eloquent.global_sets.model')::all());
         });
     }
@@ -58,7 +58,7 @@ public function delete($entry)
         $entry->model()->delete();
 
         Blink::forget("eloquent-globalsets-{$entry->handle()}");
-        Blink::forget('eloquent-globalsets-all');
+        Blink::forget('eloquent-globalsets');
     }
 
     public static function bindings(): array

src/Taxonomies/TaxonomyRepository.php

@@ -27,7 +27,7 @@ public static function bindings(): array
 
     public function all(): Collection
     {
-        $models = Blink::once('eloquent-taxonomies-all', function () {
+        $models = Blink::once('eloquent-taxonomies', function () {
             return app('statamic.eloquent.taxonomies.model')::all();
         })
             ->each(function ($model) {
@@ -92,6 +92,6 @@ public function delete($entry)
         $model->delete();
 
         Blink::forget("eloquent-taxonomies-{$model->handle}");
-        Blink::forget('eloquent-taxonomies-all');
+        Blink::forget('eloquent-taxonomies');
     }
 }