From d2931530bd410727e4662c7cd65791a316cb4de5 Mon Sep 17 00:00:00 2001 From: stancl Date: Sun, 27 Oct 2019 17:56:53 +0000 Subject: [PATCH] Apply fixes from StyleCI --- src/StorageDrivers/Database/DomainRepository.php | 3 +++ src/StorageDrivers/Database/Repository.php | 4 +++- src/StorageDrivers/Database/TenantRepository.php | 10 +++++++--- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/StorageDrivers/Database/DomainRepository.php b/src/StorageDrivers/Database/DomainRepository.php index d1fce2f4..8106fede 100644 --- a/src/StorageDrivers/Database/DomainRepository.php +++ b/src/StorageDrivers/Database/DomainRepository.php @@ -1,5 +1,7 @@ id : $tenant; + return $this->where('tenant_id', $id)->get('domain')->toArray(); } diff --git a/src/StorageDrivers/Database/Repository.php b/src/StorageDrivers/Database/Repository.php index da11d4d3..f4543851 100644 --- a/src/StorageDrivers/Database/Repository.php +++ b/src/StorageDrivers/Database/Repository.php @@ -1,5 +1,7 @@ table->$method(...$parameters); } -} \ No newline at end of file +} diff --git a/src/StorageDrivers/Database/TenantRepository.php b/src/StorageDrivers/Database/TenantRepository.php index 4a627824..0f3942cf 100644 --- a/src/StorageDrivers/Database/TenantRepository.php +++ b/src/StorageDrivers/Database/TenantRepository.php @@ -1,5 +1,7 @@ decodedData($tenant); $result = []; - + foreach ($keys as $key) { $result[$key] = $decodedData[$key]; } @@ -74,6 +76,7 @@ class TenantRepository extends Repository foreach ($kvPairs as $key => $value) { if (in_array($key, static::customColumns())) { $data[$key] = $value; + return; } else { $jsonData[$key] = $value; @@ -94,6 +97,7 @@ class TenantRepository extends Repository foreach ($keys as $key => $key) { if (in_array($key, static::customColumns())) { $data[$key] = null; + return; } else { unset($jsonData[$key]); @@ -117,7 +121,7 @@ class TenantRepository extends Repository $dataColumn = static::dataColumn(); $decoded = json_decode($columns[$dataColumn], true); $columns = array_merge($columns, $decoded); - + // If $columns[$dataColumn] has been overriden by a value, don't delete the key. if (! array_key_exists($dataColumn, $decoded)) { unset($columns[$dataColumn]); @@ -155,4 +159,4 @@ class TenantRepository extends Repository ?? $config->get('tenancy.storage_drivers.db.table_names.tenants') ?? 'tenants'; } -} \ No newline at end of file +}