<!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>[52678] branches/5.9/tests/phpunit/tests/theme/globalStylesheet.php: Themes: Fix for Classic themes using default presets.</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/52678">52678</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/52678","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2022-02-04 14:46:27 +0000 (Fri, 04 Feb 2022)</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'>Themes: Fix for Classic themes using default presets.
This commit makes the presets provided by the theme via `add_theme_support()` always create CSS Custom Properties, whether or not the theme has a `theme.json` file. This way, if the theme overwrites a core preset, the core CSS variables are also overwritten and use the theme value.
Props oandregal, hellofromTonya, desrosj, costdev, pbearne, johnstonphilip, webmandesign, jorgefilipecosta, SergeyBiryukov.
Merges [52675-52677] to the 5.9 branch.
Fixes <a href="https://core.trac.wordpress.org/ticket/54782">#54782</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches59srcwpincludesglobalstylesandsettingsphp">branches/5.9/src/wp-includes/global-styles-and-settings.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branches59testsphpunitteststhemeglobalStylesheetphp">branches/5.9/tests/phpunit/tests/theme/globalStylesheet.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches59">branches/5.9/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/5.9
</span><span class="cx" style="display: block; padding: 0 10px">===================================================================
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- branches/5.9 2022-02-04 14:33:33 UTC (rev 52677)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/5.9 2022-02-04 14:46:27 UTC (rev 52678)
</ins><a id="branches59"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/5.9</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: svn:mergeinfo</h4></div>
<span class="cx" style="display: block; padding: 0 10px"> /branches/5.0:43681-43682,43684-43688,43719-43720,43723,43726-43727,43729-43731,43734-43744,43747,43751-43754,43758,43760-43765,43767-43770,43772,43774-43781,43783,43785,43790-43806,43808-43821,43825,43828,43830-43834,43836-43843,43846-43863,43867-43889,43891-43894,43897-43905,43908-43909,43911-43929,43931-43942,43946-43947,43949-43956,43959-43964,43967-43969,43988,43994,44014,44017,44047,44183,44185,44187-44206,44208-44213,44231-44232,44235,44248,44284,44287-44288
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/5.5:49373-49379,49381
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/5.8:51889
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/trunk:52454-52457,52547,52555,52558,52562-52563,52612-52613,52618,52626,52628,52633,52637,52648,52656,52658,52662,52664
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/trunk:52454-52457,52547,52555,52558,52562-52563,52612-52613,52618,52626,52628,52633,52637,52648,52656,52658,52662,52664,52675-52677
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches59srcwpincludesglobalstylesandsettingsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.9/src/wp-includes/global-styles-and-settings.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.9/src/wp-includes/global-styles-and-settings.php 2022-02-04 14:33:33 UTC (rev 52677)
+++ branches/5.9/src/wp-includes/global-styles-and-settings.php 2022-02-04 14:46:27 UTC (rev 52678)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -103,8 +103,9 @@
</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">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tree = WP_Theme_JSON_Resolver::get_merged_data();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $supports_theme_json = WP_Theme_JSON_Resolver::theme_has_support();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $supports_link_color = get_theme_support( 'experimental-link-color' );
</del><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $types ) && ! $supports_theme_json ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $types = array( 'variables', 'presets' );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( empty( $types ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -111,19 +112,36 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $types = array( 'variables', 'styles', 'presets' );
</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">- $origins = array( 'default', 'theme', 'custom' );
- if ( ! $supports_theme_json && ! $supports_link_color ) {
- // In this case we only enqueue the core presets (CSS Custom Properties + the classes).
- $origins = array( 'default' );
- } elseif ( ! $supports_theme_json && $supports_link_color ) {
- // For the legacy link color feature to work, the CSS Custom Properties
- // should be in scope (either the core or the theme ones).
- $origins = array( 'default', 'theme' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * If variables are part of the stylesheet,
+ * we add them for all origins (default, theme, user).
+ * This is so themes without a theme.json still work as before 5.9:
+ * they can override the default presets.
+ * See https://core.trac.wordpress.org/ticket/54782
+ */
+ $styles_variables = '';
+ if ( in_array( 'variables', $types, true ) ) {
+ $styles_variables = $tree->get_stylesheet( array( 'variables' ) );
+ $types = array_diff( $types, array( 'variables' ) );
</ins><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">- $tree = WP_Theme_JSON_Resolver::get_merged_data();
- $stylesheet = $tree->get_stylesheet( $types, $origins );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * For the remaining types (presets, styles), we do consider origins:
+ *
+ * - themes without theme.json: only the classes for the presets defined by core
+ * - themes with theme.json: the presets and styles classes, both from core and the theme
+ */
+ $styles_rest = '';
+ if ( ! empty( $types ) ) {
+ $origins = array( 'default', 'theme', 'custom' );
+ if ( ! $supports_theme_json ) {
+ $origins = array( 'default' );
+ }
+ $styles_rest = $tree->get_stylesheet( $types, $origins );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $stylesheet = $styles_variables . $styles_rest;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $can_use_cached ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Cache for a minute.
</span><span class="cx" style="display: block; padding: 0 10px"> // This cache doesn't need to be any longer, we only want to avoid spikes on high-traffic sites.
</span></span></pre></div>
<a id="branches59testsphpunitteststhemeglobalStylesheetphpfromrev52677trunktestsphpunitteststhemeglobalStylesheetphp"></a>
<div class="copfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Copied: branches/5.9/tests/phpunit/tests/theme/globalStylesheet.php (from rev 52677, trunk/tests/phpunit/tests/theme/globalStylesheet.php)</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.9/tests/phpunit/tests/theme/globalStylesheet.php (rev 0)
+++ branches/5.9/tests/phpunit/tests/theme/globalStylesheet.php 2022-02-04 14:46:27 UTC (rev 52678)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,186 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * @group themes
+ */
+class Tests_Theme_GlobalStylesheet extends WP_UnitTestCase {
+
+ public function set_up() {
+ parent::set_up();
+
+ $this->orig_theme_dir = $GLOBALS['wp_theme_directories'];
+ $this->theme_root = realpath( DIR_TESTDATA . '/themedir1' );
+
+ // /themes is necessary as theme.php functions assume /themes is the root if there is only one root.
+ $GLOBALS['wp_theme_directories'] = array( WP_CONTENT_DIR . '/themes', $this->theme_root );
+
+ // Set up the new root.
+ add_filter( 'theme_root', array( $this, 'filter_set_theme_root' ) );
+ add_filter( 'stylesheet_root', array( $this, 'filter_set_theme_root' ) );
+ add_filter( 'template_root', array( $this, 'filter_set_theme_root' ) );
+
+ // Clear caches.
+ wp_clean_themes_cache();
+ unset( $GLOBALS['wp_themes'] );
+ }
+
+ public function tear_down() {
+ $GLOBALS['wp_theme_directories'] = $this->orig_theme_dir;
+
+ // Clear up the filters to modify the theme root.
+ remove_filter( 'theme_root', array( $this, 'filter_set_theme_root' ) );
+ remove_filter( 'stylesheet_root', array( $this, 'filter_set_theme_root' ) );
+ remove_filter( 'template_root', array( $this, 'filter_set_theme_root' ) );
+
+ wp_clean_themes_cache();
+ unset( $GLOBALS['wp_themes'] );
+
+ parent::tear_down();
+ }
+
+ public function filter_set_theme_root() {
+ return $this->theme_root;
+ }
+
+ public function test_block_theme_using_variables() {
+ switch_theme( 'block-theme' );
+
+ $styles = wp_get_global_stylesheet( array( 'variables' ) );
+ $this->assertStringContainsString( '--wp--preset--font-size--small: 13px', $styles, 'small font size is 13px' );
+ $this->assertStringContainsString( '--wp--preset--font-size--medium: 20px', $styles, 'medium font size is 20px' );
+ $this->assertStringContainsString( '--wp--preset--font-size--large: 36px', $styles, 'large font size is 36px' );
+ $this->assertStringContainsString( '--wp--preset--font-size--x-large: 42px', $styles, 'x-large font size is 42px' );
+ $this->assertStringContainsString( '--wp--preset--font-size--custom: 100px;', $styles, 'custom font size is 100px' );
+
+ switch_theme( WP_DEFAULT_THEME );
+ }
+
+ public function test_block_theme_using_presets() {
+ switch_theme( 'block-theme' );
+
+ $styles = wp_get_global_stylesheet( array( 'presets' ) );
+ $this->assertStringNotContainsString( '--wp--preset--font-size--small: 13px', $styles, 'small font size is not present' );
+ $this->assertStringNotContainsString( '--wp--preset--font-size--medium: 20px', $styles, 'medium font size is not present' );
+ $this->assertStringNotContainsString( '--wp--preset--font-size--large: 36px', $styles, 'large font size is not present' );
+ $this->assertStringNotContainsString( '--wp--preset--font-size--x-large: 42px', $styles, 'x-large font size is not present' );
+ $this->assertStringNotContainsString( '--wp--preset--font-size--custom: 100px;', $styles, 'custom font size is not present' );
+
+ switch_theme( WP_DEFAULT_THEME );
+ }
+
+ public function test_block_theme_using_defaults() {
+ switch_theme( 'block-theme' );
+
+ $styles = wp_get_global_stylesheet();
+ $this->assertStringContainsString( '--wp--preset--font-size--small: 13px', $styles, 'small font size is 13px' );
+ $this->assertStringContainsString( '--wp--preset--font-size--medium: 20px', $styles, 'medium font size is 20px' );
+ $this->assertStringContainsString( '--wp--preset--font-size--large: 36px', $styles, 'large font size is 36px' );
+ $this->assertStringContainsString( '--wp--preset--font-size--x-large: 42px', $styles, 'x-large font size is 42px' );
+ $this->assertStringContainsString( '--wp--preset--font-size--custom: 100px;', $styles, 'custom font size is 100px' );
+
+ switch_theme( WP_DEFAULT_THEME );
+ }
+
+ public function test_variables_in_classic_theme_with_no_presets_using_variables() {
+ $styles = wp_get_global_stylesheet( array( 'variables' ) );
+ $this->assertStringContainsString( '--wp--preset--font-size--small: 13px', $styles, 'small font size is 13px' );
+ $this->assertStringContainsString( '--wp--preset--font-size--medium: 20px', $styles, 'medium font size is 20px' );
+ $this->assertStringContainsString( '--wp--preset--font-size--large: 36px', $styles, 'large font size is 36px' );
+ $this->assertStringContainsString( '--wp--preset--font-size--x-large: 42px', $styles, 'x-large font size is 42px' );
+ }
+
+ public function test_variables_in_classic_theme_with_no_presets_using_presets() {
+ $styles = wp_get_global_stylesheet( array( 'presets' ) );
+ $this->assertStringNotContainsString( '--wp--preset--font-size--small: 13px', $styles, 'small font size is not present' );
+ $this->assertStringNotContainsString( '--wp--preset--font-size--medium: 20px', $styles, 'medium font size is not present' );
+ $this->assertStringNotContainsString( '--wp--preset--font-size--large: 36px', $styles, 'large font size is not present' );
+ $this->assertStringNotContainsString( '--wp--preset--font-size--x-large: 42px', $styles, 'x-large font size is not present' );
+ }
+
+ public function test_variables_in_classic_theme_with_no_presets_using_defaults() {
+ $styles = wp_get_global_stylesheet();
+ $this->assertStringContainsString( '--wp--preset--font-size--small: 13px', $styles, 'small font size is 13px' );
+ $this->assertStringContainsString( '--wp--preset--font-size--medium: 20px', $styles, 'medium font size is 20px' );
+ $this->assertStringContainsString( '--wp--preset--font-size--large: 36px', $styles, 'large font size is 36px' );
+ $this->assertStringContainsString( '--wp--preset--font-size--x-large: 42px', $styles, 'x-large font size is 42px' );
+ }
+
+ public function test_variables_in_classic_theme_with_presets_using_variables() {
+ add_theme_support(
+ 'editor-font-sizes',
+ array(
+ array(
+ 'name' => 'Small',
+ 'size' => 18,
+ 'slug' => 'small',
+ ),
+ array(
+ 'name' => 'Large',
+ 'size' => 26.25,
+ 'slug' => 'large',
+ ),
+ )
+ );
+
+ $styles = wp_get_global_stylesheet( array( 'variables' ) );
+ $this->assertStringContainsString( '--wp--preset--font-size--small: 18px', $styles, 'small font size is 18px' );
+ $this->assertStringContainsString( '--wp--preset--font-size--medium: 20px', $styles, 'medium font size is 20px' );
+ $this->assertStringContainsString( '--wp--preset--font-size--large: 26.25px', $styles, 'large font size is 26.25px' );
+ $this->assertStringContainsString( '--wp--preset--font-size--x-large: 42px', $styles, 'x-large font size is 42px' );
+
+ remove_theme_support( 'editor-font-sizes' );
+ }
+
+ public function test_variables_in_classic_theme_with_presets_using_presets() {
+ add_theme_support(
+ 'editor-font-sizes',
+ array(
+ array(
+ 'name' => 'Small',
+ 'size' => 18,
+ 'slug' => 'small',
+ ),
+ array(
+ 'name' => 'Large',
+ 'size' => 26.25,
+ 'slug' => 'large',
+ ),
+ )
+ );
+
+ $styles = wp_get_global_stylesheet( array( 'presets' ) );
+ $this->assertStringNotContainsString( '--wp--preset--font-size--small: 18px', $styles, 'small font size is not present' );
+ $this->assertStringNotContainsString( '--wp--preset--font-size--medium: 20px', $styles, 'medium font size is not present' );
+ $this->assertStringNotContainsString( '--wp--preset--font-size--large: 26.25px', $styles, 'large font size is not present' );
+ $this->assertStringNotContainsString( '--wp--preset--font-size--x-large: 42px', $styles, 'x-large font size is not present' );
+
+ remove_theme_support( 'editor-font-sizes' );
+ }
+
+ public function test_variables_in_classic_theme_with_presets_using_defaults() {
+ add_theme_support(
+ 'editor-font-sizes',
+ array(
+ array(
+ 'name' => 'Small',
+ 'size' => 18,
+ 'slug' => 'small',
+ ),
+ array(
+ 'name' => 'Large',
+ 'size' => 26.25,
+ 'slug' => 'large',
+ ),
+ )
+ );
+
+ $styles = wp_get_global_stylesheet();
+ $this->assertStringContainsString( '--wp--preset--font-size--small: 18px', $styles, 'small font size is 18px' );
+ $this->assertStringContainsString( '--wp--preset--font-size--medium: 20px', $styles, 'medium font size is 20px' );
+ $this->assertStringContainsString( '--wp--preset--font-size--large: 26.25px', $styles, 'large font size is 26.25px' );
+ $this->assertStringContainsString( '--wp--preset--font-size--x-large: 42px', $styles, 'small font size is 42px' );
+
+ remove_theme_support( 'editor-font-sizes' );
+ }
+
+}
</ins></span></pre>
</div>
</div>
</body>
</html>