<!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>[51305] branches/5.8/tests/phpunit/tests/theme: Coding Standards: Add missing visibility keywords to `WP_Theme`, `WP_Theme_JSON`, and `WP_Theme_JSON_Resolver` tests.</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/51305">51305</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/51305","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>desrosj</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2021-07-02 12:24:08 +0000 (Fri, 02 Jul 2021)</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'>Coding Standards: Add missing visibility keywords to `WP_Theme`, `WP_Theme_JSON`, and `WP_Theme_JSON_Resolver` tests.
Follow-up to <a href="https://core.trac.wordpress.org/changeset/50959">[50959]</a>, <a href="https://core.trac.wordpress.org/changeset/50960">[50960]</a>, <a href="https://core.trac.wordpress.org/changeset/50967">[50967]</a>.
Props SergeyBiryukov.
Merges <a href="https://core.trac.wordpress.org/changeset/51287">[51287]</a> to the 5.8 branch.
Fixes <a href="https://core.trac.wordpress.org/ticket/52627">#52627</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches58testsphpunittestsrestapirestsidebarscontrollerphp">branches/5.8/tests/phpunit/tests/rest-api/rest-sidebars-controller.php</a></li>
<li><a href="#branches58testsphpunitteststhemewpThemephp">branches/5.8/tests/phpunit/tests/theme/wpTheme.php</a></li>
<li><a href="#branches58testsphpunitteststhemewpThemeJsonphp">branches/5.8/tests/phpunit/tests/theme/wpThemeJson.php</a></li>
<li><a href="#branches58testsphpunitteststhemewpThemeJsonResolverphp">branches/5.8/tests/phpunit/tests/theme/wpThemeJsonResolver.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches58">branches/5.8/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/5.8
</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.8 2021-07-02 08:56:06 UTC (rev 51304)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/5.8 2021-07-02 12:24:08 UTC (rev 51305)
</ins><a id="branches58"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/5.8</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/4.9:43557,43622
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/trunk:51274,51277,51288,51293
</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:51274,51277,51287-51288,51293
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches58testsphpunittestsrestapirestsidebarscontrollerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.8/tests/phpunit/tests/rest-api/rest-sidebars-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.8/tests/phpunit/tests/rest-api/rest-sidebars-controller.php 2021-07-02 08:56:06 UTC (rev 51304)
+++ branches/5.8/tests/phpunit/tests/rest-api/rest-sidebars-controller.php 2021-07-02 12:24:08 UTC (rev 51305)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -62,7 +62,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'sidebars_widgets', array() );
</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">- function clean_up_global_scope() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function clean_up_global_scope() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_widget_factory, $wp_registered_sidebars, $wp_registered_widgets, $wp_registered_widget_controls, $wp_registered_widget_updates;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_registered_sidebars = array();
</span></span></pre></div>
<a id="branches58testsphpunitteststhemewpThemephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.8/tests/phpunit/tests/theme/wpTheme.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.8/tests/phpunit/tests/theme/wpTheme.php 2021-07-02 08:56:06 UTC (rev 51304)
+++ branches/5.8/tests/phpunit/tests/theme/wpTheme.php 2021-07-02 12:24:08 UTC (rev 51305)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,7 +9,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group themes
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Theme_wpTheme extends WP_UnitTestCase {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function setUp() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ public function setUp() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::setUp();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->theme_root = realpath( DIR_TESTDATA . '/themedir1' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -24,7 +25,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $GLOBALS['wp_themes'] );
</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">- function tearDown() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function tearDown() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $GLOBALS['wp_theme_directories'] = $this->orig_theme_dir;
</span><span class="cx" style="display: block; padding: 0 10px"> wp_clean_themes_cache();
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $GLOBALS['wp_themes'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -32,10 +33,11 @@
</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"> // Replace the normal theme root directory with our premade test directory.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function _theme_root( $dir ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function _theme_root( $dir ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $this->theme_root;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_new_WP_Theme_top_level() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ public function test_new_WP_Theme_top_level() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $theme = new WP_Theme( 'theme1', $this->theme_root );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Meta.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -54,7 +56,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'theme1', $theme->get_template() );
</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">- function test_new_WP_Theme_subdir() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_new_WP_Theme_subdir() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $theme = new WP_Theme( 'subdir/theme2', $this->theme_root );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Meta.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -76,7 +78,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 20313
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_new_WP_Theme_subdir_bad_root() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_new_WP_Theme_subdir_bad_root() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // This is what get_theme_data() does when you pass it a style.css file for a theme in a subdirectory.
</span><span class="cx" style="display: block; padding: 0 10px"> $theme = new WP_Theme( 'theme2', $this->theme_root . '/subdir' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -99,7 +101,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 21749
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_theme_uris_with_spaces() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_theme_uris_with_spaces() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $theme = new WP_Theme( 'theme with spaces', $this->theme_root . '/subdir' );
</span><span class="cx" style="display: block; padding: 0 10px"> // Make sure subdir/ is considered part of the stylesheet, as we must avoid encoding /'s.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'subdir/theme with spaces', $theme->get_stylesheet() );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -116,7 +118,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 21969
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_theme_uris_with_spaces() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_theme_uris_with_spaces() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $callback = array( $this, 'filter_theme_with_spaces' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'stylesheet', $callback );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'template', $callback );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -128,7 +130,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'template', $callback );
</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">- function filter_theme_with_spaces() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_theme_with_spaces() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return 'subdir/theme with spaces';
</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">@@ -135,7 +137,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 26873
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_display_method_on_get_method_failure() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_display_method_on_get_method_failure() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $theme = new WP_Theme( 'nonexistent', $this->theme_root );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'nonexistent', $theme->get( 'Name' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $theme->get( 'AuthorURI' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -146,7 +148,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 40820
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_child_theme_with_itself_as_parent_should_appear_as_broken() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_child_theme_with_itself_as_parent_should_appear_as_broken() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $theme = new WP_Theme( 'child-parent-itself', $this->theme_root );
</span><span class="cx" style="display: block; padding: 0 10px"> $errors = $theme->errors();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertWPError( $errors );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -160,7 +162,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 30594
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_theme_network_enable_single_theme() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_theme_network_enable_single_theme() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $theme = 'testtheme-1';
</span><span class="cx" style="display: block; padding: 0 10px"> $current_allowed_themes = get_site_option( 'allowedthemes' );
</span><span class="cx" style="display: block; padding: 0 10px"> WP_Theme::network_enable_theme( $theme );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -177,7 +179,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 30594
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_theme_network_enable_multiple_themes() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_theme_network_enable_multiple_themes() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $themes = array( 'testtheme-2', 'testtheme-3' );
</span><span class="cx" style="display: block; padding: 0 10px"> $current_allowed_themes = get_site_option( 'allowedthemes' );
</span><span class="cx" style="display: block; padding: 0 10px"> WP_Theme::network_enable_theme( $themes );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -200,7 +202,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 30594
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_network_disable_single_theme() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_network_disable_single_theme() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $current_allowed_themes = get_site_option( 'allowedthemes' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $allowed_themes = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -225,7 +227,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 30594
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_network_disable_multiple_themes() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_network_disable_multiple_themes() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $current_allowed_themes = get_site_option( 'allowedthemes' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $allowed_themes = array(
</span></span></pre></div>
<a id="branches58testsphpunitteststhemewpThemeJsonphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.8/tests/phpunit/tests/theme/wpThemeJson.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.8/tests/phpunit/tests/theme/wpThemeJson.php 2021-07-02 08:56:06 UTC (rev 51304)
+++ branches/5.8/tests/phpunit/tests/theme/wpThemeJson.php 2021-07-02 12:24:08 UTC (rev 51305)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -16,7 +16,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 52991
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_settings() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_settings() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $theme_json = new WP_Theme_JSON(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'version' => WP_Theme_JSON::LATEST_SCHEMA,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -64,7 +64,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSameSetsWithIndex( $expected, $actual );
</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">- function test_get_settings_presets_are_keyed_by_origin() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_settings_presets_are_keyed_by_origin() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $core_origin = new WP_Theme_JSON(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'version' => WP_Theme_JSON::LATEST_SCHEMA,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -189,7 +189,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEqualSetsWithIndex( $expected_no_origin, $actual_no_origin );
</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">- function test_get_stylesheet() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_stylesheet() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $theme_json = new WP_Theme_JSON(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'version' => WP_Theme_JSON::LATEST_SCHEMA,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -307,7 +307,7 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_stylesheet_preset_classes_work_with_compounded_selectors() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_stylesheet_preset_classes_work_with_compounded_selectors() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $theme_json = new WP_Theme_JSON(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'version' => WP_Theme_JSON::LATEST_SCHEMA,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -334,7 +334,7 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_stylesheet_preset_rules_come_after_block_rules() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_stylesheet_preset_rules_come_after_block_rules() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $theme_json = new WP_Theme_JSON(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'version' => WP_Theme_JSON::LATEST_SCHEMA,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -655,7 +655,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 52991
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_from_editor_settings() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_from_editor_settings() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $input = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'disableCustomColors' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'disableCustomGradients' => true,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -731,7 +731,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 52991
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_editor_settings_no_theme_support() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_editor_settings_no_theme_support() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $input = array(
</span><span class="cx" style="display: block; padding: 0 10px"> '__unstableEnableFullSiteEditingBlocks' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'disableCustomColors' => false,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -786,7 +786,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 52991
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_editor_settings_blank() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_editor_settings_blank() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $expected = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'version' => WP_Theme_JSON::LATEST_SCHEMA,
</span><span class="cx" style="display: block; padding: 0 10px"> 'settings' => array(),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -799,7 +799,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 52991
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_editor_settings_custom_units_can_be_disabled() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_editor_settings_custom_units_can_be_disabled() {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_theme_support( 'custom-units', array() );
</span><span class="cx" style="display: block; padding: 0 10px"> $input = get_default_block_editor_settings();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -816,7 +816,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 52991
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_editor_settings_custom_units_can_be_enabled() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_editor_settings_custom_units_can_be_enabled() {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_theme_support( 'custom-units' );
</span><span class="cx" style="display: block; padding: 0 10px"> $input = get_default_block_editor_settings();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -833,7 +833,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 52991
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_editor_settings_custom_units_can_be_filtered() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_editor_settings_custom_units_can_be_filtered() {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_theme_support( 'custom-units', 'rem', 'em' );
</span><span class="cx" style="display: block; padding: 0 10px"> $input = get_default_block_editor_settings();
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="branches58testsphpunitteststhemewpThemeJsonResolverphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.8/tests/phpunit/tests/theme/wpThemeJsonResolver.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.8/tests/phpunit/tests/theme/wpThemeJsonResolver.php 2021-07-02 08:56:06 UTC (rev 51304)
+++ branches/5.8/tests/phpunit/tests/theme/wpThemeJsonResolver.php 2021-07-02 12:24:08 UTC (rev 51305)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,7 +12,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Theme_wpThemeJsonResolver extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function setUp() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function setUp() {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::setUp();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->theme_root = realpath( DIR_TESTDATA . '/themedir1' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -29,7 +29,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $GLOBALS['wp_themes'] );
</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">- function tearDown() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function tearDown() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $GLOBALS['wp_theme_directories'] = $this->orig_theme_dir;
</span><span class="cx" style="display: block; padding: 0 10px"> wp_clean_themes_cache();
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $GLOBALS['wp_themes'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -36,11 +36,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> parent::tearDown();
</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">- function filter_set_theme_root() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_set_theme_root() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $this->theme_root;
</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">- function filter_set_locale_to_polish() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_set_locale_to_polish() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return 'pl_PL';
</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">@@ -47,7 +47,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 52991
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_fields_are_extracted() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_fields_are_extracted() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $actual = WP_Theme_JSON_Resolver::get_fields_to_translate();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -94,7 +94,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 52991
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_translations_are_applied() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_translations_are_applied() {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'locale', array( $this, 'filter_set_locale_to_polish' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> load_textdomain( 'fse', realpath( DIR_TESTDATA . '/languages/themes/fse-pl_PL.mo' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -148,7 +148,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 52991
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_switching_themes_recalculates_data() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_switching_themes_recalculates_data() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // By default, the theme for unit tests is "default",
</span><span class="cx" style="display: block; padding: 0 10px"> // which doesn't have theme.json support.
</span><span class="cx" style="display: block; padding: 0 10px"> $default = WP_Theme_JSON_Resolver::theme_has_support();
</span></span></pre>
</div>
</div>
</body>
</html>