<!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>[48464] trunk/tests/phpunit: Tests: Replace hardcoded `/tmp/` references with `get_temp_dir()`.</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/48464">48464</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/48464","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>2020-07-14 01:28:17 +0000 (Tue, 14 Jul 2020)</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'>Tests: Replace hardcoded `/tmp/` references with `get_temp_dir()`.
This allows more tests to pass on Windows.
Props danielhuesken, DJPaul, christophherr, joemcgill, netweb, davidbaumwald, SergeyBiryukov.
Fixes <a href="https://core.trac.wordpress.org/ticket/40856">#40856</a>, <a href="https://core.trac.wordpress.org/ticket/39975">#39975</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunitincludesabstracttestcasephp">trunk/tests/phpunit/includes/abstract-testcase.php</a></li>
<li><a href="#trunktestsphpunittestscustomizemanagerphp">trunk/tests/phpunit/tests/customize/manager.php</a></li>
<li><a href="#trunktestsphpunittestsfilephp">trunk/tests/phpunit/tests/file.php</a></li>
<li><a href="#trunktestsphpunittestsimagefunctionsphp">trunk/tests/phpunit/tests/image/functions.php</a></li>
<li><a href="#trunktestsphpunittestsrestapirestattachmentscontrollerphp">trunk/tests/phpunit/tests/rest-api/rest-attachments-controller.php</a></li>
<li><a href="#trunktestsphpunittestsrestapirestschemasetupphp">trunk/tests/phpunit/tests/rest-api/rest-schema-setup.php</a></li>
<li><a href="#trunktestsphpunittestsuploadphp">trunk/tests/phpunit/tests/upload.php</a></li>
<li><a href="#trunktestsphpunittestswidgetsmediagallerywidgetphp">trunk/tests/phpunit/tests/widgets/media-gallery-widget.php</a></li>
<li><a href="#trunktestsphpunittestswidgetsmediaimagewidgetphp">trunk/tests/phpunit/tests/widgets/media-image-widget.php</a></li>
<li><a href="#trunktestsphpunittestswidgetsmediawidgetphp">trunk/tests/phpunit/tests/widgets/media-widget.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunitincludesabstracttestcasephp"></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/abstract-testcase.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/abstract-testcase.php 2020-07-14 00:32:36 UTC (rev 48463)
+++ trunk/tests/phpunit/includes/abstract-testcase.php 2020-07-14 01:28:17 UTC (rev 48464)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -913,6 +913,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function temp_filename() {
</span><span class="cx" style="display: block; padding: 0 10px"> $tmp_dir = '';
</span><span class="cx" style="display: block; padding: 0 10px"> $dirs = array( 'TMP', 'TMPDIR', 'TEMP' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $dirs as $dir ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_ENV[ $dir ] ) && ! empty( $_ENV[ $dir ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $tmp_dir = $dir;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -919,10 +920,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</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">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $tmp_dir ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tmp_dir = '/tmp';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tmp_dir = get_temp_dir();
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $tmp_dir = realpath( $tmp_dir );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> return tempnam( $tmp_dir, 'wpunit' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestscustomizemanagerphp"></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/customize/manager.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/customize/manager.php 2020-07-14 00:32:36 UTC (rev 48463)
+++ trunk/tests/phpunit/tests/customize/manager.php 2020-07-14 01:28:17 UTC (rev 48464)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -60,10 +60,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->undefined = new stdClass();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $orig_file = DIR_TESTDATA . '/images/canola.jpg';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->test_file = '/tmp/canola.jpg';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->test_file = get_temp_dir() . 'canola.jpg';
</ins><span class="cx" style="display: block; padding: 0 10px"> copy( $orig_file, $this->test_file );
</span><span class="cx" style="display: block; padding: 0 10px"> $orig_file2 = DIR_TESTDATA . '/images/waffles.jpg';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->test_file2 = '/tmp/waffles.jpg';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->test_file2 = get_temp_dir() . 'waffles.jpg';
</ins><span class="cx" style="display: block; padding: 0 10px"> copy( $orig_file2, $this->test_file2 );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsfilephp"></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/file.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/file.php 2020-07-14 00:32:36 UTC (rev 48463)
+++ trunk/tests/phpunit/tests/file.php 2020-07-14 01:28:17 UTC (rev 48464)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,9 +8,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function setUp() {
</span><span class="cx" style="display: block; padding: 0 10px"> parent::setUp();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $file = tempnam( '/tmp', 'foo' );
- $this->dir = dirname( $file );
- unlink( $file );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->dir = untrailingslashit( get_temp_dir() );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->badchars = '"\'[]*&?$';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestsimagefunctionsphp"></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/image/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/image/functions.php 2020-07-14 00:32:36 UTC (rev 48463)
+++ trunk/tests/phpunit/tests/image/functions.php 2020-07-14 01:28:17 UTC (rev 48464)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,7 +20,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> require_once DIR_TESTDATA . '/../includes/mock-image-editor.php';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Ensure no legacy / failed tests detritus.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $folder = '/tmp/wordpress-gsoc-flyer*.{jpg,pdf}';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $folder = get_temp_dir() . 'wordpress-gsoc-flyer*.{jpg,pdf}';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( glob( $folder, GLOB_BRACE ) as $file ) {
</span><span class="cx" style="display: block; padding: 0 10px"> unlink( $file );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -425,7 +425,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"> $orig_file = DIR_TESTDATA . '/images/wordpress-gsoc-flyer.pdf';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $test_file = '/tmp/wordpress-gsoc-flyer.pdf';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $test_file = get_temp_dir() . 'wordpress-gsoc-flyer.pdf';
</ins><span class="cx" style="display: block; padding: 0 10px"> copy( $orig_file, $test_file );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $editor = wp_get_image_editor( $test_file );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -476,8 +476,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, $metadata );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> unlink( $test_file );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $temp_dir = get_temp_dir();
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $metadata['sizes'] as $size ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- unlink( '/tmp/' . $size['file'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ unlink( $temp_dir . $size['file'] );
</ins><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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -560,7 +561,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"> $orig_file = DIR_TESTDATA . '/images/wordpress-gsoc-flyer.pdf';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $test_file = '/tmp/wordpress-gsoc-flyer.pdf';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $test_file = get_temp_dir() . 'wordpress-gsoc-flyer.pdf';
</ins><span class="cx" style="display: block; padding: 0 10px"> copy( $orig_file, $test_file );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $editor = wp_get_image_editor( $test_file );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -596,8 +597,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'fallback_intermediate_image_sizes', array( $this, 'filter_fallback_intermediate_image_sizes' ), 10 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> unlink( $test_file );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $temp_dir = get_temp_dir();
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $metadata['sizes'] as $size ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- unlink( '/tmp/' . $size['file'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ unlink( $temp_dir . $size['file'] );
</ins><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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -618,14 +620,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->markTestSkipped( 'Rendering PDFs is not supported on this system.' );
</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">+ $temp_dir = get_temp_dir();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Dummy JPEGs.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $jpg1_path = '/tmp/test.jpg'; // Straight.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $jpg1_path = $temp_dir . 'test.jpg'; // Straight.
</ins><span class="cx" style="display: block; padding: 0 10px"> file_put_contents( $jpg1_path, 'asdf' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $jpg2_path = '/tmp/test-pdf.jpg'; // With PDF marker.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $jpg2_path = $temp_dir . 'test-pdf.jpg'; // With PDF marker.
</ins><span class="cx" style="display: block; padding: 0 10px"> file_put_contents( $jpg2_path, 'fdsa' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // PDF with same name as JPEG.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $pdf_path = '/tmp/test.pdf';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $pdf_path = $temp_dir . 'test.pdf';
</ins><span class="cx" style="display: block; padding: 0 10px"> copy( DIR_TESTDATA . '/images/wordpress-gsoc-flyer.pdf', $pdf_path );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $editor = wp_get_image_editor( $pdf_path );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -642,7 +646,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"> $metadata = wp_generate_attachment_metadata( $attachment_id, $pdf_path );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $preview_path = '/tmp/' . $metadata['sizes']['full']['file'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $preview_path = $temp_dir . $metadata['sizes']['full']['file'];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // PDF preview didn't overwrite PDF.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEquals( $pdf_path, $preview_path );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -658,7 +662,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> unlink( $jpg2_path );
</span><span class="cx" style="display: block; padding: 0 10px"> unlink( $pdf_path );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $metadata['sizes'] as $size ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- unlink( '/tmp/' . $size['file'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ unlink( $temp_dir . $size['file'] );
</ins><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></span></pre></div>
<a id="trunktestsphpunittestsrestapirestattachmentscontrollerphp"></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/rest-attachments-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rest-api/rest-attachments-controller.php 2020-07-14 00:32:36 UTC (rev 48463)
+++ trunk/tests/phpunit/tests/rest-api/rest-attachments-controller.php 2020-07-14 01:28:17 UTC (rev 48464)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -80,10 +80,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $role->add_cap( 'level_0' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $orig_file = DIR_TESTDATA . '/images/canola.jpg';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->test_file = '/tmp/canola.jpg';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->test_file = get_temp_dir() . 'canola.jpg';
</ins><span class="cx" style="display: block; padding: 0 10px"> copy( $orig_file, $this->test_file );
</span><span class="cx" style="display: block; padding: 0 10px"> $orig_file2 = DIR_TESTDATA . '/images/codeispoetry.png';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->test_file2 = '/tmp/codeispoetry.png';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->test_file2 = get_temp_dir() . 'codeispoetry.png';
</ins><span class="cx" style="display: block; padding: 0 10px"> copy( $orig_file2, $this->test_file2 );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsrestapirestschemasetupphp"></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/rest-schema-setup.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rest-api/rest-schema-setup.php 2020-07-14 00:32:36 UTC (rev 48463)
+++ trunk/tests/phpunit/tests/rest-api/rest-schema-setup.php 2020-07-14 01:28:17 UTC (rev 48464)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -226,7 +226,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"> $media_id = $this->factory->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '/tmp/canola.jpg',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ get_temp_dir() . 'canola.jpg',
</ins><span class="cx" style="display: block; padding: 0 10px"> 0,
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span></span></pre></div>
<a id="trunktestsphpunittestsuploadphp"></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/upload.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/upload.php 2020-07-14 00:32:36 UTC (rev 48463)
+++ trunk/tests/phpunit/tests/upload.php 2020-07-14 01:28:17 UTC (rev 48464)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -46,7 +46,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 5953
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_upload_dir_absolute() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $path = '/tmp/wp-unit-test';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $path = get_temp_dir() . 'wp-unit-test';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // wp_upload_dir() with an absolute upload path.
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'upload_path', $path );
</span></span></pre></div>
<a id="trunktestsphpunittestswidgetsmediagallerywidgetphp"></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/widgets/media-gallery-widget.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/widgets/media-gallery-widget.php 2020-07-14 00:32:36 UTC (rev 48463)
+++ trunk/tests/phpunit/tests/widgets/media-gallery-widget.php 2020-07-14 01:28:17 UTC (rev 48464)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -58,7 +58,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $attachments = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( array( 'canola.jpg', 'waffles.jpg' ) as $filename ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $test_image = '/tmp/' . $filename;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $test_image = get_temp_dir() . $filename;
</ins><span class="cx" style="display: block; padding: 0 10px"> copy( DIR_TESTDATA . '/images/canola.jpg', $test_image );
</span><span class="cx" style="display: block; padding: 0 10px"> $attachment_id = self::factory()->attachment->create_object(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span></span></pre></div>
<a id="trunktestsphpunittestswidgetsmediaimagewidgetphp"></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/widgets/media-image-widget.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/widgets/media-image-widget.php 2020-07-14 00:32:36 UTC (rev 48463)
+++ trunk/tests/phpunit/tests/widgets/media-image-widget.php 2020-07-14 01:28:17 UTC (rev 48464)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -412,7 +412,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_render_media() {
</span><span class="cx" style="display: block; padding: 0 10px"> $widget = new WP_Widget_Media_Image();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $test_image = '/tmp/canola.jpg';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $test_image = get_temp_dir() . 'canola.jpg';
</ins><span class="cx" style="display: block; padding: 0 10px"> copy( DIR_TESTDATA . '/images/canola.jpg', $test_image );
</span><span class="cx" style="display: block; padding: 0 10px"> $attachment_id = self::factory()->attachment->create_object(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span></span></pre></div>
<a id="trunktestsphpunittestswidgetsmediawidgetphp"></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/widgets/media-widget.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/widgets/media-widget.php 2020-07-14 00:32:36 UTC (rev 48463)
+++ trunk/tests/phpunit/tests/widgets/media-widget.php 2020-07-14 01:28:17 UTC (rev 48464)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -138,7 +138,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_is_attachment_with_mime_type() {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $test_image = '/tmp/canola.jpg';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $test_image = get_temp_dir() . 'canola.jpg';
</ins><span class="cx" style="display: block; padding: 0 10px"> copy( DIR_TESTDATA . '/images/canola.jpg', $test_image );
</span><span class="cx" style="display: block; padding: 0 10px"> $attachment_id = self::factory()->attachment->create_object(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span></span></pre>
</div>
</div>
</body>
</html>