FIX: Duplicated keys when using doted keys #40 (#41)

* FIX: Duplicated keys in when using doted keys #40
glorand · Dec 20, 2019 · 880aedf · 880aedf
1 parent 6c02732
commit 880aedf
Show file tree

Hide file tree

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

diff --git a/src/Managers/AbstractSettingsManager.php b/src/Managers/AbstractSettingsManager.php
@@ -38,7 +38,12 @@ public function __construct(Model $model)
      */
     public function all(): array
     {
-        return array_merge($this->model->getDefaultSettings(), $this->model->getSettingsValue());
+        $array = [];
+        foreach (array_merge($this->model->getDefaultSettings(), $this->model->getSettingsValue()) as $key => $value) {
+            Arr::set($array, $key, $value);
+        }
+
+        return $array;
     }
 
     /**