<!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>[11230] sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory: Theme Directory: Move `exec_with_notify()` to a trait for use in other classes too.</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="http://meta.trac.wordpress.org/changeset/11230">11230</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/11230","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dd32</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2021-09-14 06:38:51 +0000 (Tue, 14 Sep 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'>Theme Directory: Move `exec_with_notify()` to a trait for use in other classes too.
See <a href="http://meta.trac.wordpress.org/ticket/5899">#5899</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsthemedirectoryclasswporgthemesuploadphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/class-wporg-themes-upload.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsthemedirectorylibclassexecwithloggingphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/lib/class-exec-with-logging.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsthemedirectoryclasswporgthemesuploadphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/class-wporg-themes-upload.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/class-wporg-themes-upload.php 2021-09-14 06:09:50 UTC (rev 11229)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/class-wporg-themes-upload.php 2021-09-14 06:38:51 UTC (rev 11230)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> use WordPressdotorg\Theme_Directory\Lib\GitHub;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+use WordPressdotorg\Theme_Directory\Lib\Exec_With_Logging;
</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"> * Class WPORG_Themes_Upload
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,6 +8,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Processes a theme upload.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class WPORG_Themes_Upload {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ use Exec_With_Logging {
+ Exec_With_Logging::exec as exec_with_notify;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Path to `svn` script.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1625,74 +1630,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"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Execute a shell process, same behaviour as `exec()` but with PHP Warnings/Notices generated on errors.
- *
- * @param string $command Command to execute. Escape it.
- * @param array $output Array to append program output to. Passed by reference.
- * @param int $return_var The commands return value. Passed by reference.
- *
- * @return false|string False on failure, last line of output on success, as per exec().
- */
- public function exec_with_notify( $command, &$output = null, &$return_var = null ) {
- $proc = proc_open(
- $command,
- [
- 1 => [ 'pipe', 'w' ], // STDOUT
- 2 => [ 'pipe', 'w' ], // STDERR
- ],
- $pipes
- );
-
- $stdout = stream_get_contents( $pipes[1] );
- $stderr = stream_get_contents( $pipes[2] );
- fclose( $pipes[1] );
- fclose( $pipes[2] );
-
- $return_var = proc_close( $proc );
-
- // Append to $output, as `exec()` does.
- if ( ! is_array( $output ) ) {
- $output = [];
- }
- if ( $stdout ) {
- $output = array_merge( $output, explode( "\n", rtrim( $stdout, "\r\n" ) ) );
- }
-
- // Redact any passwords that might be in a command and included in logged errors.
- $command = str_replace( [ THEME_TRACBOT_PASSWORD, THEME_DROPBOX_PASSWORD ], '[redacted]', $command );
-
- if ( $return_var > 0 ) {
- trigger_error(
- "Command failed, `{$command}`\n" .
- "```\n" .
- "Return Value: {$return_var}\n" .
- "STDOUT: {$stdout}\n" .
- "STDERR: {$stderr}\n" .
- "```",
- E_USER_WARNING
- );
- } elseif ( $stderr ) {
- trigger_error(
- "Command produced errors, `{$command}`\n" .
- "```\n" .
- "Return Value: {$return_var}\n" .
- "STDOUT: {$stdout}\n" .
- "STDERR: {$stderr}\n" .
- "```",
- E_USER_NOTICE
- );
- }
-
- // Execution failed.
- if ( $return_var > 0 ) {
- return false;
- }
-
- // Successful, return the last output line.
- return $stdout ? end( $output ) : '';
- }
-
- /**
</del><span class="cx" style="display: block; padding: 0 10px"> * Log a Theme Upload to the slack `#themereview-firehose` channel.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $status Whether the upload was 'allowed' or 'blocked'.
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsthemedirectorylibclassexecwithloggingphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/lib/class-exec-with-logging.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/lib/class-exec-with-logging.php (rev 0)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/lib/class-exec-with-logging.php 2021-09-14 06:38:51 UTC (rev 11230)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,79 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+namespace WordPressdotorg\Theme_Directory\Lib;
+
+/**
+ * Simple `exec()` wrapper which adds error reporting to WordPress.org.
+ *
+ * @package WordPressdotorg\Theme_Directory
+ */
+trait Exec_With_Logging {
+
+ /**
+ * Execute a shell process, same behaviour as `exec()` but with PHP Warnings/Notices generated on errors.
+ *
+ * @param string $command Command to execute. Escape it.
+ * @param array $output Array to append program output to. Passed by reference.
+ * @param int $return_var The commands return value. Passed by reference.
+ *
+ * @return false|string False on failure, last line of output on success, as per exec().
+ */
+ public function exec( $command, &$output = null, &$return_var = null ) {
+ $proc = proc_open(
+ $command,
+ [
+ 1 => [ 'pipe', 'w' ], // STDOUT
+ 2 => [ 'pipe', 'w' ], // STDERR
+ ],
+ $pipes
+ );
+
+ $stdout = stream_get_contents( $pipes[1] );
+ $stderr = stream_get_contents( $pipes[2] );
+ fclose( $pipes[1] );
+ fclose( $pipes[2] );
+
+ $return_var = proc_close( $proc );
+
+ // Append to $output, as `exec()` does.
+ if ( ! is_array( $output ) ) {
+ $output = [];
+ }
+ if ( $stdout ) {
+ $output = array_merge( $output, explode( "\n", rtrim( $stdout, "\r\n" ) ) );
+ }
+
+ // Redact any passwords that might be in a command and included in logged errors.
+ $command = str_replace( [ THEME_TRACBOT_PASSWORD, THEME_DROPBOX_PASSWORD ], '[redacted]', $command );
+
+ if ( $return_var > 0 ) {
+ trigger_error(
+ "Command failed, `{$command}`\n" .
+ "```\n" .
+ "Return Value: {$return_var}\n" .
+ "STDOUT: {$stdout}\n" .
+ "STDERR: {$stderr}\n" .
+ "```",
+ E_USER_WARNING
+ );
+ } elseif ( $stderr ) {
+ trigger_error(
+ "Command produced errors, `{$command}`\n" .
+ "```\n" .
+ "Return Value: {$return_var}\n" .
+ "STDOUT: {$stdout}\n" .
+ "STDERR: {$stderr}\n" .
+ "```",
+ E_USER_NOTICE
+ );
+ }
+
+ // Execution failed.
+ if ( $return_var > 0 ) {
+ return false;
+ }
+
+ // Successful, return the last output line.
+ return $stdout ? end( $output ) : '';
+ }
+
+}
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><span class="cx" style="display: block; padding: 0 10px">Property changes on: sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/lib/class-exec-with-logging.php
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span></div>
</body>
</html>