<!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>[25362] trunk/tests/phpunit/tests: Restore the test code for `get_theme()`, add the notice suppression filters, and fix the type in the `remove_filter()` call.</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 { 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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/25362">25362</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2013-09-11 21:32:14 +0000 (Wed, 11 Sep 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Restore the test code for `get_theme()`, add the notice suppression filters, and fix the type in the `remove_filter()` call.
See <a href="http://core.trac.wordpress.org/ticket/25282">#25282</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsadminincludesThemephp">trunk/tests/phpunit/tests/admin/includesTheme.php</a></li>
<li><a href="#trunktestsphpunitteststhemephp">trunk/tests/phpunit/tests/theme.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunittestsadminincludesThemephp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/tests/admin/includesTheme.php (25361 => 25362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/admin/includesTheme.php 2013-09-11 20:06:32 UTC (rev 25361)
+++ trunk/tests/phpunit/tests/admin/includesTheme.php 2013-09-11 21:32:14 UTC (rev 25362)
</span><span class="lines">@@ -17,8 +17,20 @@
</span><span class="cx"> // clear caches
</span><span class="cx"> wp_clean_themes_cache();
</span><span class="cx"> unset( $GLOBALS['wp_themes'] );
</span><ins>+
+ add_action( 'deprecated_function_run', array( $this, 'deprecated_function_run_check' ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+ function deprecated_function_run_check( $function ) {
+ if ( in_array( $function, array( 'get_theme', 'get_themes', 'get_theme_data', 'get_current_theme' ) ) )
+ add_filter( 'deprecated_function_trigger_error', array( $this, 'filter_deprecated_function_trigger_error' ) );
+ }
+
+ function filter_deprecated_function_trigger_error() {
+ remove_filter( 'deprecated_function_trigger_error', array( $this, 'filter_deprecated_function_trigger_error' ) );
+ return false;
+ }
+
</ins><span class="cx"> function tearDown() {
</span><span class="cx"> $GLOBALS['wp_theme_directories'] = $this->orig_theme_dir;
</span><span class="cx"> remove_filter('theme_root', array($this, '_theme_root'));
</span><span class="lines">@@ -40,6 +52,17 @@
</span><span class="cx"> * @ticket 11216
</span><span class="cx"> */
</span><span class="cx"> function test_page_templates() {
</span><ins>+ $theme = get_theme( 'Page Template Theme' );
+ $this->assertNotEmpty( $theme );
+
+ switch_theme( $theme['Template'], $theme['Stylesheet'] );
+
+ $templates = get_page_templates();
+ $this->assertCount( 3, $templates );
+ $this->assertEquals( "template-top-level.php", $templates['Top Level'] );
+ $this->assertEquals( "subdir/template-sub-dir.php", $templates['Sub Dir'] );
+ $this->assertEquals( "template-header.php", $templates['This Template Header Is On One Line'] );
+
</ins><span class="cx"> $theme = wp_get_theme( 'page-templates' );
</span><span class="cx"> $this->assertNotEmpty( $theme );
</span><span class="cx">
</span></span></pre></div>
<a id="trunktestsphpunitteststhemephp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/tests/theme.php (25361 => 25362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/theme.php 2013-09-11 20:06:32 UTC (rev 25361)
+++ trunk/tests/phpunit/tests/theme.php 2013-09-11 21:32:14 UTC (rev 25362)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function filter_deprecated_function_trigger_error() {
</span><del>- remove_filter( 'filter_deprecated_function_trigger_error', array( $this, 'filter_deprecated_function_trigger_error' ) );
</del><ins>+ remove_filter( 'deprecated_function_trigger_error', array( $this, 'filter_deprecated_function_trigger_error' ) );
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>