From adb92d5a9a60caf9f82d4aeb7bfa354da86ff53e Mon Sep 17 00:00:00 2001 From: stancl Date: Fri, 9 Aug 2019 17:39:45 +0000 Subject: [PATCH] Apply fixes from StyleCI --- src/StorageDrivers/DatabaseStorageDriver.php | 5 ++++- src/Tenant.php | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/StorageDrivers/DatabaseStorageDriver.php b/src/StorageDrivers/DatabaseStorageDriver.php index c9b9999f..da07c086 100644 --- a/src/StorageDrivers/DatabaseStorageDriver.php +++ b/src/StorageDrivers/DatabaseStorageDriver.php @@ -2,8 +2,8 @@ namespace Stancl\Tenancy\StorageDrivers; -use Stancl\Tenancy\Interfaces\StorageDriver; use Stancl\Tenancy\Tenant; +use Stancl\Tenancy\Interfaces\StorageDriver; class DatabaseStorageDriver implements StorageDriver { @@ -70,6 +70,7 @@ class DatabaseStorageDriver implements StorageDriver public function get(string $uuid, string $key) { $tenant = Tenant::find($uuid); + return $tenant->$key ?? json_decode($tenant->data)[$key] ?? null; } @@ -80,11 +81,13 @@ class DatabaseStorageDriver implements StorageDriver $tenant_data = null; // cache - json_decode() can be expensive $get_from_tenant_data = function ($key) use ($tenant, &$tenant_data) { $tenant_data = $tenant_data ?? json_decode($tenant->data); + return $tenant_data[$key] ?? null; }; return array_reduce($keys, function ($keys, $key) use ($tenant, $get_from_tenant_data) { $keys[$key] = $tenant->$key ?? $get_from_tenant_data($key) ?? null; + return $keys; }, []); } diff --git a/src/Tenant.php b/src/Tenant.php index 364e812f..872d4df1 100644 --- a/src/Tenant.php +++ b/src/Tenant.php @@ -7,4 +7,4 @@ use Illuminate\Database\Eloquent\Model; class Tenant extends Model { // todo if not attribute exists in db, put into json data -} \ No newline at end of file +}