<!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>[28797] trunk/tests/phpunit/includes: Allow `wp_die()` to die in plain text when running the test suite.</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/28797">28797</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-06-21 19:59:28 +0000 (Sat, 21 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Allow `wp_die()` to die in plain text when running the test suite.
Props jorbin.
Fixes <a href="http://core.trac.wordpress.org/ticket/27749">#27749</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunitincludesbootstrapphp">trunk/tests/phpunit/includes/bootstrap.php</a></li>
<li><a href="#trunktestsphpunitincludesfunctionsphp">trunk/tests/phpunit/includes/functions.php</a></li>
<li><a href="#trunktestsphpunitincludesutilsphp">trunk/tests/phpunit/includes/utils.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunitincludesbootstrapphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/includes/bootstrap.php (28796 => 28797)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/includes/bootstrap.php 2014-06-21 19:44:26 UTC (rev 28796)
+++ trunk/tests/phpunit/includes/bootstrap.php 2014-06-21 19:59:28 UTC (rev 28797)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx">
</span><span class="cx"> // Override the PHPMailer
</span><span class="cx"> require_once( dirname( __FILE__ ) . '/mock-mailer.php' );
</span><del>-$phpmailer = new MockPHPMailer();
</del><ins>+$phpmailer = new MockPHPMailer();
</ins><span class="cx">
</span><span class="cx"> system( WP_PHP_BINARY . ' ' . escapeshellarg( dirname( __FILE__ ) . '/install.php' ) . ' ' . escapeshellarg( $config_file_path ) . ' ' . $multisite );
</span><span class="cx">
</span><span class="lines">@@ -67,6 +67,10 @@
</span><span class="cx">
</span><span class="cx"> require_once dirname( __FILE__ ) . '/functions.php';
</span><span class="cx">
</span><ins>+$GLOBALS['_wp_die_disabled'] = false;
+// Allow tests to override wp_die
+tests_add_filter( 'wp_die_handler', '_wp_die_handler_filter' );
+
</ins><span class="cx"> // Preset WordPress options defined in bootstrap file.
</span><span class="cx"> // Used to activate themes, plugins, as well as other settings.
</span><span class="cx"> if(isset($GLOBALS['wp_tests_options'])) {
</span></span></pre></div>
<a id="trunktestsphpunitincludesfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/includes/functions.php (28796 => 28797)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/includes/functions.php 2014-06-21 19:44:26 UTC (rev 28796)
+++ trunk/tests/phpunit/includes/functions.php 2014-06-21 19:59:28 UTC (rev 28797)
</span><span class="lines">@@ -70,4 +70,36 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-class Basic_Subclass extends Basic_Object {}
</del><span class="cx">\ No newline at end of file
</span><ins>+class Basic_Subclass extends Basic_Object {}
+
+function _wp_die_handler( $message, $title = '', $args = array() ) {
+ if ( !$GLOBALS['_wp_die_disabled'] ) {
+ _wp_die_handler_txt( $message, $title, $args);
+ } else {
+ //Ignore at our peril
+ }
+}
+
+function _disable_wp_die() {
+ $GLOBALS['_wp_die_disabled'] = true;
+}
+
+function _enable_wp_die() {
+ $GLOBALS['_wp_die_disabled'] = false;
+}
+
+function _wp_die_handler_filter() {
+ return '_wp_die_handler';
+}
+
+function _wp_die_handler_txt( $message, $title, $args ) {
+ echo "\nwp_die called\n";
+ echo "Message : $message\n";
+ echo "Title : $title\n";
+ if ( ! empty( $args ) ) {
+ echo "Args: \n";
+ foreach( $args as $k => $v ){
+ echo "\t $k : $v\n";
+ }
+ }
+}
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunktestsphpunitincludesutilsphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/includes/utils.php (28796 => 28797)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/includes/utils.php 2014-06-21 19:44:26 UTC (rev 28796)
+++ trunk/tests/phpunit/includes/utils.php 2014-06-21 19:59:28 UTC (rev 28797)
</span><span class="lines">@@ -302,27 +302,6 @@
</span><span class="cx"> return preg_replace('@<input([^>]*) name="'.preg_quote($name).'"([^>]*) value="[^>]*" />@', '<input$1 name="'.preg_quote($name).'"$2 value="***" />', $in);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-$GLOBALS['_wp_die_disabled'] = false;
-function _wp_die_handler( $message, $title = '', $args = array() ) {
- if ( !$GLOBALS['_wp_die_disabled'] ) {
- _default_wp_die_handler( $message, $title, $args );
- } else {
- //Ignore at our peril
- }
-}
-
-function _disable_wp_die() {
- $GLOBALS['_wp_die_disabled'] = true;
-}
-
-function _enable_wp_die() {
- $GLOBALS['_wp_die_disabled'] = false;
-}
-
-function _wp_die_handler_filter() {
- return '_wp_die_handler';
-}
-
</del><span class="cx"> if ( !function_exists( 'str_getcsv' ) ) {
</span><span class="cx"> function str_getcsv( $input, $delimiter = ',', $enclosure = '"', $escape = "\\" ) {
</span><span class="cx"> $fp = fopen( 'php://temp/', 'r+' );
</span></span></pre>
</div>
</div>
</body>
</html>