Merge pull request #241 from naxvog/main

Use Illuminate\Database\Eloquent\Casts\Json if possible
spatie · Dec 1, 2023 · ee792da · ee792da
2 parents adf98fd + e81292f
commit ee792da
Showing 1 changed file with 19 additions and 4 deletions.
diff --git a/src/SettingsRepositories/DatabaseSettingsRepository.php b/src/SettingsRepositories/DatabaseSettingsRepository.php
@@ -3,6 +3,7 @@
 namespace Spatie\LaravelSettings\SettingsRepositories;
 
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Casts\Json;
 use Spatie\LaravelSettings\Models\SettingsProperty;
 
 class DatabaseSettingsRepository implements SettingsRepository
@@ -27,7 +28,7 @@ public function getPropertiesInGroup(string $group): array
             ->where('group', $group)
             ->get(['name', 'payload'])
             ->mapWithKeys(function (object $object) {
-                return [$object->name => json_decode($object->payload, true)];
+                return [$object->name => $this->decode($object->payload, true)];
             })
             ->toArray();
     }
@@ -48,15 +49,15 @@ public function getPropertyPayload(string $group, string $name)
             ->first('payload')
             ->toArray();
 
-        return json_decode($setting['payload']);
+        return $this->decode($setting['payload']);
     }
 
     public function createProperty(string $group, string $name, $payload): void
     {
         $this->getBuilder()->create([
             'group' => $group,
             'name' => $name,
-            'payload' => json_encode($payload),
+            'payload' => $this->encode($payload),
             'locked' => false,
         ]);
     }
@@ -67,7 +68,7 @@ public function updatePropertiesPayload(string $group, array $properties): void
             return [
                 'group' => $group,
                 'name' => $name,
-                'payload' => json_encode($payload),
+                'payload' => $this->encode($payload),
             ];
         })->values()->toArray();
 
@@ -123,4 +124,18 @@ public function getBuilder(): Builder
 
         return $model->newQuery();
     }
+
+    private function encode(mixed $value): mixed
+    {
+        return class_exists(Json::class)
+            ? Json::encode($value)
+            : json_encode($value);
+    }
+
+    private function decode(string $payload, bool $associative = false): mixed
+    {
+        return class_exists(Json::class)
+            ? Json::decode($payload, ! $associative)
+            : json_decode($payload, $associative);
+    }
 }