From a4fd296d03cc1457fd44ba18c62f8c226e36cebf Mon Sep 17 00:00:00 2001 From: stancl Date: Mon, 2 Dec 2019 19:37:03 +0000 Subject: [PATCH] Apply fixes from StyleCI --- src/DatabaseManager.php | 7 +++---- tests/DatabaseSchemaManagerTest.php | 2 +- tests/TenantDatabaseManagerTest.php | 4 ++-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/DatabaseManager.php b/src/DatabaseManager.php index b65ed421..0dd6c317 100644 --- a/src/DatabaseManager.php +++ b/src/DatabaseManager.php @@ -5,7 +5,6 @@ declare(strict_types=1); namespace Stancl\Tenancy; use Closure; -use Exception; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Database\DatabaseManager as BaseDatabaseManager; use Illuminate\Foundation\Application; @@ -239,10 +238,10 @@ class DatabaseManager return $this->app[$databaseManagers[$driver]]; } - + /** * What key on the connection config should be used to separate tenants. - * + * * @param string $connectionName * @return string */ @@ -250,7 +249,7 @@ class DatabaseManager { if ($this->getDriver($this->getBaseConnection($connectionName)) === 'pgsql' && $this->app['config']['tenancy.separate_by'] === 'schema') { - return 'schema'; + return 'schema'; } return 'database'; diff --git a/tests/DatabaseSchemaManagerTest.php b/tests/DatabaseSchemaManagerTest.php index 0d36aea7..65c011c0 100644 --- a/tests/DatabaseSchemaManagerTest.php +++ b/tests/DatabaseSchemaManagerTest.php @@ -42,7 +42,7 @@ class DatabaseSchemaManagerTest extends TestCase public function the_default_db_is_used_when_based_on_is_null() { config(['database.default' => 'pgsql']); - + $this->assertSame('pgsql', config('database.default')); config([ 'database.connections.pgsql.foo' => 'bar', diff --git a/tests/TenantDatabaseManagerTest.php b/tests/TenantDatabaseManagerTest.php index 6e072e83..89c0bbd7 100644 --- a/tests/TenantDatabaseManagerTest.php +++ b/tests/TenantDatabaseManagerTest.php @@ -10,8 +10,8 @@ use Stancl\Tenancy\Jobs\QueuedTenantDatabaseDeleter; use Stancl\Tenancy\Tenant; use Stancl\Tenancy\TenantDatabaseManagers\MySQLDatabaseManager; use Stancl\Tenancy\TenantDatabaseManagers\PostgreSQLDatabaseManager; -use Stancl\Tenancy\TenantDatabaseManagers\SQLiteDatabaseManager; use Stancl\Tenancy\TenantDatabaseManagers\PostgreSQLSchemaManager; +use Stancl\Tenancy\TenantDatabaseManagers\SQLiteDatabaseManager; class TenantDatabaseManagerTest extends TestCase { @@ -79,7 +79,7 @@ class TenantDatabaseManagerTest extends TestCase ['mysql', MySQLDatabaseManager::class], ['sqlite', SQLiteDatabaseManager::class], ['pgsql', PostgreSQLDatabaseManager::class], - ['pgsql', PostgreSQLSchemaManager::class] + ['pgsql', PostgreSQLSchemaManager::class], ]; }