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

[2.x] Restructure drivers config (#151)

Browse source 
* Restructure drivers config

* Apply fixes from StyleCI
This commit is contained in:
Samuel Štancl 2019-09-30 18:38:32 +02:00 • committed by GitHub
parent 6cb7f27e6c
commit c965ca5c93
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 18 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/DatabaseManager.php
View file

@ -189,8 +189,9 @@ class DatabaseManager
return DB::connection($this->getCentralConnectionName());
}
// todo this should not depend on the storage driver
public function getCentralConnectionName(): string
{
return $this->app['config']['tenancy.storage.db.connection'] ?? $this->originalDefaultConnectionName;
return $this->app['config']['tenancy.storage_drivers.db.connection'] ?? $this->originalDefaultConnectionName;
}
}

2
src/StorageDrivers/Database/DomainModel.php
View file

@ -20,6 +20,6 @@ class DomainModel extends Model
public function getTable()
{
return config('tenancy.storage.db.table_names.DomainModel', 'domains');
return config('tenancy.storage_drivers.db.table_names.DomainModel', 'domains');
}
}

6
src/StorageDrivers/Database/TenantModel.php
View file

@ -20,17 +20,17 @@ class TenantModel extends Model
public function getTable()
{
return config('tenancy.storage.db.table_names.TenantModel', 'tenants');
return config('tenancy.storage_drivers.db.table_names.TenantModel', 'tenants');
}
public static function dataColumn()
{
return config('tenancy.storage.db.data_column', 'data');
return config('tenancy.storage_drivers.db.data_column', 'data');
}
public static function customColumns()
{
return config('tenancy.storage.db.custom_columns', []);
return config('tenancy.storage_drivers.db.custom_columns', []);
}
public static function getAllTenants(array $ids)

2
src/StorageDrivers/RedisStorageDriver.php
View file

@ -26,7 +26,7 @@ class RedisStorageDriver implements StorageDriver
public function __construct(Application $app, Redis $redis)
{
$this->app = $app;
$this->redis = $redis->connection($app['config']['tenancy.redis.connection'] ?? 'tenancy');
$this->redis = $redis->connection($app['config']['tenancy.storage_drivers.redis.connection'] ?? 'tenancy');
}
/**

2
src/TenancyServiceProvider.php
View file

@ -21,7 +21,7 @@ class TenancyServiceProvider extends ServiceProvider
$this->mergeConfigFrom(__DIR__ . '/../assets/config.php', 'tenancy');
$this->app->bind(Contracts\StorageDriver::class, function ($app) {
return $app->make($app['config']['tenancy.storage_driver']);
return $app->make($app['config']['tenancy.storage_drivers'][$app['config']['tenancy.storage_driver']]['driver']);
});
$this->app->bind(Contracts\UniqueIdentifierGenerator::class, $this->app['config']['tenancy.unique_id_generator']);
$this->app->singleton(DatabaseManager::class);