diff --git a/tests/phpunit/tests/html-api/wpHtmlProcessorHtml5lib.php b/tests/phpunit/tests/html-api/wpHtmlProcessorHtml5lib.php
index 54d60f8c78a66..4862ba981e6f0 100644
--- a/tests/phpunit/tests/html-api/wpHtmlProcessorHtml5lib.php
+++ b/tests/phpunit/tests/html-api/wpHtmlProcessorHtml5lib.php
@@ -21,6 +21,8 @@
* @group html-api-html5lib-tests
*/
class Tests_HtmlApi_Html5lib extends WP_UnitTestCase {
+ const TREE_INDENT = ' ';
+
/**
* Skip specific tests that may not be supported or have known issues.
*/
@@ -49,9 +51,9 @@ class Tests_HtmlApi_Html5lib extends WP_UnitTestCase {
*
* @dataProvider data_external_html5lib_tests
*
- * @param string $fragment_context Context element in which to parse HTML, such as BODY or SVG.
- * @param string $html Given test HTML.
- * @param string $expected_tree Tree structure of parsed HTML.
+ * @param string|null $fragment_context Context element in which to parse HTML, such as BODY or SVG.
+ * @param string $html Given test HTML.
+ * @param string $expected_tree Tree structure of parsed HTML.
*/
public function test_parse( ?string $fragment_context, string $html, string $expected_tree ) {
try {
@@ -170,9 +172,8 @@ private static function build_tree_representation( ?string $fragment_context, st
* and requires adjustment to initial parameters.
* The full parser will not.
*/
- $output = $fragment_context ? "\n \n \n" : '';
- $indent_level = $fragment_context ? 2 : 0;
- $indent = ' ';
+ $output = '';
+ $indent_level = 0;
$was_text = null;
$text_node = '';
@@ -225,7 +226,7 @@ private static function build_tree_representation( ?string $fragment_context, st
++$indent_level;
}
- $output .= str_repeat( $indent, $tag_indent ) . "<{$tag_name}>\n";
+ $output .= str_repeat( self::TREE_INDENT, $tag_indent ) . "<{$tag_name}>\n";
$attribute_names = $processor->get_attribute_names_with_prefix( '' );
if ( $attribute_names ) {
@@ -278,18 +279,18 @@ static function ( $a, $b ) {
if ( true === $val ) {
$val = '';
}
- $output .= str_repeat( $indent, $tag_indent + 1 ) . "{$display_name}=\"{$val}\"\n";
+ $output .= str_repeat( self::TREE_INDENT, $tag_indent + 1 ) . "{$display_name}=\"{$val}\"\n";
}
}
// Self-contained tags contain their inner contents as modifiable text.
$modifiable_text = $processor->get_modifiable_text();
if ( '' !== $modifiable_text ) {
- $output .= str_repeat( $indent, $tag_indent + 1 ) . "\"{$modifiable_text}\"\n";
+ $output .= str_repeat( self::TREE_INDENT, $tag_indent + 1 ) . "\"{$modifiable_text}\"\n";
}
if ( 'html' === $namespace && 'TEMPLATE' === $token_name ) {
- $output .= str_repeat( $indent, $indent_level ) . "content\n";
+ $output .= str_repeat( self::TREE_INDENT, $indent_level ) . "content\n";
++$indent_level;
}
@@ -303,14 +304,14 @@ static function ( $a, $b ) {
}
$was_text = true;
if ( '' === $text_node ) {
- $text_node .= str_repeat( $indent, $indent_level ) . '"';
+ $text_node .= str_repeat( self::TREE_INDENT, $indent_level ) . '"';
}
$text_node .= $text_content;
break;
case '#funky-comment':
// Comments must be "<" then "!-- " then the data then " -->".
- $output .= str_repeat( $indent, $indent_level ) . "\n";
+ $output .= str_repeat( self::TREE_INDENT, $indent_level ) . "\n";
break;
case '#comment':
@@ -333,7 +334,7 @@ static function ( $a, $b ) {
throw new Error( "Unhandled comment type for tree construction: {$processor->get_comment_type()}" );
}
// Comments must be "<" then "!-- " then the data then " -->".
- $output .= str_repeat( $indent, $indent_level ) . "\n";
+ $output .= str_repeat( self::TREE_INDENT, $indent_level ) . "\n";
break;
default:
@@ -449,7 +450,7 @@ public static function parse_html5_dat_testfile( $filename ) {
* context element as context.
*/
case 'document-fragment':
- $test_context_element = explode( ' ', $line )[0];
+ $test_context_element = trim( $line );
break;
/*