Convert columns to json

src/migrations/m240206_035135_convert_json_columns.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace craft\migrations;
+
+use craft\db\Migration;
+use craft\db\Table;
+
+/**
+ * m240206_035135_convert_json_columns migration.
+ */
+class m240206_035135_convert_json_columns extends Migration
+{
+    /**
+     * @inheritdoc
+     */
+    public function safeUp(): bool
+    {
+        $this->alterColumn(Table::DEPRECATIONERRORS, 'traces', $this->json());
+        $this->alterColumn(Table::FIELDLAYOUTS, 'config', $this->json());
+        $this->alterColumn(Table::GQLSCHEMAS, 'scope', $this->json());
+        $this->alterColumn(Table::SECTIONS, 'previewTargets', $this->json());
+        $this->alterColumn(Table::USERPREFERENCES, 'preferences', $this->json());
+        $this->alterColumn(Table::WIDGETS, 'settings', $this->json());
+
+        return true;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function safeDown(): bool
+    {
+        echo "m240206_035135_convert_json_columns cannot be reverted.\n";
+        return false;
+    }
+}

src/models/DeprecationError.php

@@ -8,6 +8,7 @@
 namespace craft\models;
 
 use craft\base\Model;
+use craft\helpers\Json;
 use craft\validators\DateTimeValidator;
 use DateTime;
 
@@ -59,6 +60,15 @@ class DeprecationError extends Model
      */
     public ?array $traces = null;
 
+    public function __construct($config = [])
+    {
+        if (is_string($config['traces'] ?? null)) {
+            $config['traces'] = Json::decode($config['traces']);
+        }
+
+        parent::__construct($config);
+    }
+
     /**
      * @inheritdoc
      */

src/records/GqlSchema.php

@@ -9,6 +9,7 @@
 
 use craft\db\ActiveRecord;
 use craft\db\Table;
+use craft\helpers\Json;
 
 /**
  * Class GqlSchema record.
@@ -30,4 +31,13 @@ public static function tableName(): string
     {
         return Table::GQLSCHEMAS;
     }
+
+    public function __construct($config = [])
+    {
+        if (is_string($config['scope'] ?? null)) {
+            $config['scope'] = Json::decode($config['scope']);
+        }
+
+        parent::__construct($config);
+    }
 }

src/services/Dashboard.php

@@ -17,6 +17,7 @@
 use craft\events\WidgetEvent;
 use craft\helpers\Component as ComponentHelper;
 use craft\helpers\Db;
+use craft\helpers\Json;
 use craft\records\Widget as WidgetRecord;
 use craft\widgets\CraftSupport as CraftSupportWidget;
 use craft\widgets\Feed as FeedWidget;
@@ -122,6 +123,10 @@ public function createWidget(mixed $config): WidgetInterface
             $config = ['type' => $config];
         }
 
+        if (is_string($config['settings'] ?? null)) {
+            $config['settings'] = Json::decode($config['settings']);
+        }
+
         try {
             $widget = ComponentHelper::createComponent($config, WidgetInterface::class);
         } catch (MissingComponentException $e) {

src/services/Deprecator.php

@@ -149,7 +149,7 @@ public function storeLogs(): void
                     'file' => $log->file,
                     'line' => $log->line,
                     'message' => $log->message,
-                    'traces' => Json::encode($log->traces),
+                    'traces' => $log->traces,
                 ]);
                 $log->id = (int)$db->getLastInsertID();
             } catch (Exception $e) {

src/services/Entries.php

@@ -228,7 +228,9 @@ private function _sections(): MemoizableArray
 
             $this->_sections = new MemoizableArray($results, function(array $result) use (&$siteSettingsBySection) {
                 if (!empty($result['previewTargets'])) {
-                    $result['previewTargets'] = Json::decode($result['previewTargets']);
+                    $result['previewTargets'] = is_string($result['previewTargets'])
+                        ? Json::decode($result['previewTargets'])
+                        : $result['previewTargets'];
                 } else {
                     $result['previewTargets'] = [];
                 }

src/services/Fields.php

@@ -757,7 +757,7 @@ private function _layouts(): MemoizableArray
                 if (array_key_exists('config', $config)) {
                     $nestedConfig = ArrayHelper::remove($config, 'config');
                     if ($nestedConfig) {
-                        $config += Json::decode($nestedConfig);
+                        $config += is_string($nestedConfig) ? Json::decode($nestedConfig) : $nestedConfig;
                     }
                     $loadTabs = false;
                 } else {

src/services/Gql.php

@@ -992,7 +992,7 @@ public function handleChangedSchema(ConfigEvent $event): void
             $schemaRecord->uid = $schemaUid;
             $schemaRecord->name = $data['name'];
             $schemaRecord->isPublic = (bool)($data['isPublic'] ?? false);
-            $schemaRecord->scope = (!empty($data['scope']) && is_array($data['scope'])) ? Json::encode($data['scope']) : [];
+            $schemaRecord->scope = empty($data['scope']) ? [] : $data['scope'];
 
             // Save the schema record
             $schemaRecord->save(false);

src/services/Users.php

@@ -369,9 +369,11 @@ public function getUserPreferences(int $userId): array
                 ->select(['preferences'])
                 ->from([Table::USERPREFERENCES])
                 ->where(['userId' => $userId])
-                ->scalar();
+                ->scalar() ?: [];
 
-            $this->_userPreferences[$userId] = $preferences ? Json::decode($preferences) : [];
+            $this->_userPreferences[$userId] = is_string($preferences)
+                ? Json::decode($preferences)
+                : $preferences;
         }
 
         return $this->_userPreferences[$userId];
@@ -390,7 +392,7 @@ public function saveUserPreferences(User $user, array $preferences): void
 
         Db::upsert(Table::USERPREFERENCES, [
             'userId' => $user->id,
-            'preferences' => Json::encode($preferences),
+            'preferences' => $preferences,
         ]);
 
         $this->_userPreferences[$user->id] = $preferences;