Bugfx & Updates (#46)

* Bugfx & Updates * Reformat Code
glorand · Feb 4, 2020 · 68529d3 · 68529d3
1 parent 880aedf
commit 68529d3
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 All notable changes to `glorand/laravel-model-settings` will be documented in this file
 
+## 3.5.5 - 2020-02-04
+### Bugfix
+
 ## 3.5.4 - 2019-12-20
 ### Fix
 - https://github.com/glorand/laravel-model-settings/issues/40

diff --git a/src/Managers/RedisSettingsManager.php b/src/Managers/RedisSettingsManager.php
@@ -3,7 +3,6 @@
 namespace Glorand\Model\Settings\Managers;
 
 use Glorand\Model\Settings\Contracts\SettingsManagerContract;
-use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Redis;
 
 /**

diff --git a/src/Managers/TableSettingsManager.php b/src/Managers/TableSettingsManager.php
@@ -4,7 +4,6 @@
 
 use Glorand\Model\Settings\Contracts\SettingsManagerContract;
 use Glorand\Model\Settings\Models\ModelSettings;
-use Illuminate\Support\Arr;
 
 /**
  * Class TableSettingsManager

diff --git a/src/Traits/HasSettingsField.php b/src/Traits/HasSettingsField.php
@@ -2,6 +2,7 @@
 
 namespace Glorand\Model\Settings\Traits;
 
+use Exception;
 use Glorand\Model\Settings\Contracts\SettingsManagerContract;
 use Glorand\Model\Settings\Exceptions\ModelSettingsException;
 use Glorand\Model\Settings\Managers\FieldSettingsManager;
@@ -23,7 +24,8 @@ trait HasSettingsField
 
     protected static function bootHasSettingsField()
     {
-        static::saving(function (self $model) {
+        static::saving(function ($model) {
+            /** @var self $model */
             $model->fixSettingsValue();
         });
     }
@@ -101,7 +103,7 @@ function () {
                     return Schema::hasColumn($this->getTable(), $this->getSettingsFieldName());
                 }
             );
-        } catch (\Exception $e) {
+        } catch (Exception $e) {
             throw new ModelSettingsException("Cache: " . $e->getMessage());
         }
     }

diff --git a/src/Traits/HasSettingsRedis.php b/src/Traits/HasSettingsRedis.php
@@ -27,18 +27,17 @@ public function settings(): SettingsManagerContract
 
     public function getSettingsValue(): array
     {
-        $redisValue = Redis::get($this->cacheKey());
+        $redisValue = Redis::connection()->get($this->cacheKey());
 
         return Arr::wrap(json_decode($redisValue, true));
     }
 
     public function cacheKey(string $key = null): string
     {
         return sprintf(
-            "r-k-%s:%s:%s",
+            "r-k-%s:%s",
             $this->getTable(),
-            $this->getKey(),
-            $this->updated_at->timestamp
+            $this->getKey()
         ) . $key;
     }
 

diff --git a/src/Traits/HasSettingsTable.php b/src/Traits/HasSettingsTable.php
@@ -63,6 +63,6 @@ public function getSettingsCacheKey(): string
     {
         return config('model_settings.settings_table_cache_prefix') . $this->getTable() . '::' . $this->getKey();
     }
-    
+
     abstract public function getTable();
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -63,6 +63,6 @@ public function getSettingsCacheKey(): string @@
         {
             return config('model_settings.settings_table_cache_prefix') . $this->getTable() . '::' . $this->getKey();
         }
         abstract public function getTable();
     }