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

Timestamp:

06/05/2024 08:11:03 AM (11 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.php (modified) (4 diffs)

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

@@ -3525 +3525 @@
         // Deprecated theme supports.
         if ( isset( $settings['disableCustomColors'] ) ) {
-            if ( ! isset( $theme_settings['settings']['color'] ) ) {
-                $theme_settings['settings']['color'] = array();
-            }
             $theme_settings['settings']['color']['custom'] = ! $settings['disableCustomColors'];
         }
 
         if ( isset( $settings['disableCustomGradients'] ) ) {
-            if ( ! isset( $theme_settings['settings']['color'] ) ) {
-                $theme_settings['settings']['color'] = array();
-            }
             $theme_settings['settings']['color']['customGradient'] = ! $settings['disableCustomGradients'];
         }
 
         if ( isset( $settings['disableCustomFontSizes'] ) ) {
-            if ( ! isset( $theme_settings['settings']['typography'] ) ) {
-                $theme_settings['settings']['typography'] = array();
-            }
             $theme_settings['settings']['typography']['customFontSize'] = ! $settings['disableCustomFontSizes'];
         }
 
         if ( isset( $settings['enableCustomLineHeight'] ) ) {
-            if ( ! isset( $theme_settings['settings']['typography'] ) ) {
-                $theme_settings['settings']['typography'] = array();
-            }
             $theme_settings['settings']['typography']['lineHeight'] = $settings['enableCustomLineHeight'];
         }
 
         if ( isset( $settings['enableCustomUnits'] ) ) {
-            if ( ! isset( $theme_settings['settings']['spacing'] ) ) {
-                $theme_settings['settings']['spacing'] = array();
-            }
             $theme_settings['settings']['spacing']['units'] = ( true === $settings['enableCustomUnits'] ) ?
                 array( 'px', 'em', 'rem', 'vh', 'vw', '%' ) :
@@ -3562 +3547 @@
 
         if ( isset( $settings['colors'] ) ) {
-            if ( ! isset( $theme_settings['settings']['color'] ) ) {
-                $theme_settings['settings']['color'] = array();
-            }
             $theme_settings['settings']['color']['palette'] = $settings['colors'];
         }
 
         if ( isset( $settings['gradients'] ) ) {
-            if ( ! isset( $theme_settings['settings']['color'] ) ) {
-                $theme_settings['settings']['color'] = array();
-            }
             $theme_settings['settings']['color']['gradients'] = $settings['gradients'];
         }
@@ -3583 +3562 @@
                 }
             }
-            if ( ! isset( $theme_settings['settings']['typography'] ) ) {
-                $theme_settings['settings']['typography'] = array();
-            }
             $theme_settings['settings']['typography']['fontSizes'] = $font_sizes;
         }
 
         if ( isset( $settings['enableCustomSpacing'] ) ) {
-            if ( ! isset( $theme_settings['settings']['spacing'] ) ) {
-                $theme_settings['settings']['spacing'] = array();
-            }
             $theme_settings['settings']['spacing']['padding'] = $settings['enableCustomSpacing'];
         }
 
         if ( isset( $settings['spacingSizes'] ) ) {
-            if ( ! isset( $theme_settings['settings']['spacing'] ) ) {
-                $theme_settings['settings']['spacing'] = array();
-            }
             $theme_settings['settings']['spacing']['spacingSizes'] = $settings['spacingSizes'];
         }
@@ -3776 +3746 @@
      *
      * @since 6.1.0
-     * @deprecated 6.6.0
-     *
-     * @param string $origin Optional. What source of data to set the spacing sizes for.
-     *                       One of 'default', 'theme', or 'custom'. Default 'default'.
+     * @deprecated 6.6.0 No longer used as the spacingSizes are automatically
+     *                   generated in the constructor and merge methods instead
+     *                   of manually after instantiation.
      *
      * @return null|void