Changeset 58339 for trunk/src/wp-includes/class-wp-theme-json-schema.php

Timestamp:

06/05/2024 08:11:03 AM (18 months ago)

Author:

oandregal

Message:

Editor: improve code quality of theme.json classes.

Follow-up to [58328], #61282.

Props ajlende, ramonopoly.
Fixes #61370.

File:

• trunk/src/wp-includes/class-wp-theme-json-schema.php (modified) (4 diffs)

trunk/src/wp-includes/class-wp-theme-json-schema.php

@@ -53 +53 @@
             case 1:
                 $theme_json = self::migrate_v1_to_v2( $theme_json );
-                // no break
+                // Deliberate fall through. Once migrated to v2, also migrate to v3.
             case 2:
                 $theme_json = self::migrate_v2_to_v3( $theme_json );
-                // no break
         }
 
@@ -95 +94 @@
      * Migrates from v2 to v3.
      *
-     * - Sets settings.typography.defaultFontSizes to false.
+     * - Sets settings.typography.defaultFontSizes to false if settings.typography.fontSizes are defined.
+     * - Sets settings.spacing.defaultSpacingSizes to false if settings.spacing.spacingSizes are defined.
+     * - Prevents settings.spacing.spacingSizes from merging with settings.spacing.spacingScale by
+     *   unsetting spacingScale when spacingSizes are defined.
      *
      * @since 6.6.0
@@ -130 +132 @@
          */
         if ( isset( $old['settings']['typography']['fontSizes'] ) ) {
-            if ( ! isset( $new['settings'] ) ) {
-                $new['settings'] = array();
-            }
-            if ( ! isset( $new['settings']['typography'] ) ) {
-                $new['settings']['typography'] = array();
-            }
             $new['settings']['typography']['defaultFontSizes'] = false;
         }
@@ -149 +145 @@
             isset( $old['settings']['spacing']['spacingScale'] )
         ) {
-            if ( ! isset( $new['settings'] ) ) {
-                $new['settings'] = array();
-            }
-            if ( ! isset( $new['settings']['spacing'] ) ) {
-                $new['settings']['spacing'] = array();
-            }
             $new['settings']['spacing']['defaultSpacingSizes'] = false;
         }