<!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>[61296] branches/6.9/tests/phpunit/tests/block-processor/wpBlockProcessor-BlockProcessing.php: Block Processor: Rename `extract_block()` method for clearer documentation.</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/61296">61296</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/61296","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dmsnell</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2025-11-25 00:52:06 +0000 (Tue, 25 Nov 2025)</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 Processor: Rename `extract_block()` method for clearer documentation.
In testing during the release candidacy for WordPress 6.9 it was found
that the `extract_block()` method may do more work than is expected
based off of its name.
This change renames the method to `extract_full_block_and_advance()` to
communicate that it does move the Block Processor forward and to hint at
the fact that it also encompasses all inner blocks during that advance.
Developed in https://github.com/WordPress/wordpress-develop/pull/10538
Discussed in https://core.trac.wordpress.org/ticket/61401
Follow-up to <a href="https://core.trac.wordpress.org/changeset/60939">[60939]</a>.
Reviewed by desrosj, jonsurrell.
Merges <a href="https://core.trac.wordpress.org/changeset/61294">[61294]</a> to the 6.9 branch.
Props dlh, dmsnell, jonsurrell, westonruter.
See <a href="https://core.trac.wordpress.org/ticket/61401">#61401</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches69srcwpincludesclasswpblockprocessorphp">branches/6.9/src/wp-includes/class-wp-block-processor.php</a></li>
<li><a href="#branches69testsphpunittestsblockprocessorwpBlockProcessorBlockProcessingphp">branches/6.9/tests/phpunit/tests/block-processor/wpBlockProcessor-BlockProcessing.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches69">branches/6.9/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/6.9
</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.9 2025-11-24 22:44:38 UTC (rev 61295)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/6.9 2025-11-25 00:52:06 UTC (rev 61296)
</ins><a id="branches69"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/6.9</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.5:49373-49379,49381
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/5.8:51889
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/6.7:59437
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/trunk:61223,61225,61244,61246,61248-61249,61253,61257-61258,61261-61262,61273,61285,61290
</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:61223,61225,61244,61246,61248-61249,61253,61257-61258,61261-61262,61273,61285,61290,61294
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches69srcwpincludesclasswpblockprocessorphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.9/src/wp-includes/class-wp-block-processor.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.9/src/wp-includes/class-wp-block-processor.php 2025-11-24 22:44:38 UTC (rev 61295)
+++ branches/6.9/src/wp-includes/class-wp-block-processor.php 2025-11-25 00:52:06 UTC (rev 61296)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -194,7 +194,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * block, and re-serialize it into the original document. It’s possible to do so
</span><span class="cx" style="display: block; padding: 0 10px"> * while skipping over the parse of the rest of the document.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * {@see self::extract_block()} will scan forward from the current block opener
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * {@see self::extract_full_block_and_advance()} will scan forward from the current block opener
</ins><span class="cx" style="display: block; padding: 0 10px"> * and build the parsed block structure until the current block is closed. It will
</span><span class="cx" style="display: block; padding: 0 10px"> * include all inner HTML and inner blocks, and parse all of the inner blocks. It
</span><span class="cx" style="display: block; padding: 0 10px"> * can be used to extract a block at any depth in the document, helpful for operating
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -207,7 +207,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"> * $gallery_at = $processor->get_span()->start;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * $gallery_block = $processor->extract_block();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * $gallery_block = $processor->extract_full_block_and_advance();
</ins><span class="cx" style="display: block; padding: 0 10px"> * $after_gallery = $processor->get_span()->start;
</span><span class="cx" style="display: block; padding: 0 10px"> * return (
</span><span class="cx" style="display: block; padding: 0 10px"> * substr( $post_content, 0, $gallery_at ) .
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1223,7 +1223,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"> * $gallery_at = $processor->get_span()->start;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * $gallery = $processor->extract_block();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * $gallery = $processor->extract_full_block_and_advance();
</ins><span class="cx" style="display: block; padding: 0 10px"> * $ends_before = $processor->get_span();
</span><span class="cx" style="display: block; padding: 0 10px"> * $ends_before = $ends_before->start ?? strlen( $post_content );
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1254,7 +1254,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"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function extract_block(): ?array {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function extract_full_block_and_advance(): ?array {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $this->is_html() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $chunk = $this->get_html_content();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1291,7 +1291,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @todo Use iteration instead of recursion, or at least refactor to tail-call form.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $this->opens_block() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $inner_block = $this->extract_block();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $inner_block = $this->extract_full_block_and_advance();
</ins><span class="cx" style="display: block; padding: 0 10px"> $block['innerBlocks'][] = $inner_block;
</span><span class="cx" style="display: block; padding: 0 10px"> $block['innerContent'][] = null;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="branches69testsphpunittestsblockprocessorwpBlockProcessorBlockProcessingphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.9/tests/phpunit/tests/block-processor/wpBlockProcessor-BlockProcessing.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.9/tests/phpunit/tests/block-processor/wpBlockProcessor-BlockProcessing.php 2025-11-24 22:44:38 UTC (rev 61295)
+++ branches/6.9/tests/phpunit/tests/block-processor/wpBlockProcessor-BlockProcessing.php 2025-11-25 00:52:06 UTC (rev 61296)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -86,7 +86,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $extracted = array();
</span><span class="cx" style="display: block; padding: 0 10px"> while ( $processor->next_block( '*' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $extracted[] = $processor->extract_block();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $extracted[] = $processor->extract_full_block_and_advance();
</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"> $this->assertSame(
</span></span></pre>
</div>
</div>
</body>
</html>