<!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>[14239] sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-upload-handler.php: Plugin Directory: Plugin Check: Include low-severity issues in the output of plugin-check on plugin submission.</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/14239">14239</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/14239","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>2024-12-05 03:15:47 +0000 (Thu, 05 Dec 2024)</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'>Plugin Directory: Plugin Check: Include low-severity issues in the output of plugin-check on plugin submission.
Fixes <a href="http://meta.trac.wordpress.org/ticket/7840">#7840</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryshortcodesclassuploadhandlerphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-upload-handler.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryshortcodesclassuploadhandlerphp"></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/plugin-directory/shortcodes/class-upload-handler.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/plugin-directory/shortcodes/class-upload-handler.php 2024-12-05 01:46:57 UTC (rev 14238)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-upload-handler.php 2024-12-05 03:15:47 UTC (rev 14239)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -685,7 +685,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ];
</span><span class="cx" style="display: block; padding: 0 10px"> $command = WPCLI . ' --url=https://wordpress.org/plugins ' .
</span><span class="cx" style="display: block; padding: 0 10px"> 'plugin check ' .
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '--error-severity=7 --warning-severity=6 --categories=plugin_repo --format=json ' .
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '--error-severity=7 --warning-severity=6 --include-low-severity-errors ' .
+ '--categories=plugin_repo --format=json ' .
</ins><span class="cx" style="display: block; padding: 0 10px"> '--slug=' . escapeshellarg( $this->plugin_slug ) . ' ' .
</span><span class="cx" style="display: block; padding: 0 10px"> escapeshellarg( $this->plugin_root );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -757,9 +758,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * FILE: example2.extension
</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">- $verdict = true;
- $results = [];
- $output = explode( "\n", $output );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $verdict = true;
+ $results = [];
+ $results_by_type = [];
+ $output = explode( "\n", $output );
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( array_chunk( $output, 3 ) as $file_result ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! str_starts_with( $file_result[0], 'FILE:' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -777,6 +779,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $results[] = $record;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $results_by_type[ $record['type'] ] ??= [];
+ $results_by_type[ $record['type'] ][] = $record;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Record submission stats.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( function_exists( 'bump_stats_extra' ) && 'production' === wp_get_environment_type() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> bump_stats_extra( 'plugin-check-' . $record['type'], $record['code'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -797,20 +802,44 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $results ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $html .= '<ul class="pc-result" style="list-style: disc">';
</span><span class="cx" style="display: block; padding: 0 10px"> // Display errors, and then warnings.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach ( [ wp_list_filter( $results, [ 'type' => 'ERROR' ] ), wp_list_filter( $results, [ 'type' => 'ERROR' ], 'NOT' ) ] as $result_set ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( [ 'ERROR', 'ERRORS_LOW_SEVERITY', 'WARNING', 'WARNING_LOW_SEVERITY' ] as $result_type ) {
+ $result_set = $results_by_type[ $result_type ] ?? [];
+ if ( empty( $result_set ) ) {
+ continue;
+ }
+
+ // ERROR or WARNING
+ $result_label = str_replace(
+ [
+ 'S_LOW_SEVERITY', // S included because of the pluralisation.
+ '_LOW_SEVERITY'
+ ],
+ '',
+ $result_type
+ );
+
+ $maybe_false_positive = '';
+ if ( str_ends_with( $result_type, 'LOW_SEVERITY' ) ) {
+ $result_label .= '*';
+ $maybe_false_positive = __( 'This may be a false-positive, and will be manually checked by a reviewer.', 'wporg-plugins' );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $result_set as $result ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $html .= sprintf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<li>%s <a href="%s">%s</a>: %s</li>',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<li>%s <a href="%s" title="%s">%s</a>: %s</li>',
</ins><span class="cx" style="display: block; padding: 0 10px"> esc_html( $result['file'] ),
</span><span class="cx" style="display: block; padding: 0 10px"> esc_url( $result['docs'] ?? '' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- esc_html( $result['type'] . ' ' . $result['code'] ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ esc_attr( $maybe_false_positive ),
+ esc_html( "{$result_label}: {$result['code']}" ),
</ins><span class="cx" style="display: block; padding: 0 10px"> esc_html( $result['message'] )
</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><span class="cx" style="display: block; padding: 0 10px"> $html .= '</ul>';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $html .= '<p>' . __( 'The above may contain false-positives. If you believe an error or warning is incorrect or a false-positive, please do not work around it. A reviewer will manually confirm this during the review process.', 'wporg-plugins' ) . '</p>';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $html .= __( 'Note: While the automated plugin scan is based on the Plugin Review Guidelines, it is not a complete review. A successful result from the scan does not guarantee that the plugin will be approved, only that it is sufficient to be reviewed. All submitted plugins are checked manually to ensure they meet security and guideline standards before approval.', 'wporg-plugins' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $html .= '<p>' . __( 'Note: While the automated plugin scan is based on the Plugin Review Guidelines, it is not a complete review. A successful result from the scan does not guarantee that the plugin will be approved, only that it is sufficient to be reviewed. All submitted plugins are checked manually to ensure they meet security and guideline standards before approval.', 'wporg-plugins' ) . '</p>';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If the upload is blocked; log it to slack.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $verdict ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -858,7 +887,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Log plugin-check timing out.
</span><span class="cx" style="display: block; padding: 0 10px"> $zip_name = reset( $_FILES )['name'];
</span><span class="cx" style="display: block; padding: 0 10px"> $output = implode( "\n", $output );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $text = ":rotating_light: Error: {$return_code} for {$zip_name}: {$this->plugin['Name']} ({$this->plugin_slug}) took {$total_time}s\n```{$stderr}\n===\n{$output}```";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $debug = '';
+ if ( $output || $stderr ) {
+ $debug = trim( "{$output}\n===\n{$stderr}", "\n=" );
+ $debug = "\n```{$debug}```";
+ }
+ $text = ":rotating_light: Error: {$return_code} for {$zip_name}: {$this->plugin['Name']} ({$this->plugin_slug}) took {$total_time}s{$debug}";
</ins><span class="cx" style="display: block; padding: 0 10px"> notify_slack( PLUGIN_CHECK_LOGS_SLACK_CHANNEL, $text, wp_get_current_user(), true );
</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>