Use WP_HTML_Processor::create_fragment instead of new WP_HTML_Processor

WordPress · Dec 19, 2024 · 2df1458 · 2df1458
1 parent 440f8aa
commit 2df1458
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 17 deletions.
diff --git a/packages/playground/data-liberation/src/block-markup/WP_HTML_To_Blocks.php b/packages/playground/data-liberation/src/block-markup/WP_HTML_To_Blocks.php
@@ -35,7 +35,7 @@ class WP_HTML_To_Blocks implements WP_Block_Markup_Converter {
 	private $metadata               = array();
 
 	public function __construct( $html ) {
-		$this->html = new \WP_HTML_Processor( $html );
+		$this->html = WP_HTML_Processor::create_fragment( $html );
 	}
 
 	/**

diff --git a/packages/playground/data-liberation/src/wordpress-core-html-api/class-wp-html-processor.php b/packages/playground/data-liberation/src/wordpress-core-html-api/class-wp-html-processor.php
@@ -1613,10 +1613,7 @@ private function step_in_head(): bool {
 				 */
 				$charset = $this->get_attribute( 'charset' );
 				if ( is_string( $charset ) && 'tentative' === $this->state->encoding_confidence ) {
-					// Commenting this out for now. We're assuming UTF-8 in WP_HTML_To_Blocks and
-					// we don't want to fail just because a document contained a meta tag with a UTF-8 charset.
-					// @TODO: Bail on non-utf8 charsets.
-					// $this->bail( 'Cannot yet process META tags with charset to determine encoding.' );
+					$this->bail( 'Cannot yet process META tags with charset to determine encoding.' );
 				}
 
 				/*
@@ -1635,10 +1632,7 @@ private function step_in_head(): bool {
 					0 === strcasecmp( $http_equiv, 'Content-Type' ) &&
 					'tentative' === $this->state->encoding_confidence
 				) {
-					// Commenting this out for now. We're assuming UTF-8 in WP_HTML_To_Blocks and
-					// we don't want to fail just because a document contained a meta tag with a UTF-8 charset.
-					// @TODO: Bail on non-utf8 charsets.
-					// $this->bail( 'Cannot yet process META tags with http-equiv Content-Type to determine encoding.' );
+					$this->bail( 'Cannot yet process META tags with http-equiv Content-Type to determine encoding.' );
 				}
 
 				return true;

diff --git a/packages/playground/data-liberation/tests/WPHTMLToBlocksTests.php b/packages/playground/data-liberation/tests/WPHTMLToBlocksTests.php
@@ -47,14 +47,9 @@ private function normalize_markup( $markup ) {
         $serialized = $processor->serialize();
         $serialized = trim(
             str_replace(
-                [
-                    // Naively remove parts of the HTML that serialize()
-                    // adds that we don't want.
-                    '<html><head></head><body>',
-                    '</body></html>',
-                    // Even more naively, remove all the newlines.
-                    "\n"
-                ],
+                // Naively remove all the newlines to prevent minor formatting differences
+                // from causing false negatives in $expected === $actual.
+                "\n",
                 '',
                 $serialized
             )