<!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>[57830] branches/6.5/tests/phpunit/tests/interactivity-api/interactivity-api.php: Interactivity API: Increase hook priority for processing directives.</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/57830">57830</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/57830","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>swissspidy</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2024-03-14 08:57:48 +0000 (Thu, 14 Mar 2024)</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'>Interactivity API: Increase hook priority for processing directives.
Use a priority of 100 to ensure that other filters can add additional directives before the processing starts.
This way, directives will be processed even if the $parsed_block variable is edited by a filter.
Reviewed by gziolo.
Merges <a href="https://core.trac.wordpress.org/changeset/57826">[57826]</a> to the to the 6.5 branch.
Props cbravobernal, swissspidy, flixos90, joemcgill, gziolo.
Fixes <a href="https://core.trac.wordpress.org/ticket/60743">#60743</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches65srcwpincludesinteractivityapiinteractivityapiphp">branches/6.5/src/wp-includes/interactivity-api/interactivity-api.php</a></li>
<li><a href="#branches65testsphpunittestsinteractivityapiinteractivityapiphp">branches/6.5/tests/phpunit/tests/interactivity-api/interactivity-api.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches65">branches/6.5/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/6.5
</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.5 2024-03-13 13:18:35 UTC (rev 57829)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/6.5 2024-03-14 08:57:48 UTC (rev 57830)
</ins><a id="branches65"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/6.5</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:57791-57792,57804-57806,57809,57814,57817,57824,57827
</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:57791-57792,57804-57806,57809,57814,57817,57824,57826-57827
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches65srcwpincludesinteractivityapiinteractivityapiphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.5/src/wp-includes/interactivity-api/interactivity-api.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.5/src/wp-includes/interactivity-api/interactivity-api.php 2024-03-13 13:18:35 UTC (rev 57829)
+++ branches/6.5/src/wp-includes/interactivity-api/interactivity-api.php 2024-03-14 08:57:48 UTC (rev 57830)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -57,16 +57,20 @@
</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">- * Uses a priority of 20 to ensure that other filters can add additional
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Uses a priority of 100 to ensure that other filters can add additional
</ins><span class="cx" style="display: block; padding: 0 10px"> * directives before the processing starts.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_filter( 'render_block_' . $block_name, $process_interactive_blocks, 20, 2 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'render_block_' . $block_name, $process_interactive_blocks, 100, 2 );
</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="cx" style="display: block; padding: 0 10px"> return $parsed_block;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-add_filter( 'render_block_data', 'wp_interactivity_process_directives_of_interactive_blocks' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/*
+ * Uses a priority of 100 to ensure that other filters can add additional attributes to
+ * $parsed_block before the processing starts.
+ */
+add_filter( 'render_block_data', 'wp_interactivity_process_directives_of_interactive_blocks', 100, 1 );
</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"> * Retrieves the main WP_Interactivity_API instance.
</span></span></pre></div>
<a id="branches65testsphpunittestsinteractivityapiinteractivityapiphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.5/tests/phpunit/tests/interactivity-api/interactivity-api.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.5/tests/phpunit/tests/interactivity-api/interactivity-api.php 2024-03-13 13:18:35 UTC (rev 57829)
+++ branches/6.5/tests/phpunit/tests/interactivity-api/interactivity-api.php 2024-03-14 08:57:48 UTC (rev 57830)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -308,12 +308,45 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ';
</span><span class="cx" style="display: block; padding: 0 10px"> $this->data_wp_test_processor_count = 0;
</span><span class="cx" style="display: block; padding: 0 10px"> do_blocks( $post_content );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ unregister_block_type( 'test/custom-directive-block' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 2, $this->data_wp_test_processor_count );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- unregister_block_type( 'test/custom-directive-block' );
</del><span class="cx" style="display: block; padding: 0 10px"> $directive_processors->setValue( null, $old_directive_processors );
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Tests that directives are server side processing even if the $parsed_block variable is edited by a filter.
+ *
+ * @ticket 60743
+ *
+ * @covers ::wp_interactivity_process_directives_of_interactive_blocks
+ */
+ public function test_process_directives_when_block_is_filtered() {
+ register_block_type(
+ 'test/custom-directive-block',
+ array(
+ 'render_callback' => function () {
+ return '<input data-wp-interactive="nameSpace" ' . wp_interactivity_data_wp_context( array( 'text' => 'test' ) ) . ' data-wp-bind--value="context.text" />';
+ },
+ 'supports' => array(
+ 'interactivity' => true,
+ ),
+ )
+ );
+ function test_render_block_data( $parsed_block ) {
+ $parsed_block['testKey'] = true;
+ return $parsed_block;
+ }
+ add_filter( 'render_block_data', 'test_render_block_data' );
+ $post_content = '<!-- wp:test/custom-directive-block /-->';
+ $processed_content = do_blocks( $post_content );
+ $processor = new WP_HTML_Tag_Processor( $processed_content );
+ $processor->next_tag( array( 'data-wp-interactive' => 'nameSpace' ) );
+ remove_filter( 'render_block_data', 'test_render_block_data' );
+ unregister_block_type( 'test/custom-directive-block' );
+ $this->assertEquals( 'test', $processor->get_attribute( 'value' ) );
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Tests that wp_interactivity_data_wp_context function correctly converts different array
</span><span class="cx" style="display: block; padding: 0 10px"> * structures to a JSON string.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre>
</div>
</div>
</body>
</html>