Cleanup + MariaDB fixes

craftcms · Feb 6, 2024 · 585a131 · 585a131
1 parent 1ecb86f
commit 585a131
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 38 deletions.
diff --git a/src/models/DeprecationError.php b/src/models/DeprecationError.php
@@ -8,7 +8,6 @@
 namespace craft\models;
 
 use craft\base\Model;
-use craft\helpers\Json;
 use craft\validators\DateTimeValidator;
 use DateTime;
 
@@ -60,15 +59,6 @@ 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
      */

diff --git a/src/models/GqlSchema.php b/src/models/GqlSchema.php
@@ -8,7 +8,6 @@
 namespace craft\models;
 
 use craft\base\Model;
-use craft\helpers\Json;
 use craft\helpers\StringHelper;
 use craft\records\GqlSchema as GqlSchemaRecord;
 use craft\validators\UniqueValidator;
@@ -52,15 +51,6 @@ class GqlSchema extends Model
      */
     private array $_cachedPairs = [];
 
-    public function __construct($config = [])
-    {
-        if (isset($config['scope']) && is_string($config['scope'])) {
-            $config['scope'] = Json::decode($config['scope']);
-        }
-
-        parent::__construct($config);
-    }
-
     /**
      * @inheritdoc
      */

diff --git a/src/services/Dashboard.php b/src/services/Dashboard.php
@@ -17,7 +17,6 @@
 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;
@@ -124,10 +123,6 @@ 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) {

diff --git a/src/services/Deprecator.php b/src/services/Deprecator.php
@@ -13,7 +13,6 @@
 use craft\elements\db\ElementQuery;
 use craft\errors\DeprecationException;
 use craft\helpers\Db;
-use craft\helpers\Json;
 use craft\helpers\StringHelper;
 use craft\helpers\Template;
 use craft\models\DeprecationError;
@@ -139,6 +138,7 @@ private function _storeLogsInDb(): bool
     public function storeLogs(): void
     {
         $db = Craft::$app->getDb();
+        $tableSchema = $db->getSchema()->getTableSchema(Table::DEPRECATIONERRORS);
 
         foreach ($this->_pendingRequestLogs as $log) {
             try {
@@ -149,7 +149,7 @@ public function storeLogs(): void
                     'file' => $log->file,
                     'line' => $log->line,
                     'message' => $log->message,
-                    'traces' => $log->traces,
+                    'traces' => Db::prepareValueForDb($log->traces, $tableSchema->columns['traces']->dbType),
                 ]);
                 $log->id = (int)$db->getLastInsertID();
             } catch (Exception $e) {

diff --git a/src/services/Entries.php b/src/services/Entries.php
@@ -227,10 +227,8 @@ private function _sections(): MemoizableArray
             }
 
             $this->_sections = new MemoizableArray($results, function(array $result) use (&$siteSettingsBySection) {
-                if (!empty($result['previewTargets'])) {
-                    $result['previewTargets'] = is_string($result['previewTargets'])
-                        ? Json::decode($result['previewTargets'])
-                        : $result['previewTargets'];
+                if (!empty($result['previewTargets']) && is_string($result['previewTargets'])) {
+                    $result['previewTargets'] = Json::decode($result['previewTargets']);
                 } else {
                     $result['previewTargets'] = [];
                 }

diff --git a/src/services/Gql.php b/src/services/Gql.php
@@ -68,7 +68,6 @@
 use craft\helpers\DateTimeHelper;
 use craft\helpers\Db;
 use craft\helpers\Gql as GqlHelper;
-use craft\helpers\Json;
 use craft\helpers\ProjectConfig as ProjectConfigHelper;
 use craft\helpers\StringHelper;
 use craft\models\FieldLayout;
@@ -992,7 +991,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']) ? [] : $data['scope'];
+            $schemaRecord->scope = ($data['scope'] ?? false) ?: [];
 
             // Save the schema record
             $schemaRecord->save(false);

diff --git a/src/services/Users.php b/src/services/Users.php
@@ -369,11 +369,17 @@ public function getUserPreferences(int $userId): array
                 ->select(['preferences'])
                 ->from([Table::USERPREFERENCES])
                 ->where(['userId' => $userId])
-                ->scalar() ?: [];
+                ->scalar();
 
-            $this->_userPreferences[$userId] = is_string($preferences)
-                ? Json::decode($preferences)
-                : $preferences;
+            if ($preferences) {
+                if (is_string($preferences)) {
+                    $preferences = Json::decode($preferences);
+                }
+            } else {
+                $preferences = [];
+            }
+
+            $this->_userPreferences[$userId] = $preferences;
         }
 
         return $this->_userPreferences[$userId];
@@ -389,10 +395,11 @@ public function saveUserPreferences(User $user, array $preferences): void
     {
         // Merge in any other saved preferences
         $preferences += $this->getUserPreferences($user->id);
+        $tableSchema = Craft::$app->getDb()->getSchema()->getTableSchema(Table::USERPREFERENCES);
 
         Db::upsert(Table::USERPREFERENCES, [
             'userId' => $user->id,
-            'preferences' => $preferences,
+            'preferences' => Db::prepareValueForDb($preferences, $tableSchema->columns['preferences']->dbType),
         ]);
 
         $this->_userPreferences[$user->id] = $preferences;