Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Extend the cache driver within register instead of boot #3023

Merged
merged 1 commit into from
Dec 16, 2020
Merged

Extend the cache driver within register instead of boot #3023

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 22 additions & 11 deletions src/Providers/CacheServiceProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,23 @@

class CacheServiceProvider extends ServiceProvider
{
/**
* Register any application services.
*
* @return void
*/
public function register()
{
$this->extendFileStore();
}

/**
* Bootstrap services.
*
* @return void
*/
public function boot()
{
$this->extendFileStore();
$this->macroRememberWithExpiration();
}

Expand All @@ -27,17 +36,19 @@ public function boot()
*/
private function extendFileStore()
{
Cache::extend('statamic', function () {
return Cache::repository(new FileStore(
$this->app['files'],
$this->app['config']['cache.stores.file']['path']
));
});
$this->app->booting(function () {
Cache::extend('statamic', function () {
return Cache::repository(new FileStore(
$this->app['files'],
$this->app['config']['cache.stores.file']['path']
));
});

if (config('cache.default') === 'file') {
config(['cache.stores.statamic' => ['driver' => 'statamic']]);
config(['cache.default' => 'statamic']);
}
if (config('cache.default') === 'file') {
config(['cache.stores.statamic' => ['driver' => 'statamic']]);
config(['cache.default' => 'statamic']);
}
});
}

/**
Expand Down