<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[58339] trunk/src/wp-includes: Editor: improve code quality of theme.json classes.</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/58339">58339</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/58339","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>oandregal</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2024-06-05 08:11:03 +0000 (Wed, 05 Jun 2024)</dd>
</dl>

<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Editor: improve code quality of theme.json classes.

Follow-up to <a href="https://core.trac.wordpress.org/changeset/58328">[58328]</a>, <a href="https://core.trac.wordpress.org/ticket/61282">#61282</a>.

Props ajlende, ramonopoly.
Fixes <a href="https://core.trac.wordpress.org/ticket/61370">#61370</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesclasswpthemejsonresolverphp">trunk/src/wp-includes/class-wp-theme-json-resolver.php</a></li>
<li><a href="#trunksrcwpincludesclasswpthemejsonschemaphp">trunk/src/wp-includes/class-wp-theme-json-schema.php</a></li>
<li><a href="#trunksrcwpincludesclasswpthemejsonphp">trunk/src/wp-includes/class-wp-theme-json.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesclasswpthemejsonresolverphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-theme-json-resolver.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-theme-json-resolver.php    2024-06-04 19:32:36 UTC (rev 58338)
+++ trunk/src/wp-includes/class-wp-theme-json-resolver.php      2024-06-05 08:11:03 UTC (rev 58339)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -287,59 +287,25 @@
</span><span class="cx" style="display: block; padding: 0 10px">                 */
</span><span class="cx" style="display: block; padding: 0 10px">                $theme_support_data = WP_Theme_JSON::get_from_editor_settings( get_classic_theme_supports_block_editor_settings() );
</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! wp_theme_has_theme_json() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        if ( ! isset( $theme_support_data['settings']['color'] ) ) {
-                               $theme_support_data['settings']['color'] = array();
-                       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 /*
+                        * Unlike block themes, classic themes without a theme.json disable
+                        * default presets when custom preset theme support is added. This
+                        * behavior can be overridden by using the corresponding default
+                        * preset theme support.
+                        */
+                       $theme_support_data['settings']['color']['defaultPalette']        =
+                               ! isset( $theme_support_data['settings']['color']['palette'] ) ||
+                               current_theme_supports( 'default-color-palette' );
+                       $theme_support_data['settings']['color']['defaultGradients']      =
+                               ! isset( $theme_support_data['settings']['color']['gradients'] ) ||
+                               current_theme_supports( 'default-gradient-presets' );
+                       $theme_support_data['settings']['typography']['defaultFontSizes'] =
+                               ! isset( $theme_support_data['settings']['typography']['fontSizes'] ) ||
+                               current_theme_supports( 'default-font-sizes' );
+                       $theme_support_data['settings']['spacing']['defaultSpacingSizes'] =
+                               ! isset( $theme_support_data['settings']['spacing']['spacingSizes'] ) ||
+                               current_theme_supports( 'default-spacing-sizes' );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $default_palette = false;
-                       if ( current_theme_supports( 'default-color-palette' ) ) {
-                               $default_palette = true;
-                       }
-                       if ( ! isset( $theme_support_data['settings']['color']['palette'] ) ) {
-                               // If the theme does not have any palette, we still want to show the core one.
-                               $default_palette = true;
-                       }
-                       $theme_support_data['settings']['color']['defaultPalette'] = $default_palette;
-
-                       $default_gradients = false;
-                       if ( current_theme_supports( 'default-gradient-presets' ) ) {
-                               $default_gradients = true;
-                       }
-                       if ( ! isset( $theme_support_data['settings']['color']['gradients'] ) ) {
-                               // If the theme does not have any gradients, we still want to show the core ones.
-                               $default_gradients = true;
-                       }
-                       $theme_support_data['settings']['color']['defaultGradients'] = $default_gradients;
-
-                       if ( ! isset( $theme_support_data['settings']['typography'] ) ) {
-                               $theme_support_data['settings']['typography'] = array();
-                       }
-                       $default_font_sizes = false;
-                       if ( current_theme_supports( 'default-font-sizes' ) ) {
-                               $default_font_sizes = true;
-                       }
-                       if ( ! isset( $theme_support_data['settings']['typography']['fontSizes'] ) ) {
-                               // If the theme does not have any font sizes, we still want to show the core one.
-                               $default_font_sizes = true;
-                       }
-                       $theme_support_data['settings']['typography']['defaultFontSizes'] = $default_font_sizes;
-
-                       if ( ! isset( $theme_support_data['settings']['spacing'] ) ) {
-                               $theme_support_data['settings']['spacing'] = array();
-                       }
-                       $default_spacing_sizes = false;
-                       if ( current_theme_supports( 'default-spacing-sizes' ) ) {
-                               $default_spacing_sizes = true;
-                       }
-                       if ( ! isset( $theme_support_data['settings']['spacing']['spacingSizes'] ) ) {
-                               // If the theme does not have any spacing sizes, we still want to show the core one.
-                               $default_spacing_sizes = true;
-                       }
-                       $theme_support_data['settings']['spacing']['defaultSpacingSizes'] = $default_spacing_sizes;
-
-                       if ( ! isset( $theme_support_data['settings']['shadow'] ) ) {
-                               $theme_support_data['settings']['shadow'] = array();
-                       }
</del><span class="cx" style="display: block; padding: 0 10px">                         /*
</span><span class="cx" style="display: block; padding: 0 10px">                         * Shadow presets are explicitly disabled for classic themes until a
</span><span class="cx" style="display: block; padding: 0 10px">                         * decision is made for whether the default presets should match the
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpthemejsonschemaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-theme-json-schema.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-theme-json-schema.php      2024-06-04 19:32:36 UTC (rev 58338)
+++ trunk/src/wp-includes/class-wp-theme-json-schema.php        2024-06-05 08:11:03 UTC (rev 58339)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -52,10 +52,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">                switch ( $theme_json['version'] ) {
</span><span class="cx" style="display: block; padding: 0 10px">                        case 1:
</span><span class="cx" style="display: block; padding: 0 10px">                                $theme_json = self::migrate_v1_to_v2( $theme_json );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // no break
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Deliberate fall through. Once migrated to v2, also migrate to v3.
</ins><span class="cx" style="display: block; padding: 0 10px">                         case 2:
</span><span class="cx" style="display: block; padding: 0 10px">                                $theme_json = self::migrate_v2_to_v3( $theme_json );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // no break
</del><span class="cx" style="display: block; padding: 0 10px">                 }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                return $theme_json;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -94,7 +93,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">        /**
</span><span class="cx" style="display: block; padding: 0 10px">         * Migrates from v2 to v3.
</span><span class="cx" style="display: block; padding: 0 10px">         *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * - Sets settings.typography.defaultFontSizes to false.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * - 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.
</ins><span class="cx" style="display: block; padding: 0 10px">          *
</span><span class="cx" style="display: block; padding: 0 10px">         * @since 6.6.0
</span><span class="cx" style="display: block; padding: 0 10px">         *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -129,12 +131,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">                 * affect the generated CSS.
</span><span class="cx" style="display: block; padding: 0 10px">                 */
</span><span class="cx" style="display: block; padding: 0 10px">                if ( isset( $old['settings']['typography']['fontSizes'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        if ( ! isset( $new['settings'] ) ) {
-                               $new['settings'] = array();
-                       }
-                       if ( ! isset( $new['settings']['typography'] ) ) {
-                               $new['settings']['typography'] = array();
-                       }
</del><span class="cx" style="display: block; padding: 0 10px">                         $new['settings']['typography']['defaultFontSizes'] = false;
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -148,12 +144,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        isset( $old['settings']['spacing']['spacingSizes'] ) ||
</span><span class="cx" style="display: block; padding: 0 10px">                        isset( $old['settings']['spacing']['spacingScale'] )
</span><span class="cx" style="display: block; padding: 0 10px">                ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        if ( ! isset( $new['settings'] ) ) {
-                               $new['settings'] = array();
-                       }
-                       if ( ! isset( $new['settings']['spacing'] ) ) {
-                               $new['settings']['spacing'] = array();
-                       }
</del><span class="cx" style="display: block; padding: 0 10px">                         $new['settings']['spacing']['defaultSpacingSizes'] = false;
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpthemejsonphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-theme-json.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-theme-json.php     2024-06-04 19:32:36 UTC (rev 58338)
+++ trunk/src/wp-includes/class-wp-theme-json.php       2024-06-05 08:11:03 UTC (rev 58339)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3524,37 +3524,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                // Deprecated theme supports.
</span><span class="cx" style="display: block; padding: 0 10px">                if ( isset( $settings['disableCustomColors'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        if ( ! isset( $theme_settings['settings']['color'] ) ) {
-                               $theme_settings['settings']['color'] = array();
-                       }
</del><span class="cx" style="display: block; padding: 0 10px">                         $theme_settings['settings']['color']['custom'] = ! $settings['disableCustomColors'];
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                if ( isset( $settings['disableCustomGradients'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        if ( ! isset( $theme_settings['settings']['color'] ) ) {
-                               $theme_settings['settings']['color'] = array();
-                       }
</del><span class="cx" style="display: block; padding: 0 10px">                         $theme_settings['settings']['color']['customGradient'] = ! $settings['disableCustomGradients'];
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                if ( isset( $settings['disableCustomFontSizes'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        if ( ! isset( $theme_settings['settings']['typography'] ) ) {
-                               $theme_settings['settings']['typography'] = array();
-                       }
</del><span class="cx" style="display: block; padding: 0 10px">                         $theme_settings['settings']['typography']['customFontSize'] = ! $settings['disableCustomFontSizes'];
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                if ( isset( $settings['enableCustomLineHeight'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        if ( ! isset( $theme_settings['settings']['typography'] ) ) {
-                               $theme_settings['settings']['typography'] = array();
-                       }
</del><span class="cx" style="display: block; padding: 0 10px">                         $theme_settings['settings']['typography']['lineHeight'] = $settings['enableCustomLineHeight'];
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                if ( isset( $settings['enableCustomUnits'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        if ( ! isset( $theme_settings['settings']['spacing'] ) ) {
-                               $theme_settings['settings']['spacing'] = array();
-                       }
</del><span class="cx" style="display: block; padding: 0 10px">                         $theme_settings['settings']['spacing']['units'] = ( true === $settings['enableCustomUnits'] ) ?
</span><span class="cx" style="display: block; padding: 0 10px">                                array( 'px', 'em', 'rem', 'vh', 'vw', '%' ) :
</span><span class="cx" style="display: block; padding: 0 10px">                                $settings['enableCustomUnits'];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3561,16 +3546,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                if ( isset( $settings['colors'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        if ( ! isset( $theme_settings['settings']['color'] ) ) {
-                               $theme_settings['settings']['color'] = array();
-                       }
</del><span class="cx" style="display: block; padding: 0 10px">                         $theme_settings['settings']['color']['palette'] = $settings['colors'];
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                if ( isset( $settings['gradients'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        if ( ! isset( $theme_settings['settings']['color'] ) ) {
-                               $theme_settings['settings']['color'] = array();
-                       }
</del><span class="cx" style="display: block; padding: 0 10px">                         $theme_settings['settings']['color']['gradients'] = $settings['gradients'];
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3582,23 +3561,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                        $font_sizes[ $key ]['size'] = $font_size['size'] . 'px';
</span><span class="cx" style="display: block; padding: 0 10px">                                }
</span><span class="cx" style="display: block; padding: 0 10px">                        }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        if ( ! isset( $theme_settings['settings']['typography'] ) ) {
-                               $theme_settings['settings']['typography'] = array();
-                       }
</del><span class="cx" style="display: block; padding: 0 10px">                         $theme_settings['settings']['typography']['fontSizes'] = $font_sizes;
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                if ( isset( $settings['enableCustomSpacing'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        if ( ! isset( $theme_settings['settings']['spacing'] ) ) {
-                               $theme_settings['settings']['spacing'] = array();
-                       }
</del><span class="cx" style="display: block; padding: 0 10px">                         $theme_settings['settings']['spacing']['padding'] = $settings['enableCustomSpacing'];
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                if ( isset( $settings['spacingSizes'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        if ( ! isset( $theme_settings['settings']['spacing'] ) ) {
-                               $theme_settings['settings']['spacing'] = array();
-                       }
</del><span class="cx" style="display: block; padding: 0 10px">                         $theme_settings['settings']['spacing']['spacingSizes'] = $settings['spacingSizes'];
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3775,11 +3745,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">         * Sets the spacingSizes array based on the spacingScale values from theme.json.
</span><span class="cx" style="display: block; padding: 0 10px">         *
</span><span class="cx" style="display: block; padding: 0 10px">         * @since 6.1.0
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @deprecated 6.6.0
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @deprecated 6.6.0 No longer used as the spacingSizes are automatically
+        *                   generated in the constructor and merge methods instead
+        *                   of manually after instantiation.
</ins><span class="cx" style="display: block; padding: 0 10px">          *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @param string $origin Optional. What source of data to set the spacing sizes for.
-        *                       One of 'default', 'theme', or 'custom'. Default 'default'.
-        *
</del><span class="cx" style="display: block; padding: 0 10px">          * @return null|void
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        public function set_spacing_sizes() {
</span></span></pre>
</div>
</div>

</body>
</html>