From 1d4b95336abb5bc7c1f657624f10e16ec95fdf46 Mon Sep 17 00:00:00 2001 From: dmsnell Date: Sat, 20 Jan 2024 00:15:13 +0000 Subject: [PATCH] HTML API: Cleanup tests and list of void elements. This patch adds newly supported elements to tests that should have been updated in recent PRs, but which were merged without that. Those PRs removed failing tests showing that the elements were unsupported, but did not add the elements to the list of supported ones. It also removes some elements from the special-exclusion list of unsupported IN BODY elements. These did not present in failing tests because earlier conditions in the switch structure caught the tags before hitting the default block. Finally it adds some missing elements to the list of void elements. These elements are not listed as void in the HTML specification because they are deprecated. However, they are treated as void for the sake of HTML serialization and the parsing rules indicate that they behave as void elements, so it's safe to list them within the HTML API as void. Developed in WordPress/wordpress-develop#5913 Fixes #60307 Built from https://develop.svn.wordpress.org/trunk@57319 git-svn-id: http://core.svn.wordpress.org/trunk@56825 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/html-api/class-wp-html-processor.php | 10 ++++------ wp-includes/version.php | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/wp-includes/html-api/class-wp-html-processor.php b/wp-includes/html-api/class-wp-html-processor.php index 65fcfbe236..58d34b2833 100644 --- a/wp-includes/html-api/class-wp-html-processor.php +++ b/wp-includes/html-api/class-wp-html-processor.php @@ -1002,7 +1002,6 @@ class WP_HTML_Processor extends WP_HTML_Tag_Processor { */ switch ( $tag_name ) { case 'APPLET': - case 'AREA': case 'BASE': case 'BASEFONT': case 'BGSOUND': @@ -1010,8 +1009,6 @@ class WP_HTML_Processor extends WP_HTML_Tag_Processor { case 'CAPTION': case 'COL': case 'COLGROUP': - case 'DD': - case 'DT': case 'FORM': case 'FRAME': case 'FRAMESET': @@ -1019,7 +1016,6 @@ class WP_HTML_Processor extends WP_HTML_Tag_Processor { case 'HTML': case 'IFRAME': case 'INPUT': - case 'LI': case 'LINK': case 'MARQUEE': case 'MATH': @@ -1029,7 +1025,6 @@ class WP_HTML_Processor extends WP_HTML_Tag_Processor { case 'NOFRAMES': case 'NOSCRIPT': case 'OBJECT': - case 'OL': case 'OPTGROUP': case 'OPTION': case 'PARAM': @@ -1055,7 +1050,6 @@ class WP_HTML_Processor extends WP_HTML_Tag_Processor { case 'TITLE': case 'TR': case 'TRACK': - case 'UL': case 'XMP': $this->last_error = self::ERROR_UNSUPPORTED; throw new WP_HTML_Unsupported_Exception( "Cannot process {$tag_name} element." ); @@ -1709,15 +1703,19 @@ class WP_HTML_Processor extends WP_HTML_Tag_Processor { return ( 'AREA' === $tag_name || 'BASE' === $tag_name || + 'BASEFONT' === $tag_name || // Obsolete but still treated as void. + 'BGSOUND' === $tag_name || // Obsolete but still treated as void. 'BR' === $tag_name || 'COL' === $tag_name || 'EMBED' === $tag_name || + 'FRAME' === $tag_name || 'HR' === $tag_name || 'IMG' === $tag_name || 'INPUT' === $tag_name || 'LINK' === $tag_name || 'KEYGEN' === $tag_name || // Obsolete but still treated as void. 'META' === $tag_name || + 'PARAM' === $tag_name || // Obsolete but still treated as void. 'SOURCE' === $tag_name || 'TRACK' === $tag_name || 'WBR' === $tag_name diff --git a/wp-includes/version.php b/wp-includes/version.php index 266a2e02ec..2532c5f0d9 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.5-alpha-57318'; +$wp_version = '6.5-alpha-57319'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.