<!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>[10038] sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory: Plugin Directory: Clean up block validation form & result messages.</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/10038">10038</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/10038","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-08 22:00:30 +0000 (Wed, 08 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: Clean up block validation form & result messages.
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-08 17:41:19 UTC (rev 10037)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/cli/class-block-plugin-checker.php 2020-07-08 22:00:30 UTC (rev 10038)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -307,7 +307,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'check_name' => $check_name,
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => $type,
</span><span class="cx" style="display: block; padding: 0 10px"> 'message' => $message,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'data' => $data );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'data' => $data,
+ );
</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">@@ -318,8 +319,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Readme.txt file must be present.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function check_readme_exists() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( empty( $this->readme_path ) || !file_exists( $this->readme_path ) ) {
- $this->record_result( __FUNCTION__,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $this->readme_path ) || ! file_exists( $this->readme_path ) ) {
+ $this->record_result(
+ __FUNCTION__,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'error',
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Missing readme.txt file.', 'wporg-plugins' ),
</span><span class="cx" style="display: block; padding: 0 10px"> $this->relative_filename( $this->readme_path )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -332,19 +334,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function check_license() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $this->readme->license ) && empty( $this->headers->License ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->record_result( __FUNCTION__,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->record_result(
+ __FUNCTION__,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'warning',
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'No plugin license was found.', 'wporg-plugins' )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( !empty( $this->readme->license ) ) {
- $this->record_result( __FUNCTION__,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( ! empty( $this->readme->license ) ) {
+ $this->record_result(
+ __FUNCTION__,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'info',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // translators: %s is the license.
</ins><span class="cx" style="display: block; padding: 0 10px"> sprintf( __( 'Found a license in readme.txt: %s.', 'wporg-plugins' ), $this->readme->license ),
</span><span class="cx" style="display: block; padding: 0 10px"> $this->readme->license
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( !empty( $this->headers->License ) ) {
- $this->record_result( __FUNCTION__,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( ! empty( $this->headers->License ) ) {
+ $this->record_result(
+ __FUNCTION__,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'info',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // translators: %s is the license.
</ins><span class="cx" style="display: block; padding: 0 10px"> sprintf( __( 'Found a license in plugin headers: %s.', 'wporg-plugins' ), $this->headers->License ),
</span><span class="cx" style="display: block; padding: 0 10px"> $this->headers->License
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -356,7 +363,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function check_plugin_headers() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $this->headers ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->record_result( __FUNCTION__,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->record_result(
+ __FUNCTION__,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'error',
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Missing plugin headers. Is this a WordPress plugin?', 'wporg-plugins' )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -368,15 +376,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function check_block_tag() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $this->readme->tags ) || ! in_array( 'block', array_map( 'strtolower', $this->readme->tags ) ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->record_result( __FUNCTION__,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->record_result(
+ __FUNCTION__,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'warning',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'No block tag found in readme.txt.', 'wporg-plugins' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __( 'No "block" tag found in readme.txt.', 'wporg-plugins' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->readme->tags
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->record_result( __FUNCTION__,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->record_result(
+ __FUNCTION__,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'info',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'Found a block tag in readme.txt.', 'wporg-plugins' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __( 'Found the "block" tag in readme.txt.', 'wporg-plugins' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->readme->tags
</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">@@ -415,7 +425,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">-
</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">@@ -423,14 +432,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function check_for_blocks() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 0 === count( $this->blocks ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->record_result( __FUNCTION__,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->record_result(
+ __FUNCTION__,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'error',
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'No blocks found in plugin.', 'wporg-plugins' )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->record_result( __FUNCTION__,
- ( count( $this->blocks ) < 5 ? 'info' : 'warning' ), // 5+ blocks suggests it's probably not a block plugin
- sprintf( _n( 'Found %d block.', 'Found %d blocks.', count( $this->blocks ), 'wporg-plugins' ), count( $this->blocks ) ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->record_result(
+ __FUNCTION__,
+ 'info',
+ sprintf(
+ // translators: %d number of blocks.
+ _n( 'Found %d block.', 'Found %d blocks.', count( $this->blocks ), 'wporg-plugins' ),
+ count( $this->blocks )
+ ),
</ins><span class="cx" style="display: block; padding: 0 10px"> array_keys( $this->blocks )
</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">@@ -441,10 +456,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function check_for_block_json() {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $this->blocks as $block_name => $block_info ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !empty( $this->block_json_files[ $block_name ] ) ) {
- $this->record_result( __FUNCTION__,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $this->block_json_files[ $block_name ] ) ) {
+ $this->record_result(
+ __FUNCTION__,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'info',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- sprintf( __( 'block.json file exists for block %s.', 'wporg-plugins' ), $block_name ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // translators: %s is the block name.
+ sprintf( __( 'Found a block.json file for block %s.', 'wporg-plugins' ), '<code>' . $block_name . '</code>' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->block_json_files[ $block_name ]
</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">@@ -451,7 +468,8 @@
</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"> if ( empty( $this->block_json_files ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->record_result( __FUNCTION__,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->record_result(
+ __FUNCTION__,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'warning',
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'No block.json files were found.', 'wporg-plugins' )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -465,16 +483,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $block_scripts = $this->find_block_scripts();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $this->blocks as $block_name => $block_info ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !empty( $block_scripts[ $block_name ] ) ) {
- $this->record_result( __FUNCTION__,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $block_scripts[ $block_name ] ) ) {
+ $this->record_result(
+ __FUNCTION__,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'info',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- sprintf( __( 'Scripts found for block %s.', 'wporg-plugins' ), $block_name ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // translators: %s is the block name.
+ sprintf( __( 'Scripts found for block %s.', 'wporg-plugins' ), '<code>' . $block_name . '</code>' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> $block_scripts[ $block_name ]
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->record_result( __FUNCTION__,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->record_result(
+ __FUNCTION__,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'warning',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- sprintf( __( 'No scripts found for block %s.', 'wporg-plugins' ), $block_name ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // translators: %s is the block name.
+ sprintf( __( 'No scripts found for block %s.', 'wporg-plugins' ), '<code>' . $block_name . '</code>' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> $block_name
</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">@@ -488,15 +510,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $this->find_block_scripts() as $block_name => $scripts ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $scripts as $script ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( file_exists( $this->path_to_plugin . $script ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->record_result( __FUNCTION__,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->record_result(
+ __FUNCTION__,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'info',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- sprintf( __( 'Script file exists for block %s.', 'wporg-plugins' ), $block_name ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // translators: %s is the block name.
+ sprintf( __( 'Script file exists for block %s.', 'wporg-plugins' ), '<code>' . $block_name . '</code>' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> $script
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->record_result( __FUNCTION__,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->record_result(
+ __FUNCTION__,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'warning',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- sprintf( __( 'Missing script file for block %s.', 'wporg-plugins' ), $block_name ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // translators: %s is the block name.
+ sprintf( __( 'Missing script file for block %s.', 'wporg-plugins' ), '<code>' . $block_name . '</code>' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> $script
</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">@@ -519,7 +545,8 @@
</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"> if ( empty( $block_files ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->record_result( __FUNCTION__,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->record_result(
+ __FUNCTION__,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'error',
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf( __( '<code>registerBlockType()</code> must be called in a JavaScript file.', 'wporg-plugins' ) )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -533,9 +560,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $this->block_json_validation as $block_json_file => $result ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_wp_error( $result ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $message = $result->get_error_message( 'json_parse_error' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->record_result( __FUNCTION__,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->record_result(
+ __FUNCTION__,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'error',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- sprintf( __( 'Error attempting to parse json in %s: %s', 'wporg-plugins' ), $this->relative_filename( $block_json_file ), $message ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ sprintf(
+ // translators: %1$s is the file name, %2$s is the json error message.
+ __( 'Error attempting to parse json in %1$s: %2$s', 'wporg-plugins' ),
+ '<code>' . $this->relative_filename( $block_json_file ) . '</code>',
+ $message
+ ),
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->relative_filename( $block_json_file )
</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">@@ -549,9 +582,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function check_block_json_is_valid() {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $this->block_json_validation as $block_json_file => $result ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( true === $result ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->record_result( __FUNCTION__,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->record_result(
+ __FUNCTION__,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'info',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- sprintf( __( 'JSON file %s is valid.', 'wporg-plugins' ), $this->relative_filename( $block_json_file ) ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // translators: %s is the file name.
+ sprintf( __( 'JSON file %s is valid.', 'wporg-plugins' ), '<code>' . $this->relative_filename( $block_json_file ) . '</code>' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->relative_filename( $block_json_file )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -563,12 +598,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'json_parse_error' === $code ) {
</span><span class="cx" style="display: block; padding: 0 10px"> continue; // Already handled in check_block_json_is_valid_json
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->record_result( __FUNCTION__,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->record_result(
+ __FUNCTION__,
</ins><span class="cx" style="display: block; padding: 0 10px"> ( 'error' === $code ? 'warning' : $code ), // TODO: be smarter about mapping these
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->relative_filename( $block_json_file ) . ': ' . $message,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<code>' . $this->relative_filename( $block_json_file ) . '</code>: ' . $message,
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> $this->relative_filename( $block_json_file ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $result->get_error_data( $code )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $result->get_error_data( $code ),
</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">@@ -589,14 +625,21 @@
</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"> if ( 1 === $count ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->record_result( __FUNCTION__,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->record_result(
+ __FUNCTION__,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'info',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- sprintf( __( 'PHP asset file found: %s.', 'wporg-plugins' ), $this->relative_filename( $file ) ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // translators: %s is the name of asset file.
+ sprintf(
+ __( 'PHP asset file found: %s.', 'wporg-plugins' ),
+ '<code>' . $this->relative_filename( $file ) . '</code>'
+ ),
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->relative_filename( $file )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $count > 1 ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->record_result( __FUNCTION__,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->record_result(
+ __FUNCTION__,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'warning',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // translators: %s is the number of asset files.
</ins><span class="cx" style="display: block; padding: 0 10px"> sprintf( __( 'Found %s PHP asset files.', 'wporg-plugins' ), $count ),
</span><span class="cx" style="display: block; padding: 0 10px"> array_map( null, array( $this->relative_filename( $file ) ), $this->asset_php_files )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -613,20 +656,26 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $total_size += filesize( $file );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $total_size > 50 * KB_IN_BYTES ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->record_result( __FUNCTION__,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->record_result(
+ __FUNCTION__,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'error',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // translators: %s is the size of PHP code.
</ins><span class="cx" style="display: block; padding: 0 10px"> sprintf( __( 'Found %s of PHP code. Please submit PHP plugins to the plugin directory.', 'wporg-plugins' ), size_format( $total_size ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> $total_size
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $total_size > 10 * KB_IN_BYTES ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->record_result( __FUNCTION__,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->record_result(
+ __FUNCTION__,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'warning',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // translators: %s is the size of PHP code.
</ins><span class="cx" style="display: block; padding: 0 10px"> sprintf( __( 'Found %s of PHP code. This might not be a block plugin.', 'wporg-plugins' ), size_format( $total_size ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> $total_size
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->record_result( __FUNCTION__,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->record_result(
+ __FUNCTION__,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'info',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // translators: %s is the size of PHP code.
</ins><span class="cx" style="display: block; padding: 0 10px"> sprintf( __( 'Found %s of PHP code. Thanks for keeping it minimal!', 'wporg-plugins' ), size_format( $total_size ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> $total_size
</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-08 17:41:19 UTC (rev 10037)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-block-validator.php 2020-07-08 22:00:30 UTC (rev 10038)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -14,23 +14,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $plugin_url = $_REQUEST['plugin_url'] ?? '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_user_logged_in() ) :
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ?>
- <div class="wrap">
- <form method="post" action=".">
- <p>
- <label for="plugin_url"><?php _e( 'Plugin repo URL', 'wporg-plugins' ); ?></label>
- </p>
- <p>
- <input type="text" id="plugin_url" name="plugin_url" size="70" placeholder="https://plugins.svn.wordpress.org/" value="<?php echo esc_attr( $plugin_url ); ?>" />
- <input type="submit" class="button button-secondary" value="<?php esc_attr_e( 'Validate!', 'wporg-plugins' ); ?>" />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
+
+ <div class="wrap block-validator">
+ <form method="post" action="." class="block-validator__plugin-form">
+ <label for="plugin_url"><?php _e( 'Plugin repo URL', 'wporg-plugins' ); ?></label>
+ <div class="block-validator__plugin-input-container">
+ <input type="text" class="block-validator__plugin-input" id="plugin_url" name="plugin_url" placeholder="https://plugins.svn.wordpress.org/" value="<?php echo esc_attr( $plugin_url ); ?>" />
+ <input type="submit" class="button button-secondary block-validator__plugin-submit" value="<?php esc_attr_e( 'Validate!', 'wporg-plugins' ); ?>" />
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php wp_nonce_field( 'validate-block-plugin', 'block-nonce' ); ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- </p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ </div>
</ins><span class="cx" style="display: block; padding: 0 10px"> </form>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $_POST && !empty( $_POST['plugin_url'] ) && wp_verify_nonce( $_POST['block-nonce'], 'validate-block-plugin' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $_POST && ! empty( $_POST['plugin_url'] ) && wp_verify_nonce( $_POST['block-nonce'], 'validate-block-plugin' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> self::validate_block( $_POST['plugin_url'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( $_POST && !empty( $_POST['block-directory-edit'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( $_POST && ! empty( $_POST['block-directory-edit'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( intval( $_POST['plugin-id'] ) );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $post && wp_verify_nonce( $_POST['block-directory-nonce'], 'block-directory-edit-' . $post->ID ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( current_user_can( 'edit_post', $post->ID ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -48,8 +47,8 @@
</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"> </div>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php else: ?>
- <div class="wrap">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php else : ?>
+ <div class="wrap block-validator">
</ins><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'Please log in to use the validator.', 'wporg-plugins' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -122,15 +121,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $output .= '<h3>' . __( 'Success', 'wporg-plugins' ) . '</h3>';
</span><span class="cx" style="display: block; padding: 0 10px"> $output .= "<div class='notice notice-success notice-alt'>\n";
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $checker->slug && self::plugin_is_in_block_directory( $checker->slug ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $output .= __( 'No problems were found. This plugin is already in the Block Directory.', 'wporg-plugins' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $output .= '<p>' . __( 'No problems were found. This plugin is already in the Block Directory.', 'wporg-plugins' ) . '</p>';
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $output .= __( 'No problems were found. Your plugin has passed the first step towards being included in the Block Directory.', 'wporg-plugins' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $output .= '<p>' . __( 'No problems were found. Your plugin has passed the first step towards being included in the Block Directory.', 'wporg-plugins' ) . '</p>';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $output .= "</div>\n";
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $output .= '<h3>' . __( 'Problems were encountered', 'wporg-plugins' ) . '</h3>';
</span><span class="cx" style="display: block; padding: 0 10px"> $output .= "<div class='notice notice-error notice-alt'>\n";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $output .= __( 'Some problems were found. They need to be addressed before your plugin will work in the Block Directory.', 'wporg-plugins' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $output .= '<p>' . __( 'Some problems were found. They need to be addressed before your plugin will work in the Block Directory.', 'wporg-plugins' ) . '</p>';
</ins><span class="cx" style="display: block; padding: 0 10px"> $output .= "</div>\n";
</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>