archtechx/tenancy
1
0
Fork 0
mirror of https://github.com/archtechx/tenancy.git synced 2025-12-13 01:34:02 +00:00
Code Activity

Use default prefix generator inline, delete the 'default' key logic

Browse source
This commit is contained in:
lukinovec 2023-03-31 07:51:20 +02:00
parent c45f900b78
commit 8ea3cc9739
1 changed files with 1 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/Bootstrappers/PrefixCacheTenancyBootstrapper.php
View file

@ -28,12 +28,6 @@ class PrefixCacheTenancyBootstrapper implements TenancyBootstrapper
public function bootstrap(Tenant $tenant): void public function bootstrap(Tenant $tenant): void
{ {
// If the user didn't specify the default generator
// Use static::defaultPrefixGenerator() as the default prefix generator
if (! isset(static::$prefixGenerators['default'])) {
static::generatePrefixUsing('default', static::defaultPrefixGenerator($this->config->get('cache.prefix')));
}
foreach (static::$tenantCacheStores as $store) { foreach (static::$tenantCacheStores as $store) {
$this->originalPrefixes[$store] = $this->config->get('cache.prefix'); $this->originalPrefixes[$store] = $this->config->get('cache.prefix');
@ -50,13 +44,6 @@ class PrefixCacheTenancyBootstrapper implements TenancyBootstrapper
$this->originalPrefixes = []; $this->originalPrefixes = [];
} }
public static function defaultPrefixGenerator(string $originalPrefix = ''): Closure
{
return function (Tenant $tenant) use ($originalPrefix) {
return $originalPrefix . config('tenancy.cache.prefix_base') . $tenant->getTenantKey();
};
}
protected function setCachePrefix(string $driver, string|null $prefix): void protected function setCachePrefix(string $driver, string|null $prefix): void
{ {
$this->config->set('cache.prefix', $prefix); $this->config->set('cache.prefix', $prefix);
@ -75,8 +62,7 @@ class PrefixCacheTenancyBootstrapper implements TenancyBootstrapper
return static::$prefixGenerators[$store]($tenant); return static::$prefixGenerators[$store]($tenant);
} }
// Use default generator if the store doesn't have a custom generator return $this->config->get('cache.prefix', '') . config('tenancy.cache.prefix_base') . $tenant->getTenantKey();
return static::$prefixGenerators['default']($tenant);
} }
public static function generatePrefixUsing(string $store, Closure $prefixGenerator): void public static function generatePrefixUsing(string $store, Closure $prefixGenerator): void