From 3e9e299f28537d41e86f53f36c1fb5c096fa0aa5 Mon Sep 17 00:00:00 2001 From: Ryan Mitchell Date: Thu, 29 May 2025 13:20:10 +0100 Subject: [PATCH 1/2] Remove stache stores for repositories we control --- src/ServiceProvider.php | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/src/ServiceProvider.php b/src/ServiceProvider.php index 8ef92e26..65a1438f 100644 --- a/src/ServiceProvider.php +++ b/src/ServiceProvider.php @@ -39,6 +39,7 @@ use Statamic\Eloquent\Taxonomies\TermQueryBuilder; use Statamic\Eloquent\Taxonomies\TermRepository; use Statamic\Eloquent\Tokens\TokenRepository; +use Statamic\Facades\Stache; use Statamic\Providers\AddonServiceProvider; use Statamic\Statamic; @@ -238,6 +239,8 @@ private function registerAssetContainers() }); Statamic::repository(AssetContainerRepositoryContract::class, AssetContainerRepository::class); + + Statamic::booted(fn () => Stache::removeStore('asset-containers')); } private function registerAssets() @@ -265,6 +268,8 @@ private function registerAssets() }); Statamic::repository(AssetRepositoryContract::class, AssetRepository::class); + + Statamic::booted(fn () => Stache::removeStore('assets')); } private function registerBlueprints() @@ -299,6 +304,8 @@ private function registerCollections() }); Statamic::repository(CollectionRepositoryContract::class, CollectionRepository::class); + + Statamic::booted(fn () => Stache::removeStore('collections')); } private function registerCollectionTrees() @@ -322,6 +329,8 @@ private function registerCollectionTrees() }); Statamic::repository(CollectionTreeRepositoryContract::class, CollectionTreeRepository::class); + + Statamic::booted(fn () => Stache::removeStore('collection-trees')); } private function registerEntries() @@ -345,6 +354,8 @@ private function registerEntries() }); Statamic::repository(EntryRepositoryContract::class, EntryRepository::class); + + Statamic::booted(fn () => Stache::removeStore('entries')); } private function registerFieldsets() @@ -381,6 +392,8 @@ private function registerForms() }); Statamic::repository(FormRepositoryContract::class, FormRepository::class); + + Statamic::booted(fn () => Stache::removeStore('forms')); } private function registerFormSubmissions() @@ -402,6 +415,8 @@ private function registerFormSubmissions() $app['statamic.eloquent.form_submissions.model']::query() ); }); + + Statamic::booted(fn () => Stache::removeStore('form-submissions')); } private function registerGlobals() @@ -415,6 +430,8 @@ private function registerGlobals() }); Statamic::repository(GlobalRepositoryContract::class, GlobalRepository::class); + + Statamic::booted(fn () => Stache::removeStore('globals')); } private function registerGlobalVariables() @@ -430,6 +447,8 @@ private function registerGlobalVariables() $this->app->bind('statamic.eloquent.global_set_variables.model', function () use ($usingOldConfigKeys) { return config($usingOldConfigKeys ? 'statamic.eloquent-driver.global_sets.variables_model' : 'statamic.eloquent-driver.global_set_variables.model'); }); + + Statamic::booted(fn () => Stache::removeStore('global-variables')); } private function registerRevisions() @@ -456,6 +475,8 @@ private function registerStructures() }); Statamic::repository(NavigationRepositoryContract::class, NavigationRepository::class); + + Statamic::booted(fn () => Stache::removeStore('navigation')); } private function registerStructureTrees() @@ -479,6 +500,8 @@ private function registerStructureTrees() }); Statamic::repository(NavTreeRepositoryContract::class, NavTreeRepository::class); + + Statamic::booted(fn () => Stache::removeStore('nav-trees')); } public function registerTaxonomies() @@ -492,6 +515,8 @@ public function registerTaxonomies() }); Statamic::repository(TaxonomyRepositoryContract::class, TaxonomyRepository::class); + + Statamic::booted(fn () => Stache::removeStore('taxonomies')); } public function registerTerms() @@ -511,6 +536,8 @@ public function registerTerms() }); Statamic::repository(TermRepositoryContract::class, TermRepository::class); + + Statamic::booted(fn () => Stache::removeStore('terms')); } public function registerTokens() From a460e5a7e14ad23a4509f4d1531f90282ddd49a2 Mon Sep 17 00:00:00 2001 From: Ryan Mitchell Date: Mon, 2 Jun 2025 08:21:12 +0100 Subject: [PATCH 2/2] Update to exclude --- src/ServiceProvider.php | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/ServiceProvider.php b/src/ServiceProvider.php index 65a1438f..6055a1e5 100644 --- a/src/ServiceProvider.php +++ b/src/ServiceProvider.php @@ -240,7 +240,7 @@ private function registerAssetContainers() Statamic::repository(AssetContainerRepositoryContract::class, AssetContainerRepository::class); - Statamic::booted(fn () => Stache::removeStore('asset-containers')); + Stache::exclude('asset-containers'); } private function registerAssets() @@ -269,7 +269,7 @@ private function registerAssets() Statamic::repository(AssetRepositoryContract::class, AssetRepository::class); - Statamic::booted(fn () => Stache::removeStore('assets')); + Stache::exclude('assets'); } private function registerBlueprints() @@ -305,7 +305,7 @@ private function registerCollections() Statamic::repository(CollectionRepositoryContract::class, CollectionRepository::class); - Statamic::booted(fn () => Stache::removeStore('collections')); + Stache::exclude('collections'); } private function registerCollectionTrees() @@ -330,7 +330,7 @@ private function registerCollectionTrees() Statamic::repository(CollectionTreeRepositoryContract::class, CollectionTreeRepository::class); - Statamic::booted(fn () => Stache::removeStore('collection-trees')); + Stache::exclude('collection-trees'); } private function registerEntries() @@ -355,7 +355,7 @@ private function registerEntries() Statamic::repository(EntryRepositoryContract::class, EntryRepository::class); - Statamic::booted(fn () => Stache::removeStore('entries')); + Stache::exclude('entries'); } private function registerFieldsets() @@ -393,7 +393,7 @@ private function registerForms() Statamic::repository(FormRepositoryContract::class, FormRepository::class); - Statamic::booted(fn () => Stache::removeStore('forms')); + Stache::exclude('forms'); } private function registerFormSubmissions() @@ -416,7 +416,7 @@ private function registerFormSubmissions() ); }); - Statamic::booted(fn () => Stache::removeStore('form-submissions')); + Stache::exclude('form-submissions'); } private function registerGlobals() @@ -431,7 +431,7 @@ private function registerGlobals() Statamic::repository(GlobalRepositoryContract::class, GlobalRepository::class); - Statamic::booted(fn () => Stache::removeStore('globals')); + Stache::exclude('globals'); } private function registerGlobalVariables() @@ -448,7 +448,7 @@ private function registerGlobalVariables() return config($usingOldConfigKeys ? 'statamic.eloquent-driver.global_sets.variables_model' : 'statamic.eloquent-driver.global_set_variables.model'); }); - Statamic::booted(fn () => Stache::removeStore('global-variables')); + Stache::exclude('global-variables'); } private function registerRevisions() @@ -476,7 +476,7 @@ private function registerStructures() Statamic::repository(NavigationRepositoryContract::class, NavigationRepository::class); - Statamic::booted(fn () => Stache::removeStore('navigation')); + Stache::exclude('navigation'); } private function registerStructureTrees() @@ -501,7 +501,7 @@ private function registerStructureTrees() Statamic::repository(NavTreeRepositoryContract::class, NavTreeRepository::class); - Statamic::booted(fn () => Stache::removeStore('nav-trees')); + Stache::exclude('nav-trees'); } public function registerTaxonomies() @@ -516,7 +516,7 @@ public function registerTaxonomies() Statamic::repository(TaxonomyRepositoryContract::class, TaxonomyRepository::class); - Statamic::booted(fn () => Stache::removeStore('taxonomies')); + Stache::exclude('taxonomies'); } public function registerTerms() @@ -537,7 +537,7 @@ public function registerTerms() Statamic::repository(TermRepositoryContract::class, TermRepository::class); - Statamic::booted(fn () => Stache::removeStore('terms')); + Stache::exclude('terms'); } public function registerTokens()