<!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>[9994] sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory: Block plugin validator tool.</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/9994">9994</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/9994","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>tellyworth</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-07-02 07:27:51 +0000 (Thu, 02 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'>Block plugin validator tool.
See also <a href="http://meta.trac.wordpress.org/changeset/9993">r9993</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryclassplugindirectoryphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-directory.php</a></li>
<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_htmlwpcontentpluginsplugindirectorycliclassimportphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/cli/class-import.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectorybincheckblockphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/bin/check-block.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectorybincheckblockphp"></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/plugin-directory/bin/check-block.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/bin/check-block.php (rev 0)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/bin/check-block.php 2020-07-02 07:27:51 UTC (rev 9994)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,102 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+namespace WordPressdotorg\Plugin_Directory;
+
+use WordPressdotorg\Plugin_Directory\CLI\Block_Plugin_Checker;
+
+// This script should only be called in a CLI environment.
+if ( 'cli' != php_sapi_name() ) {
+ die();
+}
+
+$opts = getopt( '', array( 'post:', 'url:', 'abspath:', 'slug:', 'all' ) );
+
+if ( empty( $opts['url'] ) ) {
+ $opts['url'] = 'https://wordpress.org/plugins/';
+}
+if ( empty( $opts['abspath'] ) && false !== strpos( __DIR__, 'wp-content' ) ) {
+ $opts['abspath'] = substr( __DIR__, 0, strpos( __DIR__, 'wp-content' ) );
+}
+
+// Bootstrap WordPress
+$_SERVER['HTTP_HOST'] = parse_url( $opts['url'], PHP_URL_HOST );
+$_SERVER['REQUEST_URI'] = parse_url( $opts['url'], PHP_URL_PATH );
+
+require rtrim( $opts['abspath'], '/' ) . '/wp-load.php';
+
+if ( ! class_exists( '\WordPressdotorg\Plugin_Directory\Plugin_Directory' ) ) {
+ fwrite( STDERR, "Error! This site doesn't have the Plugin Directory plugin enabled.\n" );
+ if ( defined( 'WPORG_PLUGIN_DIRECTORY_BLOGID' ) ) {
+ fwrite( STDERR, "Run the following command instead:\n" );
+ fwrite( STDERR, "\tphp " . implode( ' ', $argv ) . ' --url ' . get_site_url( WPORG_PLUGIN_DIRECTORY_BLOGID, '/' ) . "\n" );
+ }
+ die();
+}
+
+if ( !empty( $opts['slug'] ) ) {
+ $args = array(
+ 'post_type' => 'plugin',
+ 'post_status' => 'publish',
+ 'posts_per_page' => 1,
+ 'name' => $opts['slug'],
+ 'tax_query' => array(
+ array(
+ 'taxonomy' => 'plugin_section',
+ 'field' => 'slug',
+ 'terms' => 'block',
+ ),
+ ),
+ );
+} else {
+
+ $args = array(
+ 'post_type' => 'plugin',
+ 'post_status' => 'publish',
+ 'nopaging' => true,
+ 'tax_query' => array(
+ array(
+ 'taxonomy' => 'plugin_section',
+ 'field' => 'slug',
+ 'terms' => 'block',
+ ),
+ ),
+ );
+}
+$query = new \WP_Query( $args );
+
+$count_plugins = $count_new_plugins = $count_checked = $count_blocks = $count_block_json = 0;
+$good_plugins = $error_plugins = array();
+while ( $query->have_posts() ) {
+ ++ $count_checked;
+ $query->the_post();
+ $plugin = get_post();
+
+ echo "Checking $plugin->post_name\n";
+
+ $url = 'https://plugins.svn.wordpress.org/' . $plugin->post_name . '/tags/' . $plugin->stable_tag;
+
+ $checker = new Block_Plugin_Checker( $plugin->post_name );
+ $results = $checker->run_check_plugin_repo( $url );
+
+ foreach ( $results as $item ) {
+ echo "$item->type\t$item->check_name\t$item->message\n";
+ if ( $item->data ) {
+ print_r( $item->data );
+ echo "\n";
+ }
+
+ if ( 'error' === $item->type ) {
+ $error_plugins[] = $plugin->post_name;
+ }
+ }
+
+ $error_plugins = array_unique( $error_plugins );
+ if ( !in_array( $plugin->post_name, $error_plugins ) )
+ $good_plugins[] = $plugin->post_name;
+
+}
+
+echo "Good plugins:\n" . join( "\n", $good_plugins ) . "\n\n";
+echo "Problem plugins:\n" . join( "\n", $error_plugins ) . "\n\n";
+
+echo "Checked: " . number_format( $count_checked) . "\n";
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/bin/check-block.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><a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryclassplugindirectoryphp"></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/class-plugin-directory.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/class-plugin-directory.php 2020-07-02 07:12:48 UTC (rev 9993)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-directory.php 2020-07-02 07:27:51 UTC (rev 9994)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -575,6 +575,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_shortcode( 'wporg-plugins-screenshots', array( __NAMESPACE__ . '\Shortcodes\Screenshots', 'display' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> add_shortcode( 'wporg-plugins-reviews', array( __NAMESPACE__ . '\Shortcodes\Reviews', 'display' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> add_shortcode( 'readme-validator', array( __NAMESPACE__ . '\Shortcodes\Readme_Validator', 'display' ) );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_shortcode( 'block-validator', array( __NAMESPACE__ . '\Shortcodes\Block_Validator', 'display' ) );
</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">@@ -590,6 +591,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'wporg-plugins-screenshots',
</span><span class="cx" style="display: block; padding: 0 10px"> 'wporg-plugins-reviews',
</span><span class="cx" style="display: block; padding: 0 10px"> 'readme-validator',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'block-validator',
</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"> $not_allowed_shortcodes = array_diff( array_keys( $shortcode_tags ), $allowed_shortcodes );
</span></span></pre></div>
<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-02 07:12:48 UTC (rev 9993)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/cli/class-block-plugin-checker.php 2020-07-02 07:27:51 UTC (rev 9994)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -140,7 +140,7 @@
</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"> // Generate a unique tmp file directory name, but don't create it.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $path = Filesystem::temp_directory( '/tmp/blockplugin' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $path = Filesystem::temp_directory( 'blockplugin' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $export = SVN::export( $svn_url, $path, array( 'ignore-externals', 'force' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $export['result'] ) {
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectorycliclassimportphp"></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-import.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-import.php 2020-07-02 07:12:48 UTC (rev 9993)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/cli/class-import.php 2020-07-02 07:27:51 UTC (rev 9994)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4,6 +4,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> use Exception;
</span><span class="cx" style="display: block; padding: 0 10px"> use WordPressdotorg\Plugin_Directory\Jobs\API_Update_Updater;
</span><span class="cx" style="display: block; padding: 0 10px"> use WordPressdotorg\Plugin_Directory\Jobs\Tide_Sync;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+use WordPressdotorg\Plugin_Directory\Block_JSON;
</ins><span class="cx" style="display: block; padding: 0 10px"> use WordPressdotorg\Plugin_Directory\Plugin_Directory;
</span><span class="cx" style="display: block; padding: 0 10px"> use WordPressdotorg\Plugin_Directory\Readme\Parser;
</span><span class="cx" style="display: block; padding: 0 10px"> use WordPressdotorg\Plugin_Directory\Template;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -567,8 +568,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string The plugin readme.txt or readme.md filename.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- protected function find_readme_file( $directory ) {
- $files = Filesystem::list_files( $directory, false /* non-recursive */, '!^readme\.(txt|md)$!i' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ static function find_readme_file( $directory ) {
+ $files = Filesystem::list_files( $directory, false /* non-recursive */, '!(?:^|/)readme\.(txt|md)$!i' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // prioritize readme.txt
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $files as $f ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -587,7 +588,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return object The plugin headers.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- protected function find_plugin_headers( $directory ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ static function find_plugin_headers( $directory ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $files = Filesystem::list_files( $directory, false, '!\.php$!i' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! function_exists( 'get_plugin_data' ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -625,7 +626,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array An array of objects representing blocks, corresponding to the block.json format where possible.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- protected function find_blocks_in_file( $filename ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ static function find_blocks_in_file( $filename ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $ext = strtolower( pathinfo($filename, PATHINFO_EXTENSION) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -658,10 +659,26 @@
</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 ( 'block.json' === basename( $filename ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // A block.json file has everything we want.
- $blockinfo = json_decode( file_get_contents( $filename ) );
- if ( isset( $blockinfo->name ) && isset( $blockinfo->title ) ) {
- $blocks[] = $blockinfo;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // A block.json file should have everything we want.
+ $validator = new Block_JSON\Validator();
+ $block = Block_JSON\Parser::parse( array( 'file' => $filename ) );
+ $result = $validator->validate( $block );
+ if ( ! is_wp_error( $block ) && is_wp_error( $result ) ) {
+ // Only certain properties must be valid for our purposes here.
+ $required_valid_props = array(
+ 'block.json',
+ 'block.json:editorScript',
+ 'block.json:editorStyle',
+ 'block.json:name',
+ 'block.json:script',
+ 'block.json:style',
+ );
+ $invalid_props = array_intersect( $required_valid_props, $result->get_error_data( 'error' ) );
+ if ( empty( $invalid_props ) ) {
+ $blocks[] = $block;
+ }
+ } elseif ( true === $result ) {
+ $blocks[] = $block;
</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">@@ -676,7 +693,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- protected function extract_file_paths_from_block_json( $parsed_json, $block_json_path = '' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ static function extract_file_paths_from_block_json( $parsed_json, $block_json_path = '' ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $files = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $props = array( 'editorScript', 'script', 'editorStyle', 'style' );
</span></span></pre>
</div>
</div>
</body>
</html>