<!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>[56363] trunk/src/wp-includes/html-api: HTML API: Adjust code styling to Gutenberg's linter's preferences.</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/56363">56363</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/56363","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>Bernhard Reiter</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2023-08-07 13:48:55 +0000 (Mon, 07 Aug 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'>HTML API: Adjust code styling to Gutenberg's linter's preferences.
Adjust the code style according to the rules that the linting process in Gutenberg requires.
There are only a couple code changes that should have no effect on the runtime:
- A missing check to verify that only `UTF-8` is supported has been added (brought up because it was identified as an undefined variable).
- A few `return false;` statements have been added to avoid having the linter complain that functions don't return a value despite indicating they return `bool`. The functions are stubs for coming support and currently `throw`, so the `return` statements are unreachable.
Props dmsnell, costdev, davidbaumwald, peterwilsoncc, SergeyBiryukov.
Fixes <a href="https://core.trac.wordpress.org/ticket/58918">#58918</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludeshtmlapiclasswphtmlactiveformattingelementsphp">trunk/src/wp-includes/html-api/class-wp-html-active-formatting-elements.php</a></li>
<li><a href="#trunksrcwpincludeshtmlapiclasswphtmlopenelementsphp">trunk/src/wp-includes/html-api/class-wp-html-open-elements.php</a></li>
<li><a href="#trunksrcwpincludeshtmlapiclasswphtmlprocessorphp">trunk/src/wp-includes/html-api/class-wp-html-processor.php</a></li>
<li><a href="#trunksrcwpincludeshtmlapiclasswphtmltokenphp">trunk/src/wp-includes/html-api/class-wp-html-token.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludeshtmlapiclasswphtmlactiveformattingelementsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/html-api/class-wp-html-active-formatting-elements.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/html-api/class-wp-html-active-formatting-elements.php 2023-08-07 09:59:20 UTC (rev 56362)
+++ trunk/src/wp-includes/html-api/class-wp-html-active-formatting-elements.php 2023-08-07 13:48:55 UTC (rev 56363)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -50,7 +50,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param WP_HTML_Token $token Look for this node in the stack.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool Whether the referenced node is in the stack of active formatting elements.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- *
</del><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function contains_node( $token ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $this->walk_up() as $item ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -149,7 +148,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * > EM -> STRONG -> A ->
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * To start with the most-recently added element and walk towards the top,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @see WP_HTML_Active_Formatting_Elements::walk_up
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * see WP_HTML_Active_Formatting_Elements::walk_up().
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 6.4.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -176,7 +175,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * > A -> STRONG -> EM ->
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * To start with the first added element and walk towards the bottom,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @see WP_HTML_Active_Formatting_Elements::walk_down
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * see WP_HTML_Active_Formatting_Elements::walk_down().
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 6.4.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span></span></pre></div>
<a id="trunksrcwpincludeshtmlapiclasswphtmlopenelementsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/html-api/class-wp-html-open-elements.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/html-api/class-wp-html-open-elements.php 2023-08-07 09:59:20 UTC (rev 56362)
+++ trunk/src/wp-includes/html-api/class-wp-html-open-elements.php 2023-08-07 13:48:55 UTC (rev 56363)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -110,7 +110,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string[] $termination_list List of elements that terminate the search.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool Whether the element was found in a specific scope.
</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 has_element_in_specific_scope( $tag_name, $termination_list ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function has_element_in_specific_scope( $tag_name, $termination_list ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $this->walk_up() as $node ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $node->node_name === $tag_name ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -134,6 +134,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $this->has_element_in_specific_scope(
</span><span class="cx" style="display: block; padding: 0 10px"> $tag_name,
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * Because it's not currently possible to encounter
</span><span class="cx" style="display: block; padding: 0 10px"> * one of the termination elements, they don't need
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -152,11 +153,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see https://html.spec.whatwg.org/#has-an-element-in-list-item-scope
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @throws WP_HTML_Unsupported_Exception Always until this function is implemented.
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $tag_name Name of tag to check.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool Whether given element is in scope.
</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 has_element_in_list_item_scope( $tag_name ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function has_element_in_list_item_scope( $tag_name ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
</ins><span class="cx" style="display: block; padding: 0 10px"> throw new WP_HTML_Unsupported_Exception( 'Cannot process elements depending on list item scope.' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ return false; // The linter requires this unreachable code until the function is implemented and can return.
</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">@@ -173,6 +178,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $this->has_element_in_specific_scope(
</span><span class="cx" style="display: block; padding: 0 10px"> $tag_name,
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * Because it's not currently possible to encounter
</span><span class="cx" style="display: block; padding: 0 10px"> * one of the termination elements, they don't need
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -191,11 +197,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see https://html.spec.whatwg.org/#has-an-element-in-table-scope
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @throws WP_HTML_Unsupported_Exception Always until this function is implemented.
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $tag_name Name of tag to check.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool Whether given element is in scope.
</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 has_element_in_table_scope( $tag_name ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function has_element_in_table_scope( $tag_name ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
</ins><span class="cx" style="display: block; padding: 0 10px"> throw new WP_HTML_Unsupported_Exception( 'Cannot process elements depending on table scope.' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ return false; // The linter requires this unreachable code until the function is implemented and can return.
</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">@@ -205,11 +215,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see https://html.spec.whatwg.org/#has-an-element-in-select-scope
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @throws WP_HTML_Unsupported_Exception Always until this function is implemented.
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $tag_name Name of tag to check.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool Whether given element is in scope.
</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 has_element_in_select_scope( $tag_name ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function has_element_in_select_scope( $tag_name ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
</ins><span class="cx" style="display: block; padding: 0 10px"> throw new WP_HTML_Unsupported_Exception( 'Cannot process elements depending on select scope.' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ return false; // The linter requires this unreachable code until the function is implemented and can return.
</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">@@ -219,7 +233,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see https://html.spec.whatwg.org/#has-an-element-in-button-scope
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return bool
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return bool Whether a P is in BUTTON scope.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function has_p_in_button_scope() {
</span><span class="cx" style="display: block; padding: 0 10px"> return $this->has_p_in_button_scope;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -320,7 +334,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * > EM -> STRONG -> A ->
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * To start with the most-recently added element and walk towards the top,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @see WP_HTML_Open_Elements::walk_up
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * see WP_HTML_Open_Elements::walk_up().
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 6.4.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -347,7 +361,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * > A -> STRONG -> EM ->
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * To start with the first added element and walk towards the bottom,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @see WP_HTML_Open_Elements::walk_down
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * see WP_HTML_Open_Elements::walk_down().
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 6.4.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span></span></pre></div>
<a id="trunksrcwpincludeshtmlapiclasswphtmlprocessorphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/html-api/class-wp-html-processor.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/html-api/class-wp-html-processor.php 2023-08-07 09:59:20 UTC (rev 56362)
+++ trunk/src/wp-includes/html-api/class-wp-html-processor.php 2023-08-07 13:48:55 UTC (rev 56363)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -16,7 +16,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * unsupported markup, it aborts early to avoid unintentionally breaking
</span><span class="cx" style="display: block; padding: 0 10px"> * the document. The HTML Processor should never break an HTML 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">- * While the {@see WP_HTML_Tag_Processor} is a valuable tool for modifying
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * While the `WP_HTML_Tag_Processor` is a valuable tool for modifying
</ins><span class="cx" style="display: block; padding: 0 10px"> * attributes on individual HTML tags, the HTML Processor is more capable
</span><span class="cx" style="display: block; padding: 0 10px"> * and useful for the following operations:
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -47,7 +47,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Breadcrumbs represent the stack of open elements from the root
</span><span class="cx" style="display: block; padding: 0 10px"> * of the document or fragment down to the currently-matched node,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * if one is currently selected. Call {@see WP_HTML_Processor::get_breadcrumbs}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * if one is currently selected. Call WP_HTML_Processor::get_breadcrumbs()
</ins><span class="cx" style="display: block; padding: 0 10px"> * to inspect the breadcrumbs for a matched tag.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Breadcrumbs can specify nested HTML structure and are equivalent
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -121,6 +121,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 6.4.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @see WP_HTML_Tag_Processor
</ins><span class="cx" style="display: block; padding: 0 10px"> * @see https://html.spec.whatwg.org/
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class WP_HTML_Processor extends WP_HTML_Tag_Processor {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -232,16 +233,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return WP_HTML_Processor|null The created processor if successful, otherwise null.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public static function createFragment( $html, $context = '<body>', $encoding = 'UTF-8' ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '<body>' !== $context ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '<body>' !== $context || 'UTF-8' !== $encoding ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return null;
</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">- $p = new self( $html, self::CONSTRUCTOR_UNLOCK_CODE );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p = new self( $html, self::CONSTRUCTOR_UNLOCK_CODE );
</ins><span class="cx" style="display: block; padding: 0 10px"> $p->state->context_node = array( 'BODY', array() );
</span><span class="cx" style="display: block; padding: 0 10px"> $p->state->insertion_mode = WP_HTML_Processor_State::INSERTION_MODE_IN_BODY;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // @TODO: Create "fake" bookmarks for non-existent but implied nodes.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p->bookmarks['root-node'] = new WP_HTML_Span( 0, 0 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p->bookmarks['root-node'] = new WP_HTML_Span( 0, 0 );
</ins><span class="cx" style="display: block; padding: 0 10px"> $p->bookmarks['context-node'] = new WP_HTML_Span( 0, 0 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $p->state->stack_of_open_elements->push(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -332,7 +333,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 6.4.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @throws WP_HTML_Unsupported_Exception
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @throws Exception When unable to allocate a bookmark for the next token in the input HTML document.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array|string|null $query {
</span><span class="cx" style="display: block; padding: 0 10px"> * Optional. Which tag name to find, having which class, etc. Default is to find any tag.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -410,7 +411,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 6.4.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @throws Exception
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @throws Exception When unable to allocate a bookmark for the next token in the input HTML document.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see self::PROCESS_NEXT_NODE
</span><span class="cx" style="display: block; padding: 0 10px"> * @see self::REPROCESS_CURRENT_NODE
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -496,7 +497,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 6.4.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @throws WP_HTML_Unsupported_Exception
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @throws WP_HTML_Unsupported_Exception When encountering unsupported HTML input.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see https://html.spec.whatwg.org/#parsing-main-inbody
</span><span class="cx" style="display: block; padding: 0 10px"> * @see self::step
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -672,7 +673,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 6.4.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @throws Exception
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @throws Exception When unable to allocate requested bookmark.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string|false Name of created bookmark, or false if unable to create.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -890,7 +891,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 6.4.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @throws WP_HTML_Unsupported_Exception
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @throws WP_HTML_Unsupported_Exception When encountering unsupported HTML input.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see https://html.spec.whatwg.org/#close-a-p-element
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -904,8 +905,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 6.4.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @throws WP_HTML_Unsupported_Exception
- *
</del><span class="cx" style="display: block; padding: 0 10px"> * @see https://html.spec.whatwg.org/#generate-implied-end-tags
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string|null $except_for_this_element Perform as if this element doesn't exist in the stack of open elements.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -928,10 +927,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Closes elements that have implied end tags, thoroughly.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * See the HTML specification for an explanation why this is
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * different from {@see WP_HTML_Processor::generate_implied_end_tags}.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * different from generating end tags in the normal sense.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 6.4.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @see WP_HTML_Processor::generate_implied_end_tags
</ins><span class="cx" style="display: block; padding: 0 10px"> * @see https://html.spec.whatwg.org/#generate-implied-end-tags
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> private function generate_implied_end_tags_thoroughly() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -953,7 +953,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 6.4.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @throws WP_HTML_Unsupported_Exception
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @throws WP_HTML_Unsupported_Exception When encountering unsupported HTML input.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see https://html.spec.whatwg.org/#reconstruct-the-active-formatting-elements
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -970,6 +970,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $last_entry = $this->state->active_formatting_elements->current_node();
</span><span class="cx" style="display: block; padding: 0 10px"> if (
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * > If the last (most recently added) entry in the list of active formatting elements is a marker;
</span><span class="cx" style="display: block; padding: 0 10px"> * > stop this algorithm.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -995,7 +996,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 6.4.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @throws WP_HTML_Unsupported_Exception
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @throws WP_HTML_Unsupported_Exception When encountering unsupported HTML input.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see https://html.spec.whatwg.org/#adoption-agency-algorithm
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1216,7 +1217,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'WBR' === $tag_name ||
</span><span class="cx" style="display: block; padding: 0 10px"> 'XMP' === $tag_name ||
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // MathML
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // MathML.
</ins><span class="cx" style="display: block; padding: 0 10px"> 'MI' === $tag_name ||
</span><span class="cx" style="display: block; padding: 0 10px"> 'MO' === $tag_name ||
</span><span class="cx" style="display: block; padding: 0 10px"> 'MN' === $tag_name ||
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1224,7 +1225,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'MTEXT' === $tag_name ||
</span><span class="cx" style="display: block; padding: 0 10px"> 'ANNOTATION-XML' === $tag_name ||
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // SVG
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // SVG.
</ins><span class="cx" style="display: block; padding: 0 10px"> 'FOREIGNOBJECT' === $tag_name ||
</span><span class="cx" style="display: block; padding: 0 10px"> 'DESC' === $tag_name ||
</span><span class="cx" style="display: block; padding: 0 10px"> 'TITLE' === $tag_name
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1307,7 +1308,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Unlock code that must be passed into the constructor to create this class.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * This class extends {@see WP_HTML_Tag_Processor}, which has a public class
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * This class extends the WP_HTML_Tag_Processor, which has a public class
</ins><span class="cx" style="display: block; padding: 0 10px"> * constructor. Therefore, it's not possible to have a private constructor here.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * This unlock code is used to ensure that anyone calling the constructor is
</span></span></pre></div>
<a id="trunksrcwpincludeshtmlapiclasswphtmltokenphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/html-api/class-wp-html-token.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/html-api/class-wp-html-token.php 2023-08-07 09:59:20 UTC (rev 56362)
+++ trunk/src/wp-includes/html-api/class-wp-html-token.php 2023-08-07 13:48:55 UTC (rev 56363)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -36,10 +36,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Name of node; lowercase names such as "marker" are not HTML elements.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * For HTML elements/tags this value should come from {@see WP_HTML_Processor::get_tag}.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * For HTML elements/tags this value should come from WP_HTML_Processor::get_tag().
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 6.4.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @see WP_HTML_Processor::get_tag()
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @var string
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public $node_name = null;
</span></span></pre>
</div>
</div>
</body>
</html>