Merge pull request #249 from spatie/revert-241-main

Revert "Use Illuminate\Database\Eloquent\Casts\Json if possible"

Author: rubenvanassche

src/SettingsRepositories/DatabaseSettingsRepository.php

@@ -3,7 +3,6 @@
 namespace Spatie\LaravelSettings\SettingsRepositories;
 
 use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\Casts\Json;
 use Spatie\LaravelSettings\Models\SettingsProperty;
 
 class DatabaseSettingsRepository implements SettingsRepository
@@ -28,7 +27,7 @@ public function getPropertiesInGroup(string $group): array
             ->where('group', $group)
             ->get(['name', 'payload'])
             ->mapWithKeys(function (object $object) {
-                return [$object->name => $this->decode($object->payload, true)];
+                return [$object->name => json_decode($object->payload, true)];
             })
             ->toArray();
     }
@@ -49,15 +48,15 @@ public function getPropertyPayload(string $group, string $name)
             ->first('payload')
             ->toArray();
 
-        return $this->decode($setting['payload']);
+        return json_decode($setting['payload']);
     }
 
     public function createProperty(string $group, string $name, $payload): void
     {
         $this->getBuilder()->create([
             'group' => $group,
             'name' => $name,
-            'payload' => $this->encode($payload),
+            'payload' => json_encode($payload),
             'locked' => false,
         ]);
     }
@@ -68,7 +67,7 @@ public function updatePropertiesPayload(string $group, array $properties): void
             return [
                 'group' => $group,
                 'name' => $name,
-                'payload' => $this->encode($payload),
+                'payload' => json_encode($payload),
             ];
         })->values()->toArray();
 
@@ -124,18 +123,4 @@ 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);
-    }
 }