archtechx/tenancy
1
0
Fork 0
mirror of https://github.com/archtechx/tenancy.git synced 2026-08-06 05:54:03 +00:00
Code Activity

Refactor FS bootstrapper

Browse source 
scopeCache() didn't feel right since it 1) stored thee original paths, 2) actually scoped things. Separate the concerns so that scopeCache() just does that -- scopes cache.
This commit is contained in:
lukinovec 2026-07-31 14:00:36 +02:00
parent 483a3ec802
commit 958fc8e06d
1 changed files with 29 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

39
src/Bootstrappers/FilesystemTenancyBootstrapper.php
View file

@ -46,6 +46,7 @@ class FilesystemTenancyBootstrapper implements TenancyBootstrapper
$this->storagePath($suffix); $this->storagePath($suffix);
$this->assetHelper($suffix); $this->assetHelper($suffix);
$this->forgetDisks(); $this->forgetDisks();
$this->storeOriginalCachePaths();
$this->scopeCache($suffix); $this->scopeCache($suffix);
$this->scopeSessions($suffix); $this->scopeSessions($suffix);
@ -200,13 +201,10 @@ class FilesystemTenancyBootstrapper implements TenancyBootstrapper
} }
} }
public function scopeCache(string|false $suffix): void /** Returns the names of the file-driver stores listed in tenancy.cache.stores. */
protected function fileCacheStores(): array
{ {
if (! $this->app['config']['tenancy.filesystem.scope_cache']) { return array_filter($this->app['config']['tenancy.cache.stores'], function ($name) {
return;
}
$stores = array_filter($this->app['config']['tenancy.cache.stores'], function ($name) {
$store = $this->app['config']["cache.stores.{$name}"]; $store = $this->app['config']["cache.stores.{$name}"];
if ($store === null) { if ($store === null) {
@ -215,15 +213,36 @@ class FilesystemTenancyBootstrapper implements TenancyBootstrapper
return $store['driver'] === 'file'; return $store['driver'] === 'file';
}); });
}
foreach ($stores as $name) { /**
// Store the original configured cache paths, unless they're already stored -- * Store the original configured cache paths, so that they can be properly scoped
// scopeCache() is also called in revert(), by which point the originals were * to a tenant and restored back to the central context when tenancy ends.
// already captured in bootstrap(). */
protected function storeOriginalCachePaths(): void
{
if (! $this->app['config']['tenancy.filesystem.scope_cache']) {
return;
}
foreach ($this->fileCacheStores() as $name) {
$this->originalCachePaths[$name] ??= [ $this->originalCachePaths[$name] ??= [
'path' => $this->app['config']["cache.stores.{$name}.path"], 'path' => $this->app['config']["cache.stores.{$name}.path"],
'lock_path' => $this->app['config']["cache.stores.{$name}.lock_path"], 'lock_path' => $this->app['config']["cache.stores.{$name}.lock_path"],
]; ];
}
}
protected function scopeCache(string|false $suffix): void
{
if (! $this->app['config']['tenancy.filesystem.scope_cache']) {
return;
}
foreach ($this->fileCacheStores() as $name) {
if (! isset($this->originalCachePaths[$name])) {
continue;
}
$path = $this->scopeCachePath($this->originalCachePaths[$name]['path'], $suffix); $path = $this->scopeCachePath($this->originalCachePaths[$name]['path'], $suffix);
$lockPath = $this->originalCachePaths[$name]['lock_path']; $lockPath = $this->originalCachePaths[$name]['lock_path'];