<!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>[36721] trunk/tests/phpunit: Remove (or at least reduce) the need to reset common `$_SERVER` variables before assertions or between tests, by introducing a method which automatically resets them during test setup.</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" 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/36721">36721</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/36721","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>johnbillion</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-02-26 02:08:47 +0000 (Fri, 26 Feb 2016)</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'>Remove (or at least reduce) the need to reset common `$_SERVER` variables before assertions or between tests, by introducing a method which automatically resets them during test setup.
See <a href="https://core.trac.wordpress.org/ticket/35954">#35954</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="#trunktestsphpunitincludesinstallphp">trunk/tests/phpunit/includes/install.php</a></li>
<li><a href="#trunktestsphpunitincludestestcasephp">trunk/tests/phpunit/includes/testcase.php</a></li>
<li><a href="#trunktestsphpunittestsmultisitesitephp">trunk/tests/phpunit/tests/multisite/site.php</a></li>
<li><a href="#trunktestsphpunittestspostattachmentsphp">trunk/tests/phpunit/tests/post/attachments.php</a></li>
<li><a href="#trunktestsphpunittestsrestapiphp">trunk/tests/phpunit/tests/rest-api.php</a></li>
<li><a href="#trunktestsphpunittestsrewritephp">trunk/tests/phpunit/tests/rewrite.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunitincludesbootstrapphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/includes/bootstrap.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/bootstrap.php 2016-02-26 01:55:33 UTC (rev 36720)
+++ trunk/tests/phpunit/includes/bootstrap.php 2016-02-26 02:08:47 UTC (rev 36721)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -24,7 +24,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> require_once $config_file_path;
</span><span class="cx" style="display: block; padding: 0 10px"> require_once dirname( __FILE__ ) . '/functions.php';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-tests_reset_SERVER();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+tests_reset__SERVER();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> define( 'WP_TESTS_TABLE_PREFIX', $table_prefix );
</span><span class="cx" style="display: block; padding: 0 10px"> define( 'DIR_TESTDATA', dirname( __FILE__ ) . '/../data' );
</span></span></pre></div>
<a id="trunktestsphpunitincludesfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/includes/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/functions.php 2016-02-26 01:55:33 UTC (rev 36720)
+++ trunk/tests/phpunit/includes/functions.php 2016-02-26 02:08:47 UTC (rev 36721)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3,10 +3,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Resets various `$_SERVER` variables that can get altered during tests.
</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 tests_reset_SERVER() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function tests_reset__SERVER() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $_SERVER['HTTP_HOST'] = WP_TESTS_DOMAIN;
</span><span class="cx" style="display: block; padding: 0 10px"> $_SERVER['REMOTE_ADDR'] = '127.0.0.1';
</span><span class="cx" style="display: block; padding: 0 10px"> $_SERVER['REQUEST_METHOD'] = 'GET';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $_SERVER['REQUEST_URI'] = '';
</ins><span class="cx" style="display: block; padding: 0 10px"> $_SERVER['SERVER_NAME'] = WP_TESTS_DOMAIN;
</span><span class="cx" style="display: block; padding: 0 10px"> $_SERVER['SERVER_PORT'] = '80';
</span><span class="cx" style="display: block; padding: 0 10px"> $_SERVER['SERVER_PROTOCOL'] = 'HTTP/1.1';
</span></span></pre></div>
<a id="trunktestsphpunitincludesinstallphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/includes/install.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/install.php 2016-02-26 01:55:33 UTC (rev 36720)
+++ trunk/tests/phpunit/includes/install.php 2016-02-26 02:08:47 UTC (rev 36721)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,7 +13,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> require_once $config_file_path;
</span><span class="cx" style="display: block; padding: 0 10px"> require_once dirname( __FILE__ ) . '/functions.php';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-tests_reset_SERVER();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+tests_reset__SERVER();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $PHP_SELF = $GLOBALS['PHP_SELF'] = $_SERVER['PHP_SELF'] = '/index.php';
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunitincludestestcasephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/includes/testcase.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/testcase.php 2016-02-26 01:55:33 UTC (rev 36720)
+++ trunk/tests/phpunit/includes/testcase.php 2016-02-26 02:08:47 UTC (rev 36721)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -101,6 +101,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->reset_post_types();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->reset_taxonomies();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->reset_post_statuses();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->reset__SERVER();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $wp_rewrite->permalink_structure ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->set_permalink_structure( '' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -186,6 +187,13 @@
</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">+ * Reset `$_SERVER` variables
+ */
+ protected function reset__SERVER() {
+ tests_reset__SERVER();
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Saves the action and filter-related globals so they can be restored later.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Stores $merged_filters, $wp_actions, $wp_current_filter, and $wp_filter
</span></span></pre></div>
<a id="trunktestsphpunittestsmultisitesitephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/multisite/site.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/multisite/site.php 2016-02-26 01:55:33 UTC (rev 36720)
+++ trunk/tests/phpunit/tests/multisite/site.php 2016-02-26 02:08:47 UTC (rev 36721)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1028,8 +1028,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $is_ssl = is_ssl();
</span><span class="cx" style="display: block; padding: 0 10px"> $address = parse_url( get_blogaddress_by_id( $blog ), PHP_URL_SCHEME );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- unset( $_SERVER['HTTPS'] );
-
</del><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $is_ssl );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'http', $address );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestspostattachmentsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/post/attachments.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/attachments.php 2016-02-26 01:55:33 UTC (rev 36720)
+++ trunk/tests/phpunit/tests/post/attachments.php 2016-02-26 02:08:47 UTC (rev 36721)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -296,15 +296,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Set attachment ID.
</span><span class="cx" style="display: block; padding: 0 10px"> $attachment_id = $this->_make_attachment( $upload );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Save server data for cleanup.
- $is_ssl = is_ssl();
</del><span class="cx" style="display: block; padding: 0 10px"> $_SERVER['HTTPS'] = 'off';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $url = wp_get_attachment_url( $attachment_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Cleanup.
- $_SERVER['HTTPS'] = $is_ssl ? 'on' : 'off';
-
</del><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'http', parse_url( $url, PHP_URL_SCHEME ) );
</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">@@ -326,15 +321,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Set attachment ID.
</span><span class="cx" style="display: block; padding: 0 10px"> $attachment_id = $this->_make_attachment( $upload );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Save server data for cleanup.
- $is_ssl = is_ssl();
</del><span class="cx" style="display: block; padding: 0 10px"> $_SERVER['HTTPS'] = 'off';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $url = wp_get_attachment_url( $attachment_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Cleanup.
- $_SERVER['HTTPS'] = $is_ssl ? 'on' : 'off';
-
</del><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'http', parse_url( $url, PHP_URL_SCHEME ) );
</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">@@ -356,10 +346,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Set attachment ID
</span><span class="cx" style="display: block; padding: 0 10px"> $attachment_id = $this->_make_attachment( $upload );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Save server data for cleanup
- $is_ssl = is_ssl();
- $http_host = $_SERVER['HTTP_HOST'];
-
</del><span class="cx" style="display: block; padding: 0 10px"> $_SERVER['HTTPS'] = 'on';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Ensure that server host matches the host of wp_upload_dir().
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -369,10 +355,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Test that wp_get_attachemt_url returns with https scheme.
</span><span class="cx" style="display: block; padding: 0 10px"> $url = wp_get_attachment_url( $attachment_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Cleanup.
- $_SERVER['HTTPS'] = $is_ssl ? 'on' : 'off';
- $_SERVER['HTTP_HOST'] = $http_host;
-
</del><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'https', parse_url( $url, PHP_URL_SCHEME ) );
</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">@@ -392,10 +374,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Set attachment ID.
</span><span class="cx" style="display: block; padding: 0 10px"> $attachment_id = $this->_make_attachment( $upload );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Save server data for cleanup.
- $is_ssl = is_ssl();
- $http_host = $_SERVER['HTTP_HOST'];
-
</del><span class="cx" style="display: block; padding: 0 10px"> $_SERVER['HTTPS'] = 'on';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Ensure that server host matches the host of wp_upload_dir().
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -405,10 +383,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Test that wp_get_attachemt_url returns with https scheme.
</span><span class="cx" style="display: block; padding: 0 10px"> $url = wp_get_attachment_url( $attachment_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Cleanup.
- $_SERVER['HTTPS'] = $is_ssl ? 'on' : 'off';
- $_SERVER['HTTP_HOST'] = $http_host;
-
</del><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'https', parse_url( $url, PHP_URL_SCHEME ) );
</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">@@ -428,14 +402,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Set attachment ID
</span><span class="cx" style="display: block; padding: 0 10px"> $attachment_id = $this->_make_attachment( $upload );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $is_ssl = is_ssl();
</del><span class="cx" style="display: block; padding: 0 10px"> $_SERVER['HTTPS'] = 'on';
</span><span class="cx" style="display: block; padding: 0 10px"> set_current_screen( 'dashboard' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $url = wp_get_attachment_url( $attachment_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Cleanup.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $_SERVER['HTTPS'] = $is_ssl ? 'on' : 'off';
</del><span class="cx" style="display: block; padding: 0 10px"> set_current_screen( 'front' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( set_url_scheme( $url, 'http' ), $url );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -457,14 +429,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Set attachment ID
</span><span class="cx" style="display: block; padding: 0 10px"> $attachment_id = $this->_make_attachment( $upload );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $is_ssl = is_ssl();
</del><span class="cx" style="display: block; padding: 0 10px"> $_SERVER['HTTPS'] = 'on';
</span><span class="cx" style="display: block; padding: 0 10px"> set_current_screen( 'dashboard' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $url = wp_get_attachment_url( $attachment_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Cleanup.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $_SERVER['HTTPS'] = $is_ssl ? 'on' : 'off';
</del><span class="cx" style="display: block; padding: 0 10px"> set_current_screen( 'front' );
</span><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'upload_dir', '_upload_dir_https' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsrestapiphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/rest-api.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rest-api.php 2016-02-26 01:55:33 UTC (rev 36720)
+++ trunk/tests/phpunit/tests/rest-api.php 2016-02-26 02:08:47 UTC (rev 36721)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -285,10 +285,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 34299
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_rest_url_scheme() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $_SERVER['HTTPS'] ) ) {
- $_https = $_SERVER['HTTPS'];
- }
- $_name = $_SERVER['SERVER_NAME'];
</del><span class="cx" style="display: block; padding: 0 10px"> $_SERVER['SERVER_NAME'] = parse_url( home_url(), PHP_URL_HOST );
</span><span class="cx" style="display: block; padding: 0 10px"> $_siteurl = get_option( 'siteurl' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -321,12 +317,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'http', parse_url( $url, PHP_URL_SCHEME ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Reset
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $_https ) ) {
- $_SERVER['HTTPS'] = $_https;
- } else {
- unset( $_SERVER['HTTPS'] );
- }
- $_SERVER['SERVER_NAME'] = $_name;
</del><span class="cx" style="display: block; padding: 0 10px"> update_option( 'siteurl', $_siteurl );
</span><span class="cx" style="display: block; padding: 0 10px"> set_current_screen( 'front' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsrewritephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/rewrite.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rewrite.php 2016-02-26 01:55:33 UTC (rev 36720)
+++ trunk/tests/phpunit/tests/rewrite.php 2016-02-26 02:08:47 UTC (rev 36721)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -103,9 +103,6 @@
</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"> function test_url_to_postid_set_url_scheme_http_to_https() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Save server data for cleanup
- $is_ssl = is_ssl();
-
</del><span class="cx" style="display: block; padding: 0 10px"> $_SERVER['HTTPS'] = 'on';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = self::factory()->post->create();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -116,9 +113,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $page_permalink = get_permalink( $page_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $page_url_to_id = url_to_postid( set_url_scheme( $page_permalink, 'http' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Cleanup.
- $_SERVER['HTTPS'] = $is_ssl ? 'on' : 'off';
-
</del><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $post_id, $post_url_to_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $page_id, $page_url_to_id );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>