Changeset 3435421

Timestamp:

01/08/2026 06:32:27 PM (4 months ago)

Author:

xavivars

Message:

Decouple settings and quote migration

Location:

xv-random-quotes/trunk

Files:

• changelog.txt (modified) (1 diff)
• readme.txt (modified) (1 diff)
• src/Admin/MetaBoxes.php (modified) (4 diffs)
• src/Migration/SettingsMigrator.php (modified) (4 diffs)
• vendor/composer/installed.php (modified) (2 diffs)
• xv-random-quotes.php (modified) (2 diffs)

xv-random-quotes/trunk/changelog.txt

@@ -1 +1 @@
 == XV Random Quotes ==
+
+= 2.6.0 =
+Improvement: Default category migration from legacy settings
+Improvement: Decouple settings migration steps
 
 = 2.5.0 =

xv-random-quotes/trunk/readme.txt

@@ -6 +6 @@
 Tested up to: 6.9
 Requires PHP: 7.4
-Stable tag: 2.5.0
+Stable tag: 2.6.0
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html

xv-random-quotes/trunk/src/Admin/MetaBoxes.php

@@ -31 +31 @@
         add_action( 'add_meta_boxes', array( $this, 'register_meta_boxes' ) );
         add_action( 'save_post_xv_quote', array( $this, 'save_all_meta_boxes' ), 10, 2 );
+        add_action( 'save_post_xv_quote', array( $this, 'apply_default_category' ), 20, 1 );
     }
 
@@ -74 +75 @@
         return $this->get_editor_settings( array(
             'teeny'         => false,
-            'rows'          => 8,
+            'textarea_rows' => 10,
             'media_buttons' => true,
             'quicktags'     => true,
@@ -86 +87 @@
      *
      * @since 2.0.0
-     * @param array $options Number of textarea rows. Default 8.
+     * @param array $options Editor options to override defaults.
      * @return array Editor settings
      */
     private function get_editor_settings( $options = array() ) {
-        return array_merge(
-            array(
-                'media_buttons' => false,          // No "Add Media" button
-                'quicktags'     => false,          // No HTML/Text tab
-                'teeny'         => true,           // Minimal editor
-                'textarea_rows' => 1,              // Single line textarea
-                'tinymce'       => array(
-                    'toolbar1' => 'bold,italic,link,unlink',  // Only these buttons
-                    'toolbar2' => '',                         // No second toolbar
-                    'toolbar3' => '',                         // No third toolbar
-                ),
+        $defaults = array(
+            'media_buttons' => false,          // No "Add Media" button
+            'quicktags'     => false,          // No HTML/Text tab
+            'teeny'         => true,           // Minimal editor
+            'textarea_rows' => 1,              // Single line textarea
+            'tinymce'       => array(
+                'toolbar1' => 'bold,italic,link,unlink',  // Only these buttons
+                'toolbar2' => '',                         // No second toolbar
+                'toolbar3' => '',                         // No third toolbar
             ),
-            $options
-        );
+        );
+        
+        return array_merge( $defaults, $options );
     }
 
@@ -230 +230 @@
         }
     }
+
+    /**
+     * Apply default category to quotes without any category assigned
+     *
+     * Automatically assigns the default category term (from v1.x migration)
+     * to quotes that don't have any quote_category term assigned.
+     *
+     * @since 2.0.0
+     * @param int $post_id The post ID.
+     */
+    public function apply_default_category( $post_id ) {
+        // Only apply to xv_quote post type
+        if ( get_post_type( $post_id ) !== 'xv_quote' ) {
+            return;
+        }
+
+        // Check if post has any quote_category terms assigned
+        $terms = wp_get_post_terms( $post_id, 'quote_category', array( 'fields' => 'ids' ) );
+
+        // If no terms assigned, try to assign the default
+        if ( empty( $terms ) ) {
+            $default_term_id = (int) get_option( 'xv_quotes_default_category_id', 0 );
+
+            if ( $default_term_id > 0 ) {
+                // Verify the term exists
+                if ( get_term( $default_term_id, 'quote_category' ) ) {
+                    wp_set_post_terms( $post_id, array( $default_term_id ), 'quote_category', false );
+                }
+            }
+        }
+    }
 }
+

xv-random-quotes/trunk/src/Migration/SettingsMigrator.php

@@ -15 +15 @@
  * Handles migration of settings from legacy stray_quotes_options
  * to individual xv_quotes_* options.
+ *
+ * Uses version numbers for the _xv_quotes_migrated option:
+ * - 0 or false: Not migrated
+ * - 1: Settings migrated (v1 - initial migration)
+ * - 2: Default category setup (v2 - added later)
+ * - etc.
  */
 class SettingsMigrator {
 
     /**
+     * Current migration version
+     *
+     * @var int
+     */
+    const MIGRATION_VERSION = 2;
+
+    /**
      * Run the migration
      */
     public static function migrate() {
-        // Check if migration has already been run
-        if ( get_option( '_xv_quotes_migrated', false ) ) {
-            return;
-        }
-
+        // Get current migration version (0 if never migrated, or false for backward compat)
+        $current_version = (int) get_option( '_xv_quotes_migrated', 0 );
+
+        // Run v1 migration if not yet done
+        if ( $current_version < 1 ) {
+            self::migrate_v200();
+        }
+
+        // Run v2 migration if not yet done
+        if ( $current_version < 2 ) {
+            self::migrate_v260();
+        }
+
+        // Update version to current
+        update_option( '_xv_quotes_migrated', self::MIGRATION_VERSION );
+    }
+
+    /**
+     * V2.0.0 Migration: Settings migration from legacy format
+     */
+    private static function migrate_v200() {
         // Get old settings
         $old_settings = get_option( 'stray_quotes_options', array() );
@@ -40 +69 @@
             self::migrate_from_legacy_settings( $old_settings );
         }
-
-        // Mark migration as complete
-        update_option( '_xv_quotes_migrated', true );
+    }
+
+    /**
+     * V2.6.0 Migration: Default category setup
+     */
+    private static function migrate_v260() {
+        // Check if there's a default category to migrate
+        $old_settings = get_option( 'stray_quotes_options', array() );
+
+        if ( isset( $old_settings['stray_default_category'] ) && ! empty( $old_settings['stray_default_category'] ) ) {
+            self::create_default_category_term( $old_settings['stray_default_category'] );
+        }
     }
 
@@ -109 +147 @@
             'stray_after_loader'  => Settings::OPTION_AFTER_LOADER,
             'stray_loading'       => Settings::OPTION_LOADING,
+
+            // Default category (for applying to migrated quotes without a category)
+            'stray_default_category' => 'xv_quotes_default_category',
         );
 
@@ -146 +187 @@
         }
     }
+
+    /**
+     * Create the default category term in the quote_category taxonomy
+     *
+     * @param string $category_name The name of the default category.
+     */
+    private static function create_default_category_term( $category_name ) {
+        $taxonomy = 'quote_category';
+
+        // Check if term already exists
+        $term = term_exists( $category_name, $taxonomy );
+
+        if ( ! $term ) {
+            // Create the term
+            $term = wp_insert_term( $category_name, $taxonomy );
+
+            if ( is_wp_error( $term ) ) {
+                return;
+            }
+        }
+
+        // Get the term ID (term_exists returns int, wp_insert_term returns array)
+        $term_id = is_array( $term ) ? $term['term_id'] : $term;
+
+        // Store the term ID for use as default when creating new quotes
+        update_option( 'xv_quotes_default_category_id', (int) $term_id );
+    }
 }

xv-random-quotes/trunk/vendor/composer/installed.php

@@ -4 +4 @@
         'pretty_version' => 'dev-main',
         'version' => 'dev-main',
-        'reference' => 'fbcdfb5200202cd5c3c489ec669901a9e8531432',
+        'reference' => 'c5c63fb91808ddbfdfb9ab496437bfe15ad21871',
         'type' => 'wordpress-plugin',
         'install_path' => __DIR__ . '/../../',
@@ -14 +14 @@
             'pretty_version' => 'dev-main',
             'version' => 'dev-main',
-            'reference' => 'fbcdfb5200202cd5c3c489ec669901a9e8531432',
+            'reference' => 'c5c63fb91808ddbfdfb9ab496437bfe15ad21871',
             'type' => 'wordpress-plugin',
             'install_path' => __DIR__ . '/../../',

xv-random-quotes/trunk/xv-random-quotes.php

@@ -5 +5 @@
 Author: Xavi Ivars
 Author URI: https://xavi.ivars.me/
-Version: 2.5.0
+Version: 2.6.0
 Requires at least: 6.0
 Requires PHP: 7.4
@@ -90 +90 @@
  */
 function xv_quotes_check_migration() {
-    // If the 'migrated' option doesn't exist (returns false), run the migration
-    // Also check that migration hasn't already been triggered or isn't pending
-    if ( ! get_option( 'xv_quotes_migrated_v2' ) 
-         && ! get_option( 'xv_quotes_needs_migration' )
-         && ! get_option( 'xv_migration_pending' ) ) {
-        xv_quotes_activation_migration();
-    }
+    // Run settings migration (if not yet done)
+    // This handles both v1 settings migration and v2 default category setup
+    if ( class_exists( '\XVRandomQuotes\Migration\SettingsMigrator' ) ) {
+        $current_version = (int) get_option( '_xv_quotes_migrated', 0 );
+        if ( $current_version < \XVRandomQuotes\Migration\SettingsMigrator::MIGRATION_VERSION ) {
+            \XVRandomQuotes\Migration\SettingsMigrator::migrate();
+        }
+    }
+
+    // Check if quote migration is needed
+    // If the 'migrated' option doesn't exist (returns false), run the migration
+    // Also check that migration hasn't already been triggered or isn't pending
+    if ( ! get_option( 'xv_quotes_migrated_v2' ) 
+         && ! get_option( 'xv_quotes_needs_migration' )
+         && ! get_option( 'xv_migration_pending' ) ) {
+        xv_quotes_activation_migration();
+    }
 }
 add_action( 'admin_init', 'xv_quotes_check_migration' );