archtechx/tenancy
1
0
Fork 0
mirror of https://github.com/archtechx/tenancy.git synced 2025-12-12 19:14:04 +00:00
Code Activity

Make null falsey for cache config because config is not merged recursively

Browse source
This commit is contained in:
Samuel Štancl 2020-03-17 15:30:24 +01:00
parent f6115d590a
commit 776af4643c
3 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
assets/config.php
View file

@ -16,7 +16,7 @@ return [
'tenants' => 'tenants', 'tenants' => 'tenants',
'domains' => 'domains', 'domains' => 'domains',
], ],
'cache_store' => false, // What store should be used to cache tenant resolution. Set to false to disable cache, null to use default store, or a string with a specific cache store name. 'cache_store' => null, // What store should be used to cache tenant resolution. Set to null to disable cache or a string with a specific cache store name.
'cache_ttl' => 3600, // seconds 'cache_ttl' => 3600, // seconds
], ],
'redis' => [ 'redis' => [

3
src/StorageDrivers/Database/DatabaseStorageDriver.php
View file

@ -251,7 +251,6 @@ class DatabaseStorageDriver implements StorageDriver, CanDeleteKeys, CanFindByAn
public function usesCache(): bool public function usesCache(): bool
{ {
// null is also truthy here return $this->app['config']['tenancy.storage_drivers.db.cache_store'] !== null;
return $this->app['config']['tenancy.storage_drivers.db.cache_store'] !== false;
} }
} }

2
tests/CachedResolverTest.php
View file

@ -21,7 +21,7 @@ class CachedResolverTest extends TestCase
$this->markTestSkipped('This test is only relevant for the DB storage driver.'); $this->markTestSkipped('This test is only relevant for the DB storage driver.');
} }
config(['tenancy.storage_drivers.db.cache_store' => null]); // default driver config(['tenancy.storage_drivers.db.cache_store' => config('cache.default')]);
} }
/** @test */ /** @test */