From 774cae5b642e688d0dc3bc13bb18e2d187b40a51 Mon Sep 17 00:00:00 2001
From: Jon Surrell <sirreal@users.noreply.github.com>
Date: Fri, 8 Nov 2024 18:30:34 +0100
Subject: [PATCH 1/5] Add test

---
 .../tests/html-api/wpHtmlProcessor.php        | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/tests/phpunit/tests/html-api/wpHtmlProcessor.php b/tests/phpunit/tests/html-api/wpHtmlProcessor.php
index 6638f7600252c..dc4c4e2e23380 100644
--- a/tests/phpunit/tests/html-api/wpHtmlProcessor.php
+++ b/tests/phpunit/tests/html-api/wpHtmlProcessor.php
@@ -561,6 +561,27 @@ public function test_expects_closer_foreign_content_self_closing() {
 		$this->assertTrue( $processor->expects_closer() );
 	}
 
+	/**
+	 * Ensures that expects_closer works for void-like elements in foreign content.
+	 *
+	 * For example, `<svg><input>text` creates an `svg:input` that contains a text node.
+	 * This input should not be treated as a void tag and _should_ expect a close tag.
+	 *
+	 * @dataProvider data_void_tags
+	 *
+	 * @ticket TBD
+	 */
+	public function test_expects_closer_foreign_content_not_void( string $void_tag ) {
+		$processor = WP_HTML_Processor::create_fragment( "<svg><{$void_tag}>" );
+
+		$this->assertTrue( $processor->next_tag( $void_tag ) );
+		if ( $processor->get_namespace() === 'svg' ) {
+			$this->assertTrue( $processor->expects_closer() );
+		} else {
+			$this->assertFalse( $processor->expects_closer() );
+		}
+	}
+
 	/**
 	 * Ensures that self-closing foreign SCRIPT elements are properly found.
 	 *

From 155bc1f72635088ae10ee4942aa3a1b78264cc93 Mon Sep 17 00:00:00 2001
From: Jon Surrell <sirreal@users.noreply.github.com>
Date: Fri, 8 Nov 2024 18:31:08 +0100
Subject: [PATCH 2/5] Check html namespace for void expects_closer tags

---
 src/wp-includes/html-api/class-wp-html-processor.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wp-includes/html-api/class-wp-html-processor.php b/src/wp-includes/html-api/class-wp-html-processor.php
index 19d15bfa43c5b..b067d81af6008 100644
--- a/src/wp-includes/html-api/class-wp-html-processor.php
+++ b/src/wp-includes/html-api/class-wp-html-processor.php
@@ -821,7 +821,7 @@ public function expects_closer( ?WP_HTML_Token $node = null ): ?bool {
 			// Doctype declarations.
 			'html' === $token_name ||
 			// Void elements.
-			self::is_void( $token_name ) ||
+			( 'html' === $token_namespace && self::is_void( $token_name ) ) ||
 			// Special atomic elements.
 			( 'html' === $token_namespace && in_array( $token_name, array( 'IFRAME', 'NOEMBED', 'NOFRAMES', 'SCRIPT', 'STYLE', 'TEXTAREA', 'TITLE', 'XMP' ), true ) ) ||
 			// Self-closing elements in foreign content.

From b543e1f6417503e9349ddf89fe1bb92e8a45e52f Mon Sep 17 00:00:00 2001
From: Jon Surrell <sirreal@users.noreply.github.com>
Date: Fri, 8 Nov 2024 19:20:19 +0100
Subject: [PATCH 3/5] Clarify if/else in test

---
 tests/phpunit/tests/html-api/wpHtmlProcessor.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/phpunit/tests/html-api/wpHtmlProcessor.php b/tests/phpunit/tests/html-api/wpHtmlProcessor.php
index dc4c4e2e23380..954a6d189c3e1 100644
--- a/tests/phpunit/tests/html-api/wpHtmlProcessor.php
+++ b/tests/phpunit/tests/html-api/wpHtmlProcessor.php
@@ -575,9 +575,13 @@ public function test_expects_closer_foreign_content_not_void( string $void_tag )
 		$processor = WP_HTML_Processor::create_fragment( "<svg><{$void_tag}>" );
 
 		$this->assertTrue( $processor->next_tag( $void_tag ) );
+
+		// Some void-like will close the SVG element and be HTML tags.
 		if ( $processor->get_namespace() === 'svg' ) {
+			$this->assertSame( array( 'HTML', 'BODY', 'SVG', $void_tag ), $processor->get_breadcrumbs() );
 			$this->assertTrue( $processor->expects_closer() );
 		} else {
+			$this->assertSame( array( 'HTML', 'BODY', $void_tag ), $processor->get_breadcrumbs() );
 			$this->assertFalse( $processor->expects_closer() );
 		}
 	}

From 274c4b5d02b825d5931bf9068c53fd2b335d07dd Mon Sep 17 00:00:00 2001
From: Jon Surrell <sirreal@users.noreply.github.com>
Date: Tue, 12 Nov 2024 11:51:16 +0100
Subject: [PATCH 4/5] Fix ticket annotation in test

---
 tests/phpunit/tests/html-api/wpHtmlProcessor.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/phpunit/tests/html-api/wpHtmlProcessor.php b/tests/phpunit/tests/html-api/wpHtmlProcessor.php
index 6c0157d910e11..defb3f9ffb101 100644
--- a/tests/phpunit/tests/html-api/wpHtmlProcessor.php
+++ b/tests/phpunit/tests/html-api/wpHtmlProcessor.php
@@ -569,7 +569,7 @@ public function test_expects_closer_foreign_content_self_closing() {
 	 *
 	 * @dataProvider data_void_tags
 	 *
-	 * @ticket TBD
+	 * @ticket 62363
 	 */
 	public function test_expects_closer_foreign_content_not_void( string $void_tag ) {
 		$processor = WP_HTML_Processor::create_fragment( "<svg><{$void_tag}>" );

From 5ed016064a0dd19c4f29ddcae6a571b21f7eaa79 Mon Sep 17 00:00:00 2001
From: Bernie Reiter <96308+ockham@users.noreply.github.com>
Date: Tue, 12 Nov 2024 13:50:12 +0100
Subject: [PATCH 5/5] Fix typo in comment

---
 tests/phpunit/tests/html-api/wpHtmlProcessor.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/phpunit/tests/html-api/wpHtmlProcessor.php b/tests/phpunit/tests/html-api/wpHtmlProcessor.php
index defb3f9ffb101..fd9d812103865 100644
--- a/tests/phpunit/tests/html-api/wpHtmlProcessor.php
+++ b/tests/phpunit/tests/html-api/wpHtmlProcessor.php
@@ -576,7 +576,7 @@ public function test_expects_closer_foreign_content_not_void( string $void_tag )
 
 		$this->assertTrue( $processor->next_tag( $void_tag ) );
 
-		// Some void-like will close the SVG element and be HTML tags.
+		// Some void-like tags will close the SVG element and be HTML tags.
 		if ( $processor->get_namespace() === 'svg' ) {
 			$this->assertSame( array( 'HTML', 'BODY', 'SVG', $void_tag ), $processor->get_breadcrumbs() );
 			$this->assertTrue( $processor->expects_closer() );