From e88801a4d12cd5c3b7d52e85b67b3d6ebe6a2e7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20=C5=A0tancl?= Date: Mon, 30 Sep 2019 19:02:00 +0200 Subject: [PATCH] Fix TenantStorageTest --- src/StorageDrivers/Database/CentralConnection.php | 2 +- src/StorageDrivers/Database/DatabaseStorageDriver.php | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/StorageDrivers/Database/CentralConnection.php b/src/StorageDrivers/Database/CentralConnection.php index 00533db1..3c697783 100644 --- a/src/StorageDrivers/Database/CentralConnection.php +++ b/src/StorageDrivers/Database/CentralConnection.php @@ -8,6 +8,6 @@ trait CentralConnection { public function getConnectionName() { - return app(DatabaseStorageDriver::class)->getCentralConnectionName(); + return DatabaseStorageDriver::getCentralConnectionName(); } } diff --git a/src/StorageDrivers/Database/DatabaseStorageDriver.php b/src/StorageDrivers/Database/DatabaseStorageDriver.php index de613b2d..4f5c64bb 100644 --- a/src/StorageDrivers/Database/DatabaseStorageDriver.php +++ b/src/StorageDrivers/Database/DatabaseStorageDriver.php @@ -7,6 +7,7 @@ namespace Stancl\Tenancy\StorageDrivers\Database; use Illuminate\Foundation\Application; use Illuminate\Support\Facades\DB; use Stancl\Tenancy\Contracts\StorageDriver; +use Stancl\Tenancy\DatabaseManager; use Stancl\Tenancy\Exceptions\DomainsOccupiedByOtherTenantException; use Stancl\Tenancy\Exceptions\TenantCouldNotBeIdentifiedException; use Stancl\Tenancy\Exceptions\TenantWithThisIdAlreadyExistsException; @@ -36,14 +37,14 @@ class DatabaseStorageDriver implements StorageDriver * * @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