<!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>[50443] trunk/tests/phpunit/tests/admin/includesPlugin.php: Build/Test Tools: Increase the reliability of backing up the `mu-plugins` directory during 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/50443">50443</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/50443","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>2021-02-26 14:37:47 +0000 (Fri, 26 Feb 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'>Build/Test Tools: Increase the reliability of backing up the `mu-plugins` directory during tests.
Fixes <a href="https://core.trac.wordpress.org/ticket/51735">#51735</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsadminincludesPluginphp">trunk/tests/phpunit/tests/admin/includesPlugin.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunittestsadminincludesPluginphp"></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/admin/includesPlugin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/admin/includesPlugin.php 2021-02-26 14:28:02 UTC (rev 50442)
+++ trunk/tests/phpunit/tests/admin/includesPlugin.php 2021-02-26 14:37:47 UTC (rev 50443)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4,6 +4,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group admin
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Admin_includesPlugin extends WP_UnitTestCase {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public static function wpSetUpBeforeClass( $factory ) {
+ self::_back_up_mu_plugins();
+ }
+
+ public static function wpTearDownAfterClass() {
+ self::_restore_mu_plugins();
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> function test_get_plugin_data() {
</span><span class="cx" style="display: block; padding: 0 10px"> $data = get_plugin_data( DIR_TESTDATA . '/plugins/hello.php' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -377,12 +385,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'list_files_test_plugin/list_files_test_plugin.php',
</span><span class="cx" style="display: block; padding: 0 10px"> 'list_files_test_plugin/subdir/subfile.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">- $this->assertSame( $expected, $plugin_files );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> unlink( $sub_dir . '/subfile.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> unlink( $plugin[1] );
</span><span class="cx" style="display: block; padding: 0 10px"> rmdir( $sub_dir );
</span><span class="cx" style="display: block; padding: 0 10px"> rmdir( $plugin_dir );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $this->assertSame( $expected, $plugin_files );
</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">@@ -389,22 +398,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::get_mu_plugins
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_mu_plugins_when_mu_plugins_exists_but_is_empty() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_dir( WPMU_PLUGIN_DIR ) ) {
- $exists = true;
- $this->_back_up_mu_plugins();
- } else {
- $exists = false;
- mkdir( WPMU_PLUGIN_DIR );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ mkdir( WPMU_PLUGIN_DIR );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertSame( array(), get_mu_plugins() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $mu_plugins = get_mu_plugins();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Clean up.
- if ( $exists ) {
- $this->_restore_mu_plugins();
- } else {
- rmdir( WPMU_PLUGIN_DIR );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ rmdir( WPMU_PLUGIN_DIR );
+
+ $this->assertSame( array(), $mu_plugins );
</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">@@ -411,20 +411,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::get_mu_plugins
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_mu_plugins_when_mu_plugins_directory_does_not_exist() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $exists = false;
- if ( is_dir( WPMU_PLUGIN_DIR ) ) {
- $exists = true;
- $this->_back_up_mu_plugins();
- rmdir( WPMU_PLUGIN_DIR );
- }
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertFileNotExists( WPMU_PLUGIN_DIR );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( array(), get_mu_plugins() );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- // Clean up.
- if ( $exists ) {
- mkdir( WPMU_PLUGIN_DIR );
- $this->_restore_mu_plugins();
- }
</del><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">@@ -431,24 +419,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::get_mu_plugins
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_mu_plugins_should_ignore_index_php_containing_silence_is_golden() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_dir( WPMU_PLUGIN_DIR ) ) {
- $exists = true;
- $this->_back_up_mu_plugins();
- } else {
- $exists = false;
- mkdir( WPMU_PLUGIN_DIR );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ mkdir( WPMU_PLUGIN_DIR );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->_create_plugin( '<?php\n//Silence is golden.', 'index.php', WPMU_PLUGIN_DIR );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertSame( array(), get_mu_plugins() );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Clean up.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $mu_plugins = get_mu_plugins();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> unlink( WPMU_PLUGIN_DIR . '/index.php' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $exists ) {
- $this->_restore_mu_plugins();
- } else {
- rmdir( WPMU_PLUGIN_DIR );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ rmdir( WPMU_PLUGIN_DIR );
+
+ $this->assertSame( array(), $mu_plugins );
</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">@@ -455,25 +435,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::get_mu_plugins
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_mu_plugins_should_not_ignore_index_php_containing_something_other_than_silence_is_golden() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_dir( WPMU_PLUGIN_DIR ) ) {
- $exists = true;
- $this->_back_up_mu_plugins();
- } else {
- $exists = false;
- mkdir( WPMU_PLUGIN_DIR );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ mkdir( WPMU_PLUGIN_DIR );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->_create_plugin( '<?php\n//Silence is not golden.', 'index.php', WPMU_PLUGIN_DIR );
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_mu_plugins();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertSame( array( 'index.php' ), array_keys( $found ) );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Clean up.
</span><span class="cx" style="display: block; padding: 0 10px"> unlink( WPMU_PLUGIN_DIR . '/index.php' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $exists ) {
- $this->_restore_mu_plugins();
- } else {
- rmdir( WPMU_PLUGIN_DIR );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ rmdir( WPMU_PLUGIN_DIR );
+
+ $this->assertSame( array( 'index.php' ), array_keys( $found ) );
</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">@@ -480,27 +451,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::get_mu_plugins
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_mu_plugins_should_ignore_files_without_php_extensions() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_dir( WPMU_PLUGIN_DIR ) ) {
- $exists = true;
- $this->_back_up_mu_plugins();
- } else {
- $exists = false;
- mkdir( WPMU_PLUGIN_DIR );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ mkdir( WPMU_PLUGIN_DIR );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->_create_plugin( '<?php\n//Test', 'foo.php', WPMU_PLUGIN_DIR );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->_create_plugin( '<?php\n//Test 2', 'bar.txt', WPMU_PLUGIN_DIR );
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_mu_plugins();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertSame( array( 'foo.php' ), array_keys( $found ) );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Clean up.
</span><span class="cx" style="display: block; padding: 0 10px"> unlink( WPMU_PLUGIN_DIR . '/foo.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> unlink( WPMU_PLUGIN_DIR . '/bar.txt' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $exists ) {
- $this->_restore_mu_plugins();
- } else {
- rmdir( WPMU_PLUGIN_DIR );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $this->assertSame( array( 'foo.php' ), array_keys( $found ) );
</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">@@ -659,34 +620,16 @@
</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">- * Move existing mu-plugins to wp-content/mu-plugin/backup.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Move existing mu-plugins to wp-content/mu-plugin-backup.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.2.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @access private
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- private function _back_up_mu_plugins() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ private static function _back_up_mu_plugins() {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( is_dir( WPMU_PLUGIN_DIR ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $mu_bu_dir = WP_CONTENT_DIR . '/mu-plugin-backup';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_dir( $mu_bu_dir ) ) {
- mkdir( $mu_bu_dir );
- }
-
- $files_to_move = array();
- $mu_plugins = opendir( WPMU_PLUGIN_DIR );
- if ( $mu_plugins ) {
- while ( false !== $plugin = readdir( $mu_plugins ) ) {
- if ( 0 !== strpos( $plugin, '.' ) ) {
- $files_to_move[] = $plugin;
- }
- }
- }
-
- closedir( $mu_plugins );
-
- foreach ( $files_to_move as $file_to_move ) {
- $f = rename( WPMU_PLUGIN_DIR . '/' . $file_to_move, $mu_bu_dir . '/' . $file_to_move );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ rename( WPMU_PLUGIN_DIR, $mu_bu_dir );
</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">@@ -697,26 +640,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @access private
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- private function _restore_mu_plugins() {
- $mu_bu_dir = WP_CONTENT_DIR . '/mu-plugin-backup';
- $files_to_move = array();
- $mu_plugins = @opendir( $mu_bu_dir );
- if ( $mu_plugins ) {
- while ( false !== $plugin = readdir( $mu_plugins ) ) {
- if ( 0 !== strpos( $plugin, '.' ) ) {
- $files_to_move[] = $plugin;
- }
- }
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ private static function _restore_mu_plugins() {
+ $mu_bu_dir = WP_CONTENT_DIR . '/mu-plugin-backup';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- closedir( $mu_plugins );
-
- foreach ( $files_to_move as $file_to_move ) {
- rename( $mu_bu_dir . '/' . $file_to_move, WPMU_PLUGIN_DIR . '/' . $file_to_move );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_dir( WPMU_PLUGIN_DIR ) ) {
+ rmdir( WPMU_PLUGIN_DIR );
</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"> if ( is_dir( $mu_bu_dir ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- rmdir( $mu_bu_dir );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ rename( $mu_bu_dir, WPMU_PLUGIN_DIR );
</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>
</div>
</body>
</html>