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

Fix TenantStorageTest

Browse source
This commit is contained in:
Samuel Štancl 2019-09-30 19:02:00 +02:00
parent bde1035609
commit e88801a4d1
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -8,6 +8,6 @@ trait CentralConnection
{ {
public function getConnectionName() public function getConnectionName()
{ {
return app(DatabaseStorageDriver::class)->getCentralConnectionName(); return DatabaseStorageDriver::getCentralConnectionName();
} }
} }

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

@ -7,6 +7,7 @@ namespace Stancl\Tenancy\StorageDrivers\Database;
use Illuminate\Foundation\Application; use Illuminate\Foundation\Application;
use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\DB;
use Stancl\Tenancy\Contracts\StorageDriver; use Stancl\Tenancy\Contracts\StorageDriver;
use Stancl\Tenancy\DatabaseManager;
use Stancl\Tenancy\Exceptions\DomainsOccupiedByOtherTenantException; use Stancl\Tenancy\Exceptions\DomainsOccupiedByOtherTenantException;
use Stancl\Tenancy\Exceptions\TenantCouldNotBeIdentifiedException; use Stancl\Tenancy\Exceptions\TenantCouldNotBeIdentifiedException;
use Stancl\Tenancy\Exceptions\TenantWithThisIdAlreadyExistsException; use Stancl\Tenancy\Exceptions\TenantWithThisIdAlreadyExistsException;
@ -36,14 +37,14 @@ class DatabaseStorageDriver implements StorageDriver
* *
* @return \Illuminate\Database\Connection * @return \Illuminate\Database\Connection
*/ */
public function getCentralConnection(): \Illuminate\Database\Connection public static function getCentralConnection(): \Illuminate\Database\Connection
{ {
return DB::connection($this->getCentralConnectionName()); return DB::connection(static::getCentralConnectionName());
} }
public function getCentralConnectionName(): string public static function getCentralConnectionName(): string
{ {
return $this->app['config']['tenancy.storage_drivers.db.connection'] ?? $this->originalDefaultConnectionName; return config('tenancy.storage_drivers.db.connection') ?? app(DatabaseManager::class)->originalDefaultConnectionName;
} }
public function findByDomain(string $domain): Tenant public function findByDomain(string $domain): Tenant