<!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>[10065] sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory: Plugin Directory: Update duplicate block name check</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/10065">10065</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/10065","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>ryelle</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-07-13 19:40:02 +0000 (Mon, 13 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'>Plugin Directory: Update duplicate block name check
Switches the check to flag an error if we find the block name in a different repo plugin, or a warning if the found block has the same author.
See <a href="http://meta.trac.wordpress.org/ticket/5303">#5303</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectorycliclassblockplugincheckerphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/cli/class-block-plugin-checker.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryshortcodesclassblockvalidatorphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-block-validator.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectorycliclassblockplugincheckerphp"></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/cli/class-block-plugin-checker.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/cli/class-block-plugin-checker.php 2020-07-11 16:04:59 UTC (rev 10064)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/cli/class-block-plugin-checker.php 2020-07-13 19:40:02 UTC (rev 10065)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -399,12 +399,15 @@
</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"> * Does the plugin have a block name that already exists in the DB?
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Note that this isn't a blocker if we're re-running checks on a plugin that has already been uploaded, since it will match with itself.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Note that this does not flag a match if we can tell it's the same plugin already in the repo. It will only
+ * trigger a warning if we identify the matched plugin to be the same author, and will trigger an error in all
+ * other cases.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function check_for_duplicate_block_name() {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $this->blocks as $block ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !trim( strval( $block->name ) ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! trim( strval( $block->name ) ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $query_args = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'plugin',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -412,19 +415,27 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'key' => 'block_name',
</span><span class="cx" style="display: block; padding: 0 10px"> 'value' => $block->name,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- )
- )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ ),
</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"> $query = new \WP_Query( $query_args );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $query->found_posts > 0 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $query->posts as $post ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $this->slug && $this->slug === $post->post_name )
- continue; // It's this very same plugin
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $this->slug && $this->slug === $post->post_name ) {
+ continue; // It's this very same plugin.
+ }
</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->record_result( __FUNCTION__,
- 'info',
- sprintf( __( 'Block name %s already exists in plugin %s.', 'wporg-plugins' ), $block->name, $query->posts[0]->post_name ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->record_result(
+ __FUNCTION__,
+ // Check the author, since this might be the same plugin hosted on github.
+ ( get_current_user_id() === $post->post_author ) ? 'warning' : 'error',
+ sprintf(
+ // translators: %1$s is the block slug, %2$s is the found plugin title.
+ __( 'Block name %1$s already exists in the plugin "%2$s."', 'wporg-plugins' ),
+ '<code>' . $block->name . '</code>',
+ $query->posts[0]->post_title
+ ),
</ins><span class="cx" style="display: block; padding: 0 10px"> [ 'block_name' => $block->name, 'slug' => $post->post_name ]
</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="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryshortcodesclassblockvalidatorphp"></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-block-validator.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-block-validator.php 2020-07-11 16:04:59 UTC (rev 10064)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-block-validator.php 2020-07-13 19:40:02 UTC (rev 10065)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -191,7 +191,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $output .= "<div class='notice notice-{$type} notice-alt'>\n";
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $results_by_type[ $type ] as $item ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Only get details if this is a warning or error.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $details = ( 'info' === $type ) ? false : self::get_detailed_help( $item->check_name );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $details = ( 'info' === $type ) ? false : self::get_detailed_help( $item->check_name, $item );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $details ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $details = '<p>' . implode( '</p><p>', (array) $details ) . '</p>';
</span><span class="cx" style="display: block; padding: 0 10px"> $output .= "<details class='{$item->check_name}'><summary>{$item->message}</summary>{$details}</details>";
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -225,10 +225,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Get a more detailed help message for a given check.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $method The name of the check method.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array $result The full result data.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string|array More details for a given block issue. Array of strings if there should be a linebreak.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public static function get_detailed_help( $method ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public static function get_detailed_help( $method, $result ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> switch ( $method ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // These don't need more details.
</span><span class="cx" style="display: block; padding: 0 10px"> case 'check_readme_exists':
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -241,10 +242,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> case 'check_block_tag':
</span><span class="cx" style="display: block; padding: 0 10px"> return __( 'The readme.txt file must contain the tag "block" (singular) for this to be added to the block directory.', 'wporg-plugins' );
</span><span class="cx" style="display: block; padding: 0 10px"> case 'check_for_duplicate_block_name':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return [
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $details = [
</ins><span class="cx" style="display: block; padding: 0 10px"> __( "Block names must be unique, otherwise it can cause problems when using the block. It is recommended to use your plugin's name as the namespace.", 'wporg-plugins' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<em>' . __( 'If this is a different version of your own plugin, you can ignore this warning.', 'wporg-plugins' ) . '</em>',
</del><span class="cx" style="display: block; padding: 0 10px"> ];
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'warning' === $result->type ) {
+ $details[] = '<em>' . __( 'If this is a different version of your own plugin, you can ignore this warning.', 'wporg-plugins' ) . '</em>';
+ }
+ return $details;
</ins><span class="cx" style="display: block; padding: 0 10px"> case 'check_for_blocks':
</span><span class="cx" style="display: block; padding: 0 10px"> return [
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'In order to work in the Block Directory, a plugin must register a block. Generally one per plugin (multiple blocks may be permitted if those blocks are interdependent, such as a list block that contains list item blocks).', 'wporg-plugins' ),
</span></span></pre>
</div>
</div>
</body>
</html>