<!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>[10101] sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/cli/class-block-plugin-checker.php: Plugin Directory: Improve block script 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/10101">10101</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/10101","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-27 21:09:56 +0000 (Mon, 27 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: Improve block script check
Use the `block_assets` property, which gets the same files that are used by the block directory code. This also fixes a path issue with relative assets defined in block.json, since these files are normalized by the `find_block_assets` call.</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>
</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-27 06:14:28 UTC (rev 10100)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/cli/class-block-plugin-checker.php 2020-07-27 21:09:56 UTC (rev 10101)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -37,7 +37,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> protected $asset_php_files = null;
</span><span class="cx" style="display: block; padding: 0 10px"> protected $block_json_validation = array();
</span><span class="cx" style="display: block; padding: 0 10px"> protected $block_assets = array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- protected $block_scripts = array();
</del><span class="cx" style="display: block; padding: 0 10px"> protected $php_function_calls = array();
</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">@@ -264,7 +263,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->asset_php_files = $this->find_asset_php_files( $this->path_to_plugin );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->block_assets = $this->find_block_assets( $this->path_to_plugin );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->block_scripts = $this->find_block_scripts( $this->path_to_plugin );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->php_function_calls = $this->find_php_functions( $this->path_to_plugin );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -327,38 +325,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $block_assets;
</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">- public function find_block_scripts( $base_dir ) {
-
- $block_scripts = \array_map(
- function( $block ) {
- $assets = array();
- $props = array( 'editorScript', 'script', 'editorStyle', 'style' );
-
- foreach ( $props as $prop ) {
- if ( isset( $block->$prop ) ) {
- $assets[ $prop ] = $block->$prop;
- }
- }
-
- // If no block.json data was found, try to guess.
- if ( empty( $assets ) ) {
- // If js or css assets were found, assume we can use the first one.
- if ( !empty( $this->block_assets[ 'js' ] ) ) {
- $assets[ 'script' ] = reset( $this->block_assets[ 'js' ] );
- }
-
- if ( !empty( $this->block_assets[ 'css' ] ) ) {
- $assets[ 'style' ] = reset( $this->block_assets[ 'css' ] );
- }
- }
- return $assets;
- },
- $this->blocks
- );
-
- return $block_scripts;
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Find index.asset.php files as generated by the create block scripts.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -683,15 +649,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Do the script files all exist?
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function check_for_block_script_files() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $seen_scripts = array();
- foreach ( $this->block_scripts as $block_name => $scripts ) {
- foreach ( $scripts as $kind => $script ) {
- // No need to warn multiple times for the same value.
- if ( in_array( $script, $seen_scripts ) ) {
- continue;
- }
- $seen_scripts[] = $script;
- $file_path = trailingslashit( $this->path_to_plugin ) . str_replace( 'file:', '', $script );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $this->block_assets as $kind => $scripts ) {
+ foreach ( $scripts as $script ) {
+ $file_path = trailingslashit( $this->path_to_plugin ) . $script;
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( file_exists( $file_path ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->record_result(
</span><span class="cx" style="display: block; padding: 0 10px"> __FUNCTION__,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -703,10 +663,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> // translators: %s is the file name.
</span><span class="cx" style="display: block; padding: 0 10px"> $message = __( 'Expected %s to be a valid file path.', 'wporg-plugins' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $kind, array( 'editorScript', 'script' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'js' === $kind ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // translators: %s is the file name.
</span><span class="cx" style="display: block; padding: 0 10px"> $message = __( 'Expected %s to be a valid JavaScript file path.', 'wporg-plugins' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( in_array( $kind, array( 'editorStyle', 'style' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else if ( 'css' === $kind ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // translators: %s is the file name.
</span><span class="cx" style="display: block; padding: 0 10px"> $message = __( 'Expected %s to be a valid CSS file path.', 'wporg-plugins' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>