clean settings after migrations are run

pryley · Nov 1, 2024 · 6646cfe · 6646cfe
1 parent ae2877d
commit 6646cfe
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 3 deletions.
diff --git a/plugin/Controllers/MainController.php b/plugin/Controllers/MainController.php
@@ -70,6 +70,16 @@ public function onInit(): void
         glsr(OptionManager::class)->updateVersion();
     }
 
+    /**
+     * @action site-reviews/migration/end
+     */
+    public function onMigrationEnd(): void
+    {
+        $settings = glsr(OptionManager::class)->wp(OptionManager::databaseKey(), []);
+        $settings = glsr(OptionManager::class)->clean($settings);
+        update_option(OptionManager::databaseKey(), $settings, true);
+    }
+
     /**
      * @action plugins_loaded
      */

diff --git a/plugin/Database/OptionManager.php b/plugin/Database/OptionManager.php
@@ -43,6 +43,21 @@ public function all(): array
         return $settings;
     }
 
+    public function clean(array $data = []): array
+    {
+        $settings = $this->kses($data);
+        if (!empty(glsr()->settings)) { // access the property directly to prevent an infinite loop
+            $settings = $savedSettings;
+            $defaults = glsr()->defaults(); // @phpstan-ignore-line
+            $defaults = Arr::flatten($defaults);
+            $settings = Arr::flatten($settings);
+            $settings = shortcode_atts($defaults, $settings);
+            $settings = Arr::unflatten($settings);
+            $settings = $this->restoreOrphanedSettings($settings, $savedSettings);
+        }
+        return $settings;
+    }
+
     public static function databaseKey(?int $version = null): string
     {
         $versions = static::databaseKeys();
@@ -135,13 +150,11 @@ public function normalize(array $data = []): array
     {
         $settings = $this->kses($data);
         if (!empty(glsr()->settings)) { // access the property directly to prevent an infinite loop
-            $savedSettings = $settings;
             $defaults = glsr()->defaults(); // @phpstan-ignore-line
             $defaults = Arr::flatten($defaults);
             $settings = Arr::flatten($settings);
-            $settings = shortcode_atts($defaults, $settings);
+            $settings = wp_parse_args($settings, $defaults);
             $settings = Arr::unflatten($settings);
-            $settings = $this->restoreOrphanedSettings($settings, $savedSettings);
         }
         return $settings;
     }

diff --git a/plugin/Hooks/MainHooks.php b/plugin/Hooks/MainHooks.php
@@ -14,6 +14,7 @@ public function run(): void
             ['logOnce', 'admin_footer'],
             ['logOnce', 'wp_footer'],
             ['onInit', 'init', 5], // run after possible init:1 migration
+            ['onMigrationEnd', 'site-reviews/migration/end'],
             ['registerAddons', 'plugins_loaded'],
             ['registerLanguages', 'after_setup_theme'],
             ['registerPostMeta', 'init'],