<!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>[56776] branches/6.3/tests/phpunit/tests/blocks/register.php: Editor: Fix loading of assets in blocks in child themes where the directory name starts with the parent theme's directory name.</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="https://core.trac.wordpress.org/changeset/56776">56776</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/56776","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>audrasjb</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2023-10-04 18:45:16 +0000 (Wed, 04 Oct 2023)</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'>Editor: Fix loading of assets in blocks in child themes where the directory name starts with the parent theme's directory name.
Props lgladdy, masteradhoc, audrasjb, rajinsharwar, azaozz.
Merges <a href="https://core.trac.wordpress.org/changeset/56527">[56527]</a> to the 6.3 branch.
Fixes <a href="https://core.trac.wordpress.org/ticket/59018">#59018</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches63srcwpincludesblocksphp">branches/6.3/src/wp-includes/blocks.php</a></li>
<li><a href="#branches63testsphpunittestsblocksregisterphp">branches/6.3/tests/phpunit/tests/blocks/register.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches63">branches/6.3/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/6.3
</span><span class="cx" style="display: block; padding: 0 10px">===================================================================
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- branches/6.3 2023-10-04 17:00:12 UTC (rev 56775)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/6.3 2023-10-04 18:45:16 UTC (rev 56776)
</ins><a id="branches63"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/6.3</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: svn:mergeinfo</h4></div>
<span class="cx" style="display: block; padding: 0 10px"> /branches/5.0:43681-43682,43684-43688,43719-43720,43723,43726-43727,43729-43731,43734-43744,43747,43751-43754,43758,43760-43765,43767-43770,43772,43774-43781,43783,43785,43790-43806,43808-43821,43825,43828,43830-43834,43836-43843,43846-43863,43867-43889,43891-43894,43897-43905,43908-43909,43911-43929,43931-43942,43946-43947,43949-43956,43959-43964,43967-43969,43988,43994,44014,44017,44047,44183,44185,44187-44206,44208-44213,44231-44232,44235,44248,44284,44287-44288
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/5.5:49373-49379,49381
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/5.8:51889
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/trunk:56268,56272,56277,56279,56282,56284,56287,56290-56292,56296,56298,56300,56302,56308-56309,56311,56315,56320,56327,56329,56332,56335,56337,56339,56341,56350,56358,56365,56381,56386,56401,56417,56422,56463,56490-56491,56503,56524,56529,56550,56622,56757
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/trunk:56268,56272,56277,56279,56282,56284,56287,56290-56292,56296,56298,56300,56302,56308-56309,56311,56315,56320,56327,56329,56332,56335,56337,56339,56341,56350,56358,56365,56381,56386,56401,56417,56422,56463,56490-56491,56503,56524,56527,56529,56550,56622,56757
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches63srcwpincludesblocksphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.3/src/wp-includes/blocks.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.3/src/wp-includes/blocks.php 2023-10-04 17:00:12 UTC (rev 56775)
+++ branches/6.3/src/wp-includes/blocks.php 2023-10-04 18:45:16 UTC (rev 56776)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -150,8 +150,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Determine if the block script was registered in a theme, by checking if the script path starts with either
</span><span class="cx" style="display: block; padding: 0 10px"> * the parent (template) or child (stylesheet) directory path.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $is_parent_theme_block = str_starts_with( $script_path_norm, $template_path_norm );
- $is_child_theme_block = str_starts_with( $script_path_norm, $stylesheet_path_norm );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $is_parent_theme_block = str_starts_with( $script_path_norm, trailingslashit( $template_path_norm ) );
+ $is_child_theme_block = str_starts_with( $script_path_norm, trailingslashit( $stylesheet_path_norm ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $is_theme_block = ( $is_parent_theme_block || $is_child_theme_block );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $script_uri = plugins_url( $script_path, $metadata['file'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -261,8 +261,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Determine if the block style was registered in a theme, by checking if the script path starts with either
</span><span class="cx" style="display: block; padding: 0 10px"> // the parent (template) or child (stylesheet) directory path.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $is_parent_theme_block = str_starts_with( $style_path_norm, $template_path_norm );
- $is_child_theme_block = str_starts_with( $style_path_norm, $stylesheet_path_norm );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $is_parent_theme_block = str_starts_with( $style_path_norm, trailingslashit( $template_path_norm ) );
+ $is_child_theme_block = str_starts_with( $style_path_norm, trailingslashit( $stylesheet_path_norm ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $is_theme_block = ( $is_parent_theme_block || $is_child_theme_block );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $is_core_block ) {
</span></span></pre></div>
<a id="branches63testsphpunittestsblocksregisterphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.3/tests/phpunit/tests/blocks/register.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.3/tests/phpunit/tests/blocks/register.php 2023-10-04 17:00:12 UTC (rev 56775)
+++ branches/6.3/tests/phpunit/tests/blocks/register.php 2023-10-04 18:45:16 UTC (rev 56776)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -270,6 +270,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $result = register_block_script_handle( $metadata, 'script' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'unit-tests-test-block-script', $result );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Test the behavior directly within the unit test
+ $this->assertFalse(
+ strpos(
+ wp_normalize_path( realpath( dirname( $metadata['file'] ) . '/' . $metadata['script'] ) ),
+ trailingslashit( wp_normalize_path( get_template_directory() ) )
+ ) === 0
+ );
+
+ $this->assertFalse(
+ strpos(
+ wp_normalize_path( realpath( dirname( $metadata['file'] ) . '/' . $metadata['script'] ) ),
+ trailingslashit( wp_normalize_path( get_stylesheet_directory() ) )
+ ) === 0
+ );
</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">@@ -438,6 +453,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_normalize_path( realpath( DIR_TESTDATA . '/blocks/notice/block.css' ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> wp_normalize_path( wp_styles()->get_data( 'unit-tests-test-block-style', 'path' ) )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Test the behavior directly within the unit test
+ $this->assertFalse(
+ strpos(
+ wp_normalize_path( realpath( dirname( $metadata['file'] ) . '/' . $metadata['style'] ) ),
+ trailingslashit( wp_normalize_path( get_template_directory() ) )
+ ) === 0
+ );
+
+ $this->assertFalse(
+ strpos(
+ wp_normalize_path( realpath( dirname( $metadata['file'] ) . '/' . $metadata['style'] ) ),
+ trailingslashit( wp_normalize_path( get_stylesheet_directory() ) )
+ ) === 0
+ );
</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></pre>
</div>
</div>
</body>
</html>