From e949bf4373ce4edde1ef37cab673b3e0fa9c7679 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20=C5=A0tancl?= Date: Wed, 24 Apr 2019 17:28:10 +0200 Subject: [PATCH] Revert some \ additions --- src/CacheManager.php | 4 ++-- src/Commands/Rollback.php | 2 +- src/Commands/Seed.php | 2 +- src/Commands/TenantList.php | 2 +- src/Controllers/TenantAssetsController.php | 4 ++-- src/DatabaseManager.php | 17 ++++++++--------- src/Middleware/InitializeTenancy.php | 2 +- src/StorageDrivers/RedisStorageDriver.php | 6 +++--- src/TenancyServiceProvider.php | 2 +- .../SQLiteDatabaseManager.php | 4 ++-- src/TenantManager.php | 14 +++++++------- src/TenantRouteServiceProvider.php | 6 +++--- src/Traits/DealsWithMigrations.php | 2 +- src/Traits/HasATenantsOption.php | 2 +- 14 files changed, 34 insertions(+), 35 deletions(-) diff --git a/src/CacheManager.php b/src/CacheManager.php index e64b7e24..6e37f417 100644 --- a/src/CacheManager.php +++ b/src/CacheManager.php @@ -8,7 +8,7 @@ class CacheManager extends BaseCacheManager { public function __call($method, $parameters) { - $tags = [\config('tenancy.cache.tag_base') . \tenant('uuid')]; + $tags = [config('tenancy.cache.tag_base') . tenant('uuid')]; if ($method === "tags") { if (\count($parameters) !== 1) { @@ -18,7 +18,7 @@ class CacheManager extends BaseCacheManager $names = $parameters[0]; $names = (array) $names; // cache()->tags('foo') https://laravel.com/docs/5.7/cache#removing-tagged-cache-items - return $this->store()->tags(\array_merge($tags, $names)); + return $this->store()->tags(array_merge($tags, $names)); } return $this->store()->tags($tags)->$method(...$parameters); diff --git a/src/Commands/Rollback.php b/src/Commands/Rollback.php index 9f400377..8de6dc53 100644 --- a/src/Commands/Rollback.php +++ b/src/Commands/Rollback.php @@ -49,7 +49,7 @@ class Rollback extends RollbackCommand $this->input->setOption('database', 'tenant'); - \tenant()->all($this->option('tenants'))->each(function ($tenant) { + tenant()->all($this->option('tenants'))->each(function ($tenant) { $this->line("Tenant: {$tenant['uuid']} ({$tenant['domain']})"); $this->database->connectToTenant($tenant); diff --git a/src/Commands/Seed.php b/src/Commands/Seed.php index 0a520a2e..16ada831 100644 --- a/src/Commands/Seed.php +++ b/src/Commands/Seed.php @@ -49,7 +49,7 @@ class Seed extends SeedCommand $this->input->setOption('database', 'tenant'); - \tenant()->all($this->option('tenants'))->each(function ($tenant) { + tenant()->all($this->option('tenants'))->each(function ($tenant) { $this->line("Tenant: {$tenant['uuid']} ({$tenant['domain']})"); $this->database->connectToTenant($tenant); diff --git a/src/Commands/TenantList.php b/src/Commands/TenantList.php index 83e9a074..94eae4c6 100644 --- a/src/Commands/TenantList.php +++ b/src/Commands/TenantList.php @@ -38,7 +38,7 @@ class TenantList extends Command public function handle() { $this->info("Listing all tenants."); - \tenancy()->all()->each(function ($tenant) { + tenancy()->all()->each(function ($tenant) { $this->line("[Tenant] uuid: {$tenant['uuid']} @ {$tenant['domain']}"); }); } diff --git a/src/Controllers/TenantAssetsController.php b/src/Controllers/TenantAssetsController.php index b909316d..7697310b 100644 --- a/src/Controllers/TenantAssetsController.php +++ b/src/Controllers/TenantAssetsController.php @@ -14,9 +14,9 @@ class TenantAssetsController extends Controller public function asset($path) { try { - return \response()->file(\storage_path("app/public/$path")); + return response()->file(\storage_path("app/public/$path")); } catch (\Throwable $th) { - \abort(404); + abort(404); } } } diff --git a/src/DatabaseManager.php b/src/DatabaseManager.php index 53606107..5177ffb0 100644 --- a/src/DatabaseManager.php +++ b/src/DatabaseManager.php @@ -2,7 +2,6 @@ namespace Stancl\Tenancy; -use Illuminate\Support\Facades\DB; use Stancl\Tenancy\Jobs\QueuedTenantDatabaseCreator; use Stancl\Tenancy\Jobs\QueuedTenantDatabaseDeleter; use Illuminate\Database\DatabaseManager as BaseDatabaseManager; @@ -13,7 +12,7 @@ class DatabaseManager public function __construct(BaseDatabaseManager $database) { - $this->originalDefaultConnection = \config('database.default'); + $this->originalDefaultConnection = config('database.default'); $this->database = $database; } @@ -26,7 +25,7 @@ class DatabaseManager public function connectToTenant($tenant) { - $this->connect(\tenant()->getDatabaseName($tenant)); + $this->connect(tenant()->getDatabaseName($tenant)); } public function disconnect() @@ -41,16 +40,16 @@ class DatabaseManager $this->createTenantConnection($name); $driver = $driver ?: $this->getDriver(); - $databaseManagers = \config('tenancy.database_managers'); + $databaseManagers = config('tenancy.database_managers'); - if (! \array_key_exists($driver, $databaseManagers)) { - throw new \Exception("Database could not be created: no database manager for driver $driver is registered."); + if (! array_key_exists($driver, $databaseManagers)) { + throw new Exception("Database could not be created: no database manager for driver $driver is registered."); } - if (\config('tenancy.queue_database_creation', false)) { - QueuedTenantDatabaseCreator::dispatch(\app($databaseManagers[$driver]), $name, 'create'); + if (config('tenancy.queue_database_creation', false)) { + QueuedTenantDatabaseCreator::dispatch(app($databaseManagers[$driver]), $name, 'create'); } else { - \app($databaseManagers[$driver])->createDatabase($name); + app($databaseManagers[$driver])->createDatabase($name); } } diff --git a/src/Middleware/InitializeTenancy.php b/src/Middleware/InitializeTenancy.php index 64455baf..3c37360a 100644 --- a/src/Middleware/InitializeTenancy.php +++ b/src/Middleware/InitializeTenancy.php @@ -23,7 +23,7 @@ class InitializeTenancy public function handle($request, Closure $next) { try { - \tenancy()->init(); + tenancy()->init(); } catch (\Exception $e) { ($this->onFail)($e); } diff --git a/src/StorageDrivers/RedisStorageDriver.php b/src/StorageDrivers/RedisStorageDriver.php index 3241a9ba..699950e6 100644 --- a/src/StorageDrivers/RedisStorageDriver.php +++ b/src/StorageDrivers/RedisStorageDriver.php @@ -38,7 +38,7 @@ class RedisStorageDriver implements StorageDriver return $this->redis->hgetall("tenants:$uuid"); } - return \array_combine($fields, $this->redis->hmget("tenants:$uuid", $fields)); + return array_combine($fields, $this->redis->hmget("tenants:$uuid", $fields)); } public function getTenantIdByDomain(string $domain): ?string @@ -49,7 +49,7 @@ class RedisStorageDriver implements StorageDriver public function createTenant(string $domain, string $uuid): array { $this->redis->hmset("domains:$domain", 'tenant_id', $uuid); - $this->redis->hmset("tenants:$uuid", 'uuid', \json_encode($uuid), 'domain', \json_encode($domain)); + $this->redis->hmset("tenants:$uuid", 'uuid', json_encode($uuid), 'domain', json_encode($domain)); return $this->redis->hgetall("tenants:$uuid"); } @@ -67,7 +67,7 @@ class RedisStorageDriver implements StorageDriver public function getAllTenants(array $uuids = []): array { - $hashes = \array_map(function ($hash) { + $hashes = array_map(function ($hash) { return "tenants:{$hash}"; }, $uuids); diff --git a/src/TenancyServiceProvider.php b/src/TenancyServiceProvider.php index b47fb6fc..127da603 100644 --- a/src/TenancyServiceProvider.php +++ b/src/TenancyServiceProvider.php @@ -32,7 +32,7 @@ class TenancyServiceProvider extends ServiceProvider } $this->publishes([ - __DIR__ . '/config/tenancy.php' => \config_path('tenancy.php'), + __DIR__ . '/config/tenancy.php' => config_path('tenancy.php'), ], 'config'); $this->loadRoutesFrom(__DIR__ . '/routes.php'); diff --git a/src/TenantDatabaseManagers/SQLiteDatabaseManager.php b/src/TenantDatabaseManagers/SQLiteDatabaseManager.php index ff6ba05e..ca6d027a 100644 --- a/src/TenantDatabaseManagers/SQLiteDatabaseManager.php +++ b/src/TenantDatabaseManagers/SQLiteDatabaseManager.php @@ -9,7 +9,7 @@ class SQLiteDatabaseManager implements TenantDatabaseManager public function createDatabase(string $name): bool { try { - return \fclose(\fopen(\database_path($name), 'w')); + return fclose(fopen(database_path($name), 'w')); } catch (\Throwable $th) { return false; } @@ -18,7 +18,7 @@ class SQLiteDatabaseManager implements TenantDatabaseManager public function deleteDatabase(string $name): bool { try { - return \unlink(\database_path($name)); + return unlink(database_path($name)); } catch (\Throwable $th) { return false; } diff --git a/src/TenantManager.php b/src/TenantManager.php index eb32eeb0..f305b080 100644 --- a/src/TenantManager.php +++ b/src/TenantManager.php @@ -159,7 +159,7 @@ class TenantManager public static function currentDomain(): ?string { - return \request()->getHost() ?? null; + return request()->getHost() ?? null; } public function getDatabaseName($tenant = []): string @@ -203,7 +203,7 @@ class TenantManager { $uuids = (array) $uuids; - return \collect(\array_map(function ($tenant_array) { + return collect(array_map(function ($tenant_array) { return $this->jsonDecodeArrayValues($tenant_array); }, $this->storage->getAllTenants($uuids))); } @@ -236,7 +236,7 @@ class TenantManager return $this->jsonDecodeArrayValues($this->storage->getMany($uuid, $key)); } - return \json_decode($this->storage->get($uuid, $key), true); + return json_decode($this->storage->get($uuid, $key), true); } /** @@ -264,7 +264,7 @@ class TenantManager } if (! \is_null($value)) { - return $target[$key] = \json_decode($this->storage->put($uuid, $key, \json_encode($value)), true); + return $target[$key] = json_decode($this->storage->put($uuid, $key, json_encode($value)), true); } if (! \is_array($key)) { @@ -273,7 +273,7 @@ class TenantManager foreach ($key as $k => $v) { $target[$k] = $v; - $key[$k] = \json_encode($v); + $key[$k] = json_encode($v); } return $this->jsonDecodeArrayValues($this->storage->putMany($uuid, $key)); @@ -294,8 +294,8 @@ class TenantManager protected function jsonDecodeArrayValues(array $array) { - \array_walk($array, function (&$value, $key) { - $value = \json_decode($value, true); + array_walk($array, function (&$value, $key) { + $value = json_decode($value, true); }); return $array; diff --git a/src/TenantRouteServiceProvider.php b/src/TenantRouteServiceProvider.php index ba918298..4ea77402 100644 --- a/src/TenantRouteServiceProvider.php +++ b/src/TenantRouteServiceProvider.php @@ -9,11 +9,11 @@ class TenantRouteServiceProvider extends RouteServiceProvider { public function map() { - if (! \in_array(\request()->getHost(), $this->app['config']['tenancy.exempt_domains'] ?? []) - && \file_exists(\base_path('routes/tenant.php'))) { + if (! \in_array(request()->getHost(), $this->app['config']['tenancy.exempt_domains'] ?? []) + && file_exists(base_path('routes/tenant.php'))) { Route::middleware(['web', 'tenancy']) ->namespace($this->app['config']['tenant_route_namespace'] ?? 'App\Http\Controllers') - ->group(\base_path('routes/tenant.php')); + ->group(base_path('routes/tenant.php')); } } } diff --git a/src/Traits/DealsWithMigrations.php b/src/Traits/DealsWithMigrations.php index aec3f4da..e0187427 100644 --- a/src/Traits/DealsWithMigrations.php +++ b/src/Traits/DealsWithMigrations.php @@ -6,6 +6,6 @@ trait DealsWithMigrations { protected function getMigrationPaths() { - return [\config('tenancy.migrations_directory', \database_path('migrations/tenant'))]; + return [config('tenancy.migrations_directory', database_path('migrations/tenant'))]; } } diff --git a/src/Traits/HasATenantsOption.php b/src/Traits/HasATenantsOption.php index e7dc1339..5eadc3d4 100644 --- a/src/Traits/HasATenantsOption.php +++ b/src/Traits/HasATenantsOption.php @@ -8,7 +8,7 @@ trait HasATenantsOption { protected function getOptions() { - return \array_merge([ + return array_merge([ ['tenants', null, InputOption::VALUE_IS_ARRAY | InputOption::VALUE_OPTIONAL, '', null] ], parent::getOptions()); }