From 5f1cc864df7c5cefc2ac461a4e478732c9b05fca Mon Sep 17 00:00:00 2001
From: Carlos Bravo <carlos.bravo@automattic.com>
Date: Fri, 19 Apr 2024 16:19:09 +0200
Subject: [PATCH 01/24] Add debug notice for SSR

---
 .../interactivity-api/class-wp-interactivity-api.php      | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/wp-includes/interactivity-api/class-wp-interactivity-api.php b/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
index ac9a48982a5c5..4690189ec1e04 100644
--- a/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
+++ b/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
@@ -272,6 +272,8 @@ public function process_directives( string $html ): string {
 	 * it returns null if the HTML contains unbalanced tags.
 	 *
 	 * @since 6.5.0
+	 * @since 6.6.0 The function now adds a warning when the HTML contains unbalanced
+	 * tags orSVG/Math with directives.
 	 *
 	 * @param string $html            The HTML content to process.
 	 * @param array  $context_stack   The reference to the array used to keep track of contexts during processing.
@@ -295,6 +297,10 @@ private function process_directives_args( string $html, array &$context_stack, a
 			 * We still process the rest of the HTML.
 			 */
 			if ( 'SVG' === $tag_name || 'MATH' === $tag_name ) {
+				if ( $p->get_attribute_names_with_prefix( 'data-wp-' ) ) {
+					$message = __( 'SVG or MATH tags are currently incompatible with the directives processing. Please refrain from adding directives to them.' );
+					_doing_it_wrong( __METHOD__, $message, '6.6' );
+				}
 				$p->skip_to_tag_closer();
 				continue;
 			}
@@ -310,6 +316,8 @@ private function process_directives_args( string $html, array &$context_stack, a
 					 * stops processing it.
 					 */
 					$unbalanced = true;
+					$message    = __( 'Due to an unbalanced tag in the processed HTML, the Server-Side Rendering directives processing will not function correctly.' );
+					_doing_it_wrong( __METHOD__, $message, '6.6' );
 					break;
 				} else {
 					// Remove the last tag from the stack.

From ef7721d4f3b288460d8cf0a68334e8ef21548fa0 Mon Sep 17 00:00:00 2001
From: Carlos Bravo <carlos.bravo@automattic.com>
Date: Mon, 22 Apr 2024 12:52:33 +0200
Subject: [PATCH 02/24] Add tagname to warning

---
 .../interactivity-api/class-wp-interactivity-api.php       | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/wp-includes/interactivity-api/class-wp-interactivity-api.php b/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
index 4690189ec1e04..1586edf36297d 100644
--- a/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
+++ b/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
@@ -298,7 +298,8 @@ private function process_directives_args( string $html, array &$context_stack, a
 			 */
 			if ( 'SVG' === $tag_name || 'MATH' === $tag_name ) {
 				if ( $p->get_attribute_names_with_prefix( 'data-wp-' ) ) {
-					$message = __( 'SVG or MATH tags are currently incompatible with the directives processing. Please refrain from adding directives to them.' );
+					/* translators: 1: SVG or MATH HTML tag. */
+					$message = sprintf( '%1s tags are currently incompatible with the directives processing. Please refrain from adding directives to them.', $tag_name );
 					_doing_it_wrong( __METHOD__, $message, '6.6' );
 				}
 				$p->skip_to_tag_closer();
@@ -316,7 +317,8 @@ private function process_directives_args( string $html, array &$context_stack, a
 					 * stops processing it.
 					 */
 					$unbalanced = true;
-					$message    = __( 'Due to an unbalanced tag in the processed HTML, the Server-Side Rendering directives processing will not function correctly.' );
+					/* translators: 1: Tag that caused the error, could by any HTML tag. */
+					$message = sprintf( 'Due to an unbalanced %1s tag in the processed HTML, the Server-Side Rendering directives processing will not function correctly.', $tag_name );
 					_doing_it_wrong( __METHOD__, $message, '6.6' );
 					break;
 				} else {
@@ -390,7 +392,6 @@ private function process_directives_args( string $html, array &$context_stack, a
 				}
 			}
 		}
-
 		/*
 		 * It returns null if the HTML is unbalanced because unbalanced HTML is
 		 * not safe to process. In that case, the Interactivity API runtime will

From 12423e6cb49964b15d163e77f3bad10ed4e850c2 Mon Sep 17 00:00:00 2001
From: Carlos Bravo <carlos.bravo@automattic.com>
Date: Mon, 22 Apr 2024 16:55:10 +0200
Subject: [PATCH 03/24] Update tests checking the notice

---
 .../interactivity-api/wpInteractivityAPI.php  | 31 ++++++++++++++++---
 1 file changed, 27 insertions(+), 4 deletions(-)

diff --git a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI.php b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI.php
index 3c2050cab38ed..6e6c4f4e7079a 100644
--- a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI.php
+++ b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI.php
@@ -19,12 +19,32 @@ class Tests_Interactivity_API_WpInteractivityAPI extends WP_UnitTestCase {
 	 */
 	protected $interactivity;
 
+	/**
+	 * Array of expected `_doing_it_wrong()` calls.
+	 *
+	 * @var string[]
+	 */
+	protected $expected_doing_it_wrong;
+
 	/**
 	 * Set up.
 	 */
 	public function set_up() {
 		parent::set_up();
-		$this->interactivity = new WP_Interactivity_API();
+		$this->interactivity           = new WP_Interactivity_API();
+		$this->expected_doing_it_wrong = array();
+	}
+
+	/**
+	 * Declares an expected `_doing_it_wrong()` call from within a test.
+	 *
+	 * @since 4.2.0
+	 *
+	 * @param string $doing_it_wrong Name of the function, method, or class that appears in
+	 *                               the first argument of the source `_doing_it_wrong()` call.
+	 */
+	public function setExpectedIncorrectUsage( $doing_it_wrong ) {
+		$this->expected_doing_it_wrong[] = $doing_it_wrong;
 	}
 
 	public function charset_iso_8859_1() {
@@ -705,7 +725,8 @@ public function test_process_directives_changes_html_if_contains_svgs() {
 			</header>
 		';
 		$processed_html = $this->interactivity->process_directives( $html );
-		$p              = new WP_HTML_Tag_Processor( $processed_html );
+		$this->setExpectedIncorrectUsage( 'WP_Interactivity_API::process_directives_args' );
+		$p = new WP_HTML_Tag_Processor( $processed_html );
 		$p->next_tag( 'svg' );
 		$this->assertNull( $p->get_attribute( 'width' ) );
 		$p->next_tag( 'div' );
@@ -770,7 +791,8 @@ public function test_process_directives_change_html_if_contains_math() {
 			</header>
 		';
 		$processed_html = $this->interactivity->process_directives( $html );
-		$p              = new WP_HTML_Tag_Processor( $processed_html );
+		$this->setExpectedIncorrectUsage( 'WP_Interactivity_API::process_directives_args' );
+		$p = new WP_HTML_Tag_Processor( $processed_html );
 		$p->next_tag( 'math' );
 		$this->assertNull( $p->get_attribute( 'id' ) );
 		$p->next_tag( 'div' );
@@ -803,7 +825,8 @@ public function test_process_directives_does_not_change_inner_html_in_math() {
 			</header>
 		';
 		$processed_html = $this->interactivity->process_directives( $html );
-		$p              = new WP_HTML_Tag_Processor( $processed_html );
+		$this->setExpectedIncorrectUsage( 'WP_Interactivity_API::process_directives_args' );
+		$p = new WP_HTML_Tag_Processor( $processed_html );
 		$p->next_tag( 'div' );
 		$this->assertNull( $p->get_attribute( 'id' ) );
 	}

From 82a1df17736412c30b523a8ebc156cacf0c28b29 Mon Sep 17 00:00:00 2001
From: Carlos Bravo <carlos.bravo@automattic.com>
Date: Mon, 22 Apr 2024 17:09:50 +0200
Subject: [PATCH 04/24] Fix whitespace and rephrase the notice message

---
 .../interactivity-api/class-wp-interactivity-api.php          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/wp-includes/interactivity-api/class-wp-interactivity-api.php b/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
index 1586edf36297d..4a895e77db339 100644
--- a/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
+++ b/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
@@ -273,7 +273,7 @@ public function process_directives( string $html ): string {
 	 *
 	 * @since 6.5.0
 	 * @since 6.6.0 The function now adds a warning when the HTML contains unbalanced
-	 * tags orSVG/Math with directives.
+	 * tags or SVG/Math with directives.
 	 *
 	 * @param string $html            The HTML content to process.
 	 * @param array  $context_stack   The reference to the array used to keep track of contexts during processing.
@@ -318,7 +318,7 @@ private function process_directives_args( string $html, array &$context_stack, a
 					 */
 					$unbalanced = true;
 					/* translators: 1: Tag that caused the error, could by any HTML tag. */
-					$message = sprintf( 'Due to an unbalanced %1s tag in the processed HTML, the Server-Side Rendering directives processing will not function correctly.', $tag_name );
+					$message = sprintf( 'Due to an unbalanced %1s tag in the processed HTML, the directives will not be server side processed, JS runtime still work, but there will be a layout shift.', $tag_name );
 					_doing_it_wrong( __METHOD__, $message, '6.6' );
 					break;
 				} else {

From 9a172ec2685bd61db62f291e0adcd25ea7b29b7d Mon Sep 17 00:00:00 2001
From: Carlos Bravo <carlos.bravo@automattic.com>
Date: Tue, 23 Apr 2024 13:21:12 +0200
Subject: [PATCH 05/24] Fix internal directives inside svg or mathml

---
 .../interactivity-api/class-wp-interactivity-api.php           | 3 ++-
 tests/phpunit/tests/interactivity-api/wpInteractivityAPI.php   | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/wp-includes/interactivity-api/class-wp-interactivity-api.php b/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
index 4a895e77db339..21eb343df4627 100644
--- a/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
+++ b/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
@@ -297,7 +297,7 @@ private function process_directives_args( string $html, array &$context_stack, a
 			 * We still process the rest of the HTML.
 			 */
 			if ( 'SVG' === $tag_name || 'MATH' === $tag_name ) {
-				if ( $p->get_attribute_names_with_prefix( 'data-wp-' ) ) {
+				if ( $p->get_attribute_names_with_prefix( 'data-wp-' ) || str_contains( $p->get_updated_html(), 'data-wp-' ) ) {
 					/* translators: 1: SVG or MATH HTML tag. */
 					$message = sprintf( '%1s tags are currently incompatible with the directives processing. Please refrain from adding directives to them.', $tag_name );
 					_doing_it_wrong( __METHOD__, $message, '6.6' );
@@ -392,6 +392,7 @@ private function process_directives_args( string $html, array &$context_stack, a
 				}
 			}
 		}
+
 		/*
 		 * It returns null if the HTML is unbalanced because unbalanced HTML is
 		 * not safe to process. In that case, the Interactivity API runtime will
diff --git a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI.php b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI.php
index 6e6c4f4e7079a..93f93d84f76a8 100644
--- a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI.php
+++ b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI.php
@@ -759,7 +759,8 @@ public function test_process_directives_does_not_change_inner_html_in_svgs() {
 			</header>
 		';
 		$processed_html = $this->interactivity->process_directives( $html );
-		$p              = new WP_HTML_Tag_Processor( $processed_html );
+		$this->setExpectedIncorrectUsage( 'WP_Interactivity_API::process_directives_args' );
+		$p = new WP_HTML_Tag_Processor( $processed_html );
 		$p->next_tag( 'div' );
 		$this->assertNull( $p->get_attribute( 'id' ) );
 	}

From 8abb04065f5386a2c04b7d9ea21a328f5ce23513 Mon Sep 17 00:00:00 2001
From: Carlos Bravo <carlos.bravo@automattic.com>
Date: Thu, 25 Apr 2024 11:34:10 +0200
Subject: [PATCH 06/24] Refactor tests

---
 .../interactivity-api/wpInteractivityAPI.php  | 39 +++++--------------
 1 file changed, 10 insertions(+), 29 deletions(-)

diff --git a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI.php b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI.php
index 93f93d84f76a8..8915b8acc906c 100644
--- a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI.php
+++ b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI.php
@@ -19,32 +19,12 @@ class Tests_Interactivity_API_WpInteractivityAPI extends WP_UnitTestCase {
 	 */
 	protected $interactivity;
 
-	/**
-	 * Array of expected `_doing_it_wrong()` calls.
-	 *
-	 * @var string[]
-	 */
-	protected $expected_doing_it_wrong;
-
 	/**
 	 * Set up.
 	 */
 	public function set_up() {
 		parent::set_up();
-		$this->interactivity           = new WP_Interactivity_API();
-		$this->expected_doing_it_wrong = array();
-	}
-
-	/**
-	 * Declares an expected `_doing_it_wrong()` call from within a test.
-	 *
-	 * @since 4.2.0
-	 *
-	 * @param string $doing_it_wrong Name of the function, method, or class that appears in
-	 *                               the first argument of the source `_doing_it_wrong()` call.
-	 */
-	public function setExpectedIncorrectUsage( $doing_it_wrong ) {
-		$this->expected_doing_it_wrong[] = $doing_it_wrong;
+		$this->interactivity = new WP_Interactivity_API();
 	}
 
 	public function charset_iso_8859_1() {
@@ -670,6 +650,7 @@ public function test_process_directives_process_the_directives_in_the_correct_or
 	 * @dataProvider data_html_with_unbalanced_tags
 	 *
 	 * @param string $html HTML containing unbalanced tags and also a directive.
+	 * @expectedIncorrectUsage WP_Interactivity_API::process_directives_args
 	 */
 	public function test_process_directives_doesnt_change_html_if_contains_unbalanced_tags( $html ) {
 		$this->interactivity->state( 'myPlugin', array( 'id' => 'some-id' ) );
@@ -705,6 +686,7 @@ public static function data_html_with_unbalanced_tags() {
 	 * @ticket 60517
 	 *
 	 * @covers ::process_directives
+	 * @expectedIncorrectUsage WP_Interactivity_API::process_directives_args
 	 */
 	public function test_process_directives_changes_html_if_contains_svgs() {
 		$this->interactivity->state(
@@ -725,8 +707,7 @@ public function test_process_directives_changes_html_if_contains_svgs() {
 			</header>
 		';
 		$processed_html = $this->interactivity->process_directives( $html );
-		$this->setExpectedIncorrectUsage( 'WP_Interactivity_API::process_directives_args' );
-		$p = new WP_HTML_Tag_Processor( $processed_html );
+		$p              = new WP_HTML_Tag_Processor( $processed_html );
 		$p->next_tag( 'svg' );
 		$this->assertNull( $p->get_attribute( 'width' ) );
 		$p->next_tag( 'div' );
@@ -742,6 +723,7 @@ public function test_process_directives_changes_html_if_contains_svgs() {
 	 * @ticket 60517
 	 *
 	 * @covers ::process_directives
+	 * @expectedIncorrectUsage WP_Interactivity_API::process_directives_args
 	 */
 	public function test_process_directives_does_not_change_inner_html_in_svgs() {
 		$this->interactivity->state(
@@ -759,8 +741,7 @@ public function test_process_directives_does_not_change_inner_html_in_svgs() {
 			</header>
 		';
 		$processed_html = $this->interactivity->process_directives( $html );
-		$this->setExpectedIncorrectUsage( 'WP_Interactivity_API::process_directives_args' );
-		$p = new WP_HTML_Tag_Processor( $processed_html );
+		$p              = new WP_HTML_Tag_Processor( $processed_html );
 		$p->next_tag( 'div' );
 		$this->assertNull( $p->get_attribute( 'id' ) );
 	}
@@ -772,6 +753,7 @@ public function test_process_directives_does_not_change_inner_html_in_svgs() {
 	 * @ticket 60517
 	 *
 	 * @covers ::process_directives
+	 * @expectedIncorrectUsage WP_Interactivity_API::process_directives_args
 	 */
 	public function test_process_directives_change_html_if_contains_math() {
 		$this->interactivity->state(
@@ -792,8 +774,7 @@ public function test_process_directives_change_html_if_contains_math() {
 			</header>
 		';
 		$processed_html = $this->interactivity->process_directives( $html );
-		$this->setExpectedIncorrectUsage( 'WP_Interactivity_API::process_directives_args' );
-		$p = new WP_HTML_Tag_Processor( $processed_html );
+		$p              = new WP_HTML_Tag_Processor( $processed_html );
 		$p->next_tag( 'math' );
 		$this->assertNull( $p->get_attribute( 'id' ) );
 		$p->next_tag( 'div' );
@@ -806,6 +787,7 @@ public function test_process_directives_change_html_if_contains_math() {
 	 *
 	 * @ticket 60517
 	 *
+	 * @expectedIncorrectUsage WP_Interactivity_API::process_directives_args
 	 * @covers ::process_directives
 	 */
 	public function test_process_directives_does_not_change_inner_html_in_math() {
@@ -826,8 +808,7 @@ public function test_process_directives_does_not_change_inner_html_in_math() {
 			</header>
 		';
 		$processed_html = $this->interactivity->process_directives( $html );
-		$this->setExpectedIncorrectUsage( 'WP_Interactivity_API::process_directives_args' );
-		$p = new WP_HTML_Tag_Processor( $processed_html );
+		$p              = new WP_HTML_Tag_Processor( $processed_html );
 		$p->next_tag( 'div' );
 		$this->assertNull( $p->get_attribute( 'id' ) );
 	}

From 129ee82812964e7f128704d2594ce4ea69403aa0 Mon Sep 17 00:00:00 2001
From: Carlos Bravo <carlos.bravo@automattic.com>
Date: Thu, 25 Apr 2024 12:05:43 +0200
Subject: [PATCH 07/24] Update test to include previous directives triggering
 the notice

---
 .../tests/interactivity-api/wpInteractivityAPI.php       | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI.php b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI.php
index 8915b8acc906c..23000d7082802 100644
--- a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI.php
+++ b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI.php
@@ -686,7 +686,6 @@ public static function data_html_with_unbalanced_tags() {
 	 * @ticket 60517
 	 *
 	 * @covers ::process_directives
-	 * @expectedIncorrectUsage WP_Interactivity_API::process_directives_args
 	 */
 	public function test_process_directives_changes_html_if_contains_svgs() {
 		$this->interactivity->state(
@@ -698,22 +697,22 @@ public function test_process_directives_changes_html_if_contains_svgs() {
 		);
 		$html           = '
 			<header>
-				<svg height="100" data-wp-bind--width="myPlugin::state.width">
+				<div data-wp-bind--id="myPlugin::state.width"></div>
+				<svg height="100">
 					<title>Red Circle</title>
 					<circle cx="50" cy="50" r="40" stroke="black" stroke-width="3" fill="red" />
 				</svg>
 				<div data-wp-bind--id="myPlugin::state.id"></div>
-				<div data-wp-bind--id="myPlugin::state.width"></div>
 			</header>
 		';
 		$processed_html = $this->interactivity->process_directives( $html );
 		$p              = new WP_HTML_Tag_Processor( $processed_html );
+		$p->next_tag( 'div' );
+		$this->assertEquals( '100', $p->get_attribute( 'id' ) );
 		$p->next_tag( 'svg' );
 		$this->assertNull( $p->get_attribute( 'width' ) );
 		$p->next_tag( 'div' );
 		$this->assertEquals( 'some-id', $p->get_attribute( 'id' ) );
-		$p->next_tag( 'div' );
-		$this->assertEquals( '100', $p->get_attribute( 'id' ) );
 	}
 
 	/**

From eff4f6ccce23548168267f8310bdce889ff6397b Mon Sep 17 00:00:00 2001
From: Carlos Bravo <carlos.bravo@automattic.com>
Date: Thu, 25 Apr 2024 15:14:25 +0200
Subject: [PATCH 08/24] Do not check tags inside svgs or math for the notice

---
 .../interactivity-api/class-wp-interactivity-api.php   | 10 +++++-----
 .../tests/interactivity-api/wpInteractivityAPI.php     |  1 -
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/wp-includes/interactivity-api/class-wp-interactivity-api.php b/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
index 21eb343df4627..bcba49e50d08b 100644
--- a/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
+++ b/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
@@ -297,9 +297,9 @@ private function process_directives_args( string $html, array &$context_stack, a
 			 * We still process the rest of the HTML.
 			 */
 			if ( 'SVG' === $tag_name || 'MATH' === $tag_name ) {
-				if ( $p->get_attribute_names_with_prefix( 'data-wp-' ) || str_contains( $p->get_updated_html(), 'data-wp-' ) ) {
-					/* translators: 1: SVG or MATH HTML tag. */
-					$message = sprintf( '%1s tags are currently incompatible with the directives processing. Please refrain from adding directives to them.', $tag_name );
+				if ( $p->get_attribute_names_with_prefix( 'data-wp-' ) ) {
+					/* translators: %s: SVG or MATH HTML tag. */
+					$message = sprintf( '%s tags are currently incompatible with the directives processing. Please refrain from adding directives to them.', $tag_name );
 					_doing_it_wrong( __METHOD__, $message, '6.6' );
 				}
 				$p->skip_to_tag_closer();
@@ -317,8 +317,8 @@ private function process_directives_args( string $html, array &$context_stack, a
 					 * stops processing it.
 					 */
 					$unbalanced = true;
-					/* translators: 1: Tag that caused the error, could by any HTML tag. */
-					$message = sprintf( 'Due to an unbalanced %1s tag in the processed HTML, the directives will not be server side processed, JS runtime still work, but there will be a layout shift.', $tag_name );
+					/* translators: %s: Tag that caused the error, could by any HTML tag. */
+					$message = sprintf( 'Due to an unbalanced %s tag in the processed HTML, the directives will not be server side processed, JS runtime still work, but there will be a layout shift.', $tag_name );
 					_doing_it_wrong( __METHOD__, $message, '6.6' );
 					break;
 				} else {
diff --git a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI.php b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI.php
index 23000d7082802..16d7c0b9d6423 100644
--- a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI.php
+++ b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI.php
@@ -722,7 +722,6 @@ public function test_process_directives_changes_html_if_contains_svgs() {
 	 * @ticket 60517
 	 *
 	 * @covers ::process_directives
-	 * @expectedIncorrectUsage WP_Interactivity_API::process_directives_args
 	 */
 	public function test_process_directives_does_not_change_inner_html_in_svgs() {
 		$this->interactivity->state(

From a4474866c7798f6e8c18c55d4693a8e90ccbc577 Mon Sep 17 00:00:00 2001
From: Carlos Bravo <carlos.bravo@automattic.com>
Date: Thu, 25 Apr 2024 15:25:00 +0200
Subject: [PATCH 09/24] Forgot translation functions

---
 .../interactivity-api/class-wp-interactivity-api.php          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/wp-includes/interactivity-api/class-wp-interactivity-api.php b/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
index bcba49e50d08b..545e3a29a5827 100644
--- a/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
+++ b/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
@@ -299,7 +299,7 @@ private function process_directives_args( string $html, array &$context_stack, a
 			if ( 'SVG' === $tag_name || 'MATH' === $tag_name ) {
 				if ( $p->get_attribute_names_with_prefix( 'data-wp-' ) ) {
 					/* translators: %s: SVG or MATH HTML tag. */
-					$message = sprintf( '%s tags are currently incompatible with the directives processing. Please refrain from adding directives to them.', $tag_name );
+					$message = sprintf( __( '%s tags are currently incompatible with the directives processing. Please refrain from adding directives to them.' ), $tag_name );
 					_doing_it_wrong( __METHOD__, $message, '6.6' );
 				}
 				$p->skip_to_tag_closer();
@@ -318,7 +318,7 @@ private function process_directives_args( string $html, array &$context_stack, a
 					 */
 					$unbalanced = true;
 					/* translators: %s: Tag that caused the error, could by any HTML tag. */
-					$message = sprintf( 'Due to an unbalanced %s tag in the processed HTML, the directives will not be server side processed, JS runtime still work, but there will be a layout shift.', $tag_name );
+					$message = sprintf( __( 'Due to an unbalanced %s tag in the processed HTML, the directives will not be server side processed, JS runtime still work, but there will be a layout shift.' ), $tag_name );
 					_doing_it_wrong( __METHOD__, $message, '6.6' );
 					break;
 				} else {

From df899ddea1796f6aee1453a8757f1ef0e87a81ac Mon Sep 17 00:00:00 2001
From: Carlos Bravo <carlos.bravo@automattic.com>
Date: Thu, 25 Apr 2024 17:20:05 +0200
Subject: [PATCH 10/24] Move warning to the correct place, update tests

---
 .../class-wp-interactivity-api.php               | 16 ++++++++++------
 .../interactivity-api/wpInteractivityAPI.php     |  4 +++-
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/wp-includes/interactivity-api/class-wp-interactivity-api.php b/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
index 545e3a29a5827..f33ac9d098509 100644
--- a/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
+++ b/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
@@ -317,9 +317,6 @@ private function process_directives_args( string $html, array &$context_stack, a
 					 * stops processing it.
 					 */
 					$unbalanced = true;
-					/* translators: %s: Tag that caused the error, could by any HTML tag. */
-					$message = sprintf( __( 'Due to an unbalanced %s tag in the processed HTML, the directives will not be server side processed, JS runtime still work, but there will be a layout shift.' ), $tag_name );
-					_doing_it_wrong( __METHOD__, $message, '6.6' );
 					break;
 				} else {
 					// Remove the last tag from the stack.
@@ -392,13 +389,20 @@ private function process_directives_args( string $html, array &$context_stack, a
 				}
 			}
 		}
-
 		/*
 		 * It returns null if the HTML is unbalanced because unbalanced HTML is
 		 * not safe to process. In that case, the Interactivity API runtime will
-		 * update the HTML on the client side during the hydration.
+		 * update the HTML on the client side during the hydration. It will also
+		 * display a notice to the developer to inform them about the issue.
 		 */
-		return $unbalanced || 0 < count( $tag_stack ) ? null : $p->get_updated_html();
+		if ( $unbalanced || 0 < count( $tag_stack ) ) {
+			/* translators: %s: Tag that caused the error, could by any HTML tag. */
+			$message = sprintf( __( 'Due to an unbalanced %s tag in the processed HTML, the directives will not be server side processed, JS runtime still work, but there will be a layout shift.' ), $tag_name );
+			_doing_it_wrong( __METHOD__, $message, '6.6' );
+			return null;
+		}
+
+		return $p->get_updated_html();
 	}
 
 	/**
diff --git a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI.php b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI.php
index 16d7c0b9d6423..3c4be91544930 100644
--- a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI.php
+++ b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI.php
@@ -649,8 +649,10 @@ public function test_process_directives_process_the_directives_in_the_correct_or
 	 *
 	 * @dataProvider data_html_with_unbalanced_tags
 	 *
-	 * @param string $html HTML containing unbalanced tags and also a directive.
 	 * @expectedIncorrectUsage WP_Interactivity_API::process_directives_args
+	 *
+	 * @param string $html HTML containing unbalanced tags and also a directive.
+	 *
 	 */
 	public function test_process_directives_doesnt_change_html_if_contains_unbalanced_tags( $html ) {
 		$this->interactivity->state( 'myPlugin', array( 'id' => 'some-id' ) );

From f62474507d0dcfcebf73791a79419be182960db5 Mon Sep 17 00:00:00 2001
From: Carlos Bravo <carlos.bravo@automattic.com>
Date: Thu, 25 Apr 2024 18:37:23 +0200
Subject: [PATCH 11/24] Update tests

---
 .../tests/interactivity-api/wpInteractivityAPI-wp-each.php    | 4 ++++
 .../tests/interactivity-api/wpInteractivityAPI-wp-text.php    | 4 ++++
 .../wpInteractivityAPIDirectivesProcessor.php                 | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-each.php b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-each.php
index 42edd9f1b3838..fa166c1799d33 100644
--- a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-each.php
+++ b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-each.php
@@ -580,6 +580,8 @@ public function test_wp_each_nested_template_tags_using_previous_item_as_list()
 	 * @ticket 60356
 	 *
 	 * @covers ::process_directives
+	 *
+	 * @expectedIncorrectUsage WP_Interactivity_API::process_directives_args
 	 */
 	public function test_wp_each_unbalanced_tags() {
 		$original = '' .
@@ -598,6 +600,8 @@ public function test_wp_each_unbalanced_tags() {
 	 * @ticket 60356
 	 *
 	 * @covers ::process_directives
+	 *
+	 * @expectedIncorrectUsage WP_Interactivity_API::process_directives_args
 	 */
 	public function test_wp_each_unbalanced_tags_in_nested_template_tags() {
 		$this->interactivity->state( 'myPlugin', array( 'list2' => array( 3, 4 ) ) );
diff --git a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-text.php b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-text.php
index 2fa9363ac93f4..792d692e1dccc 100644
--- a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-text.php
+++ b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-text.php
@@ -117,6 +117,8 @@ public function test_wp_text_sets_inner_content_with_nested_tags() {
 	 * @ticket 60356
 	 *
 	 * @covers ::process_directives
+	 *
+	 * @expectedIncorrectUsage WP_Interactivity_API::process_directives_args
 	 */
 	public function test_wp_text_sets_inner_content_even_with_unbalanced_but_different_tags_inside_content() {
 		$html     = '<div data-wp-text="myPlugin::state.text"><span>Text</div>';
@@ -131,6 +133,8 @@ public function test_wp_text_sets_inner_content_even_with_unbalanced_but_differe
 	 * @ticket 60356
 	 *
 	 * @covers ::process_directives
+	 *
+	 * @expectedIncorrectUsage WP_Interactivity_API::process_directives_args
 	 */
 	public function test_wp_text_fails_with_unbalanced_and_same_tags_inside_content() {
 		$html     = '<div data-wp-text="myPlugin::state.text">Text<div></div>';
diff --git a/tests/phpunit/tests/interactivity-api/wpInteractivityAPIDirectivesProcessor.php b/tests/phpunit/tests/interactivity-api/wpInteractivityAPIDirectivesProcessor.php
index 5812c061666c8..de87f0a71413f 100644
--- a/tests/phpunit/tests/interactivity-api/wpInteractivityAPIDirectivesProcessor.php
+++ b/tests/phpunit/tests/interactivity-api/wpInteractivityAPIDirectivesProcessor.php
@@ -110,6 +110,8 @@ public function test_get_content_between_balanced_template_tags_no_tags() {
 	 * @ticket 60356
 	 *
 	 * @covers ::get_content_between_balanced_template_tags
+	 *
+	 * @expectedIncorrectUsage WP_Interactivity_API::process_directives_args
 	 */
 	public function test_get_content_between_balanced_template_tags_with_unbalanced_tags() {
 		$content = '<template>Missing closing template';
@@ -355,6 +357,8 @@ public function test_set_content_between_balanced_tags_non_existent_tag() {
 	 * @ticket 60356
 	 *
 	 * @covers ::set_content_between_balanced_tags
+	 *
+	 * @expectedIncorrectUsage WP_Interactivity_API::process_directives_args
 	 */
 	public function test_set_content_between_balanced_tags_with_unbalanced_tags() {
 		$new_content = 'New text';

From 5562f1232a2b73e28bcb47a036413067b39d5855 Mon Sep 17 00:00:00 2001
From: Carlos Bravo <carlos.bravo@automattic.com>
Date: Fri, 26 Apr 2024 12:11:07 +0200
Subject: [PATCH 12/24] Rename tests to be able to run them individually

---
 .../interactivity-api/class-wp-interactivity-api.php         | 4 ++--
 tests/phpunit/tests/interactivity-api/wpInteractivityAPI.php | 5 -----
 .../wpInteractivityAPIDirectivesProcessor.php                | 2 --
 ...ractivityAPI-wp-text.php => wpInteractivityAPIWPText.php} | 3 +--
 4 files changed, 3 insertions(+), 11 deletions(-)
 rename tests/phpunit/tests/interactivity-api/{wpInteractivityAPI-wp-text.php => wpInteractivityAPIWPText.php} (97%)

diff --git a/src/wp-includes/interactivity-api/class-wp-interactivity-api.php b/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
index f33ac9d098509..9e1fbf9e0798f 100644
--- a/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
+++ b/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
@@ -300,7 +300,7 @@ private function process_directives_args( string $html, array &$context_stack, a
 				if ( $p->get_attribute_names_with_prefix( 'data-wp-' ) ) {
 					/* translators: %s: SVG or MATH HTML tag. */
 					$message = sprintf( __( '%s tags are currently incompatible with the directives processing. Please refrain from adding directives to them.' ), $tag_name );
-					_doing_it_wrong( __METHOD__, $message, '6.6' );
+					_doing_it_wrong( __METHOD__, $message, '6.6.0' );
 				}
 				$p->skip_to_tag_closer();
 				continue;
@@ -398,7 +398,7 @@ private function process_directives_args( string $html, array &$context_stack, a
 		if ( $unbalanced || 0 < count( $tag_stack ) ) {
 			/* translators: %s: Tag that caused the error, could by any HTML tag. */
 			$message = sprintf( __( 'Due to an unbalanced %s tag in the processed HTML, the directives will not be server side processed, JS runtime still work, but there will be a layout shift.' ), $tag_name );
-			_doing_it_wrong( __METHOD__, $message, '6.6' );
+			_doing_it_wrong( __METHOD__, $message, '6.6.0' );
 			return null;
 		}
 
diff --git a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI.php b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI.php
index 3c4be91544930..8af2da1cd0861 100644
--- a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI.php
+++ b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI.php
@@ -699,7 +699,6 @@ public function test_process_directives_changes_html_if_contains_svgs() {
 		);
 		$html           = '
 			<header>
-				<div data-wp-bind--id="myPlugin::state.width"></div>
 				<svg height="100">
 					<title>Red Circle</title>
 					<circle cx="50" cy="50" r="40" stroke="black" stroke-width="3" fill="red" />
@@ -710,10 +709,6 @@ public function test_process_directives_changes_html_if_contains_svgs() {
 		$processed_html = $this->interactivity->process_directives( $html );
 		$p              = new WP_HTML_Tag_Processor( $processed_html );
 		$p->next_tag( 'div' );
-		$this->assertEquals( '100', $p->get_attribute( 'id' ) );
-		$p->next_tag( 'svg' );
-		$this->assertNull( $p->get_attribute( 'width' ) );
-		$p->next_tag( 'div' );
 		$this->assertEquals( 'some-id', $p->get_attribute( 'id' ) );
 	}
 
diff --git a/tests/phpunit/tests/interactivity-api/wpInteractivityAPIDirectivesProcessor.php b/tests/phpunit/tests/interactivity-api/wpInteractivityAPIDirectivesProcessor.php
index de87f0a71413f..be77fb9683e92 100644
--- a/tests/phpunit/tests/interactivity-api/wpInteractivityAPIDirectivesProcessor.php
+++ b/tests/phpunit/tests/interactivity-api/wpInteractivityAPIDirectivesProcessor.php
@@ -111,7 +111,6 @@ public function test_get_content_between_balanced_template_tags_no_tags() {
 	 *
 	 * @covers ::get_content_between_balanced_template_tags
 	 *
-	 * @expectedIncorrectUsage WP_Interactivity_API::process_directives_args
 	 */
 	public function test_get_content_between_balanced_template_tags_with_unbalanced_tags() {
 		$content = '<template>Missing closing template';
@@ -358,7 +357,6 @@ public function test_set_content_between_balanced_tags_non_existent_tag() {
 	 *
 	 * @covers ::set_content_between_balanced_tags
 	 *
-	 * @expectedIncorrectUsage WP_Interactivity_API::process_directives_args
 	 */
 	public function test_set_content_between_balanced_tags_with_unbalanced_tags() {
 		$new_content = 'New text';
diff --git a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-text.php b/tests/phpunit/tests/interactivity-api/wpInteractivityAPIWPText.php
similarity index 97%
rename from tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-text.php
rename to tests/phpunit/tests/interactivity-api/wpInteractivityAPIWPText.php
index 792d692e1dccc..b24c3678fb79a 100644
--- a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-text.php
+++ b/tests/phpunit/tests/interactivity-api/wpInteractivityAPIWPText.php
@@ -12,7 +12,7 @@
  *
  * @group interactivity-api
  */
-class Tests_WP_Interactivity_API_WP_Text extends WP_UnitTestCase {
+class Tests_Interactivity_API_WpInteractivityAPIWPText extends WP_UnitTestCase {
 	/**
 	 * Instance of WP_Interactivity_API.
 	 *
@@ -118,7 +118,6 @@ public function test_wp_text_sets_inner_content_with_nested_tags() {
 	 *
 	 * @covers ::process_directives
 	 *
-	 * @expectedIncorrectUsage WP_Interactivity_API::process_directives_args
 	 */
 	public function test_wp_text_sets_inner_content_even_with_unbalanced_but_different_tags_inside_content() {
 		$html     = '<div data-wp-text="myPlugin::state.text"><span>Text</div>';

From 77d14a890f5f629c5756779a43ad08cbee28fe49 Mon Sep 17 00:00:00 2001
From: Carlos Bravo <carlos.bravo@automattic.com>
Date: Wed, 8 May 2024 17:55:14 +0200
Subject: [PATCH 13/24] Update error messages

---
 .../interactivity-api/class-wp-interactivity-api.php       | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/wp-includes/interactivity-api/class-wp-interactivity-api.php b/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
index 9e1fbf9e0798f..fdadb6518159b 100644
--- a/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
+++ b/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
@@ -298,8 +298,8 @@ private function process_directives_args( string $html, array &$context_stack, a
 			 */
 			if ( 'SVG' === $tag_name || 'MATH' === $tag_name ) {
 				if ( $p->get_attribute_names_with_prefix( 'data-wp-' ) ) {
-					/* translators: %s: SVG or MATH HTML tag. */
-					$message = sprintf( __( '%s tags are currently incompatible with the directives processing. Please refrain from adding directives to them.' ), $tag_name );
+					/* translators: 1: SVG or MATH HTML tag, 2: Namespace of the interactive block.  */
+					$message = sprintf( __( 'Interactivity directives were detected on an incompatible %1$s tag when processing "%2$s". These directives will be ignored.' ), $tag_name, end( $namespace_stack ) );
 					_doing_it_wrong( __METHOD__, $message, '6.6.0' );
 				}
 				$p->skip_to_tag_closer();
@@ -396,8 +396,9 @@ private function process_directives_args( string $html, array &$context_stack, a
 		 * display a notice to the developer to inform them about the issue.
 		 */
 		if ( $unbalanced || 0 < count( $tag_stack ) ) {
+			$tag_errored = 0 < count( $tag_stack ) ? end( $tag_stack )[0] : $tag_name;
 			/* translators: %s: Tag that caused the error, could by any HTML tag. */
-			$message = sprintf( __( 'Due to an unbalanced %s tag in the processed HTML, the directives will not be server side processed, JS runtime still work, but there will be a layout shift.' ), $tag_name );
+			$message = sprintf( __( 'Interactivity directives failed to process in "%1$s" due to a missing "%2$s" end tag.' ), end( $namespace_stack ), $tag_errored );
 			_doing_it_wrong( __METHOD__, $message, '6.6.0' );
 			return null;
 		}

From 42a0572edfa58a57743892a5451344b25b156f00 Mon Sep 17 00:00:00 2001
From: Carlos Bravo <carlos.bravo@automattic.com>
Date: Wed, 22 May 2024 16:23:14 +0200
Subject: [PATCH 14/24] Add namespace check and warnings

---
 .../class-wp-interactivity-api.php            | 10 +++++++-
 .../interactivity-api/wpInteractivityAPI.php  | 23 +++++++++++++++++--
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/src/wp-includes/interactivity-api/class-wp-interactivity-api.php b/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
index fdadb6518159b..0fd23231ca5f1 100644
--- a/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
+++ b/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
@@ -421,7 +421,15 @@ private function process_directives_args( string $html, array &$context_stack, a
 	 */
 	private function evaluate( $directive_value, string $default_namespace, $context = false ) {
 		list( $ns, $path ) = $this->extract_directive_value( $directive_value, $default_namespace );
-		if ( empty( $path ) ) {
+		if ( 'null' === $default_namespace ) {
+			$message = 'The namespace defined cannot be null.';
+			_doing_it_wrong( __METHOD__, $message, '6.6.0' );
+			return null;
+		}
+		if ( empty( $ns ) || empty( $path ) ) {
+			/* translators: %s: The directive value referenced. */
+			$message = sprintf( 'Namespace or reference path cannot be empty. Directive value referenced: %s ', $directive_value );
+			_doing_it_wrong( __METHOD__, $message, '6.6.0' );
 			return null;
 		}
 
diff --git a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI.php b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI.php
index 8af2da1cd0861..86eeabc05fd75 100644
--- a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI.php
+++ b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI.php
@@ -814,7 +814,7 @@ public function test_process_directives_does_not_change_inner_html_in_math() {
 	 * @param string $directive_value The directive attribute value to evaluate.
 	 * @return mixed The result of the evaluate method.
 	 */
-	private function evaluate( $directive_value ) {
+	private function evaluate( $directive_value, $default_namespace = 'myPlugin' ) {
 		$generate_state = function ( $name ) {
 			return array(
 				'key'    => $name,
@@ -829,7 +829,7 @@ private function evaluate( $directive_value ) {
 		);
 		$evaluate = new ReflectionMethod( $this->interactivity, 'evaluate' );
 		$evaluate->setAccessible( true );
-		return $evaluate->invokeArgs( $this->interactivity, array( $directive_value, 'myPlugin', $context ) );
+		return $evaluate->invokeArgs( $this->interactivity, array( $directive_value, $default_namespace, $context ) );
 	}
 
 	/**
@@ -923,6 +923,25 @@ public function test_evaluate_nested_value() {
 		$this->assertEquals( 'otherPlugin-context-nested', $result );
 	}
 
+	/**
+	 * Tests the `evaluate` method for non valid namespace values.
+	 *
+	 * @ticket 61044
+	 *
+	 * @covers ::evaluate
+	 * @expectedIncorrectUsage WP_Interactivity_API::evaluate
+	 */
+	public function test_evaluate_unvalid_namespaces() {
+		$result = $this->evaluate( 'path', 'null' );
+		$this->assertNull( $result );
+
+		$result = $this->evaluate( 'path', '' );
+		$this->assertNull( $result );
+
+		$result = $this->evaluate( 'path', '{}' );
+		$this->assertNull( $result );
+	}
+
 	/**
 	 * Tests the `kebab_to_camel_case` method.
 	 *

From 1e7358f70df25e27a7cc6b6c922a7e1b958bafa8 Mon Sep 17 00:00:00 2001
From: Carlos Bravo <carlos.bravo@automattic.com>
Date: Wed, 22 May 2024 16:28:53 +0200
Subject: [PATCH 15/24] Remove added lines

---
 .../interactivity-api/wpInteractivityAPIDirectivesProcessor.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tests/phpunit/tests/interactivity-api/wpInteractivityAPIDirectivesProcessor.php b/tests/phpunit/tests/interactivity-api/wpInteractivityAPIDirectivesProcessor.php
index be77fb9683e92..5812c061666c8 100644
--- a/tests/phpunit/tests/interactivity-api/wpInteractivityAPIDirectivesProcessor.php
+++ b/tests/phpunit/tests/interactivity-api/wpInteractivityAPIDirectivesProcessor.php
@@ -110,7 +110,6 @@ public function test_get_content_between_balanced_template_tags_no_tags() {
 	 * @ticket 60356
 	 *
 	 * @covers ::get_content_between_balanced_template_tags
-	 *
 	 */
 	public function test_get_content_between_balanced_template_tags_with_unbalanced_tags() {
 		$content = '<template>Missing closing template';
@@ -356,7 +355,6 @@ public function test_set_content_between_balanced_tags_non_existent_tag() {
 	 * @ticket 60356
 	 *
 	 * @covers ::set_content_between_balanced_tags
-	 *
 	 */
 	public function test_set_content_between_balanced_tags_with_unbalanced_tags() {
 		$new_content = 'New text';

From 3bf582d15b39c4f59b488e0e16e6f46d67a74144 Mon Sep 17 00:00:00 2001
From: Carlos Bravo <carlos.bravo@automattic.com>
Date: Wed, 22 May 2024 16:38:08 +0200
Subject: [PATCH 16/24] Add since comments

---
 .../interactivity-api/class-wp-interactivity-api.php           | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/wp-includes/interactivity-api/class-wp-interactivity-api.php b/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
index 0fd23231ca5f1..cdaeb6e41665d 100644
--- a/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
+++ b/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
@@ -411,13 +411,14 @@ private function process_directives_args( string $html, array &$context_stack, a
 	 * store namespace, state and context.
 	 *
 	 * @since 6.5.0
+	 * @since 6.6.0 The function now adds a warning when the namespace is null, falsy, or the directive value is empty.
 	 *
 	 * @param string|true $directive_value   The directive attribute value string or `true` when it's a boolean attribute.
 	 * @param string      $default_namespace The default namespace to use if none is explicitly defined in the directive
 	 *                                       value.
 	 * @param array|false $context           The current context for evaluating the directive or false if there is no
 	 *                                       context.
-	 * @return mixed|null The result of the evaluation. Null if the reference path doesn't exist.
+	 * @return mixed|null The result of the evaluation. Null if the reference path doesn't exist or the namespace is falsy.
 	 */
 	private function evaluate( $directive_value, string $default_namespace, $context = false ) {
 		list( $ns, $path ) = $this->extract_directive_value( $directive_value, $default_namespace );

From 03654c41042a7b32d5f734e194ec3547e98eded3 Mon Sep 17 00:00:00 2001
From: Carlos Bravo <carlos.bravo@automattic.com>
Date: Wed, 22 May 2024 17:19:08 +0200
Subject: [PATCH 17/24] Add expected incorrect usage

---
 .../tests/interactivity-api/wpInteractivityAPI-wp-bind.php      | 2 ++
 .../tests/interactivity-api/wpInteractivityAPI-wp-class.php     | 2 ++
 .../tests/interactivity-api/wpInteractivityAPI-wp-context.php   | 1 +
 .../tests/interactivity-api/wpInteractivityAPI-wp-style.php     | 2 ++
 4 files changed, 7 insertions(+)

diff --git a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-bind.php b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-bind.php
index ef1b79326d949..0a6ffcb2a5da0 100644
--- a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-bind.php
+++ b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-bind.php
@@ -154,6 +154,7 @@ public function test_wp_bind_doesnt_do_anything_on_non_existent_references() {
 	 * @ticket 60356
 	 *
 	 * @covers ::process_directives
+	 * @expectedIncorrectUsage WP_Interactivity_API::evaluate
 	 */
 	public function test_wp_bind_ignores_empty_value() {
 		$html     = '<div data-wp-bind--id="">Text</div>';
@@ -167,6 +168,7 @@ public function test_wp_bind_ignores_empty_value() {
 	 * @ticket 60356
 	 *
 	 * @covers ::process_directives
+	 * @expectedIncorrectUsage WP_Interactivity_API::evaluate
 	 */
 	public function test_wp_bind_ignores_without_value() {
 		$html     = '<div data-wp-bind--id>Text</div>';
diff --git a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-class.php b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-class.php
index 95fdaed6f7504..b9cf16952be91 100644
--- a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-class.php
+++ b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-class.php
@@ -237,6 +237,7 @@ public function test_wp_class_doesnt_change_class_attribute_with_empty_directive
 	 * @ticket 60356
 	 *
 	 * @covers ::process_directives
+	 * @expectedIncorrectUsage WP_Interactivity_API::evaluate
 	 */
 	public function test_wp_class_doesnt_change_class_attribute_with_empty_value() {
 		$html    = '<div class="other-class" data-wp-class--some-class="">Text</div>';
@@ -251,6 +252,7 @@ public function test_wp_class_doesnt_change_class_attribute_with_empty_value() {
 	 * @ticket 60356
 	 *
 	 * @covers ::process_directives
+	 * @expectedIncorrectUsage WP_Interactivity_API::evaluate
 	 */
 	public function test_wp_class_doesnt_change_class_attribute_without_value() {
 		$html    = '<div class="other-class" data-wp-class--some-class>Text</div>';
diff --git a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-context.php b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-context.php
index 469e1d6e1418a..93e2528126215 100644
--- a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-context.php
+++ b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-context.php
@@ -317,6 +317,7 @@ public function test_wp_context_works_with_multiple_directives() {
 	 * @ticket 60356
 	 *
 	 * @covers ::process_directives
+	 * @expectedIncorrectUsage WP_Interactivity_API::evaluate
 	 */
 	public function test_wp_context_directive_doesnt_work_without_any_namespace() {
 		$html    = '
diff --git a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-style.php b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-style.php
index d3ac196eae484..3b645b0dd4df3 100644
--- a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-style.php
+++ b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-style.php
@@ -365,6 +365,7 @@ public function test_wp_style_doesnt_change_style_attribute_with_empty_directive
 	 * @ticket 60356
 	 *
 	 * @covers ::process_directives
+	 * @expectedIncorrectUsage WP_Interactivity_API::evaluate
 	 */
 	public function test_wp_style_doesnt_change_style_attribute_with_empty_value() {
 		$html    = '<div style="padding:10px" data-wp-style--color="">Text</div>';
@@ -379,6 +380,7 @@ public function test_wp_style_doesnt_change_style_attribute_with_empty_value() {
 	 * @ticket 60356
 	 *
 	 * @covers ::process_directives
+	 * @expectedIncorrectUsage WP_Interactivity_API::evaluate
 	 */
 	public function test_wp_style_doesnt_change_style_attribute_without_value() {
 		$html    = '<div style="padding: 10px;" data-wp-style--color>Text</div>';

From 6278e20908103d0797b144af2e8d8dc82baa4882 Mon Sep 17 00:00:00 2001
From: Carlos Bravo <carlos.bravo@automattic.com>
Date: Thu, 23 May 2024 22:06:58 +0200
Subject: [PATCH 18/24] Address suggestions, still inner svg or math tags left

---
 .../interactivity-api/class-wp-interactivity-api.php        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/wp-includes/interactivity-api/class-wp-interactivity-api.php b/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
index cdaeb6e41665d..89fe2a760241d 100644
--- a/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
+++ b/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
@@ -273,7 +273,7 @@ public function process_directives( string $html ): string {
 	 *
 	 * @since 6.5.0
 	 * @since 6.6.0 The function now adds a warning when the HTML contains unbalanced
-	 * tags or SVG/Math with directives.
+	 *              tags or SVG/Math with directives.
 	 *
 	 * @param string $html            The HTML content to process.
 	 * @param array  $context_stack   The reference to the array used to keep track of contexts during processing.
@@ -298,7 +298,7 @@ private function process_directives_args( string $html, array &$context_stack, a
 			 */
 			if ( 'SVG' === $tag_name || 'MATH' === $tag_name ) {
 				if ( $p->get_attribute_names_with_prefix( 'data-wp-' ) ) {
-					/* translators: 1: SVG or MATH HTML tag, 2: Namespace of the interactive block.  */
+					/* translators: 1: SVG or MATH HTML tag, 2: Namespace of the interactive block. */
 					$message = sprintf( __( 'Interactivity directives were detected on an incompatible %1$s tag when processing "%2$s". These directives will be ignored.' ), $tag_name, end( $namespace_stack ) );
 					_doing_it_wrong( __METHOD__, $message, '6.6.0' );
 				}
@@ -427,7 +427,7 @@ private function evaluate( $directive_value, string $default_namespace, $context
 			_doing_it_wrong( __METHOD__, $message, '6.6.0' );
 			return null;
 		}
-		if ( empty( $ns ) || empty( $path ) ) {
+		if ( ! $ns || ! $path ) {
 			/* translators: %s: The directive value referenced. */
 			$message = sprintf( 'Namespace or reference path cannot be empty. Directive value referenced: %s ', $directive_value );
 			_doing_it_wrong( __METHOD__, $message, '6.6.0' );

From 82629d33dbb8cc254bbd2d951dd1f6643d8c1bab Mon Sep 17 00:00:00 2001
From: Carlos Bravo <carlos.bravo@automattic.com>
Date: Mon, 27 May 2024 14:18:45 +0200
Subject: [PATCH 19/24] Remove null string checking

---
 .../interactivity-api/class-wp-interactivity-api.php         | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/wp-includes/interactivity-api/class-wp-interactivity-api.php b/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
index 89fe2a760241d..9e9fc210d2d3c 100644
--- a/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
+++ b/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
@@ -422,11 +422,6 @@ private function process_directives_args( string $html, array &$context_stack, a
 	 */
 	private function evaluate( $directive_value, string $default_namespace, $context = false ) {
 		list( $ns, $path ) = $this->extract_directive_value( $directive_value, $default_namespace );
-		if ( 'null' === $default_namespace ) {
-			$message = 'The namespace defined cannot be null.';
-			_doing_it_wrong( __METHOD__, $message, '6.6.0' );
-			return null;
-		}
 		if ( ! $ns || ! $path ) {
 			/* translators: %s: The directive value referenced. */
 			$message = sprintf( 'Namespace or reference path cannot be empty. Directive value referenced: %s ', $directive_value );

From 64d0aeaae3ec77f71f6e466821e1ed483854a941 Mon Sep 17 00:00:00 2001
From: Carlos Bravo <carlos.bravo@automattic.com>
Date: Tue, 28 May 2024 11:31:33 +0200
Subject: [PATCH 20/24] Revert SVG and MATH warning

---
 .../class-wp-interactivity-api-directives-processor.php      | 1 +
 .../interactivity-api/class-wp-interactivity-api.php         | 5 -----
 tests/phpunit/tests/interactivity-api/wpInteractivityAPI.php | 2 --
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/wp-includes/interactivity-api/class-wp-interactivity-api-directives-processor.php b/src/wp-includes/interactivity-api/class-wp-interactivity-api-directives-processor.php
index 3b2dcb1237971..5d195dd3bd0da 100644
--- a/src/wp-includes/interactivity-api/class-wp-interactivity-api-directives-processor.php
+++ b/src/wp-includes/interactivity-api/class-wp-interactivity-api-directives-processor.php
@@ -198,6 +198,7 @@ private function get_balanced_tag_bookmarks() {
 	public function skip_to_tag_closer(): bool {
 		$depth    = 1;
 		$tag_name = $this->get_tag();
+
 		while ( $depth > 0 && $this->next_tag(
 			array(
 				'tag_name'    => $tag_name,
diff --git a/src/wp-includes/interactivity-api/class-wp-interactivity-api.php b/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
index 9e9fc210d2d3c..de8de9af85544 100644
--- a/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
+++ b/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
@@ -297,11 +297,6 @@ private function process_directives_args( string $html, array &$context_stack, a
 			 * We still process the rest of the HTML.
 			 */
 			if ( 'SVG' === $tag_name || 'MATH' === $tag_name ) {
-				if ( $p->get_attribute_names_with_prefix( 'data-wp-' ) ) {
-					/* translators: 1: SVG or MATH HTML tag, 2: Namespace of the interactive block. */
-					$message = sprintf( __( 'Interactivity directives were detected on an incompatible %1$s tag when processing "%2$s". These directives will be ignored.' ), $tag_name, end( $namespace_stack ) );
-					_doing_it_wrong( __METHOD__, $message, '6.6.0' );
-				}
 				$p->skip_to_tag_closer();
 				continue;
 			}
diff --git a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI.php b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI.php
index 86eeabc05fd75..81825396194e8 100644
--- a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI.php
+++ b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI.php
@@ -748,7 +748,6 @@ public function test_process_directives_does_not_change_inner_html_in_svgs() {
 	 * @ticket 60517
 	 *
 	 * @covers ::process_directives
-	 * @expectedIncorrectUsage WP_Interactivity_API::process_directives_args
 	 */
 	public function test_process_directives_change_html_if_contains_math() {
 		$this->interactivity->state(
@@ -782,7 +781,6 @@ public function test_process_directives_change_html_if_contains_math() {
 	 *
 	 * @ticket 60517
 	 *
-	 * @expectedIncorrectUsage WP_Interactivity_API::process_directives_args
 	 * @covers ::process_directives
 	 */
 	public function test_process_directives_does_not_change_inner_html_in_math() {

From a9f15d878cf9eb650dc4e7291e9e927efafa2760 Mon Sep 17 00:00:00 2001
From: Carlos Bravo <carlos.bravo@automattic.com>
Date: Wed, 29 May 2024 16:09:16 +0200
Subject: [PATCH 21/24] Update descriptions

---
 .../interactivity-api/class-wp-interactivity-api.php         | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/wp-includes/interactivity-api/class-wp-interactivity-api.php b/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
index de8de9af85544..bfdeb74a697fb 100644
--- a/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
+++ b/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
@@ -272,8 +272,7 @@ public function process_directives( string $html ): string {
 	 * it returns null if the HTML contains unbalanced tags.
 	 *
 	 * @since 6.5.0
-	 * @since 6.6.0 The function now adds a warning when the HTML contains unbalanced
-	 *              tags or SVG/Math with directives.
+	 * @since 6.6.0 The function displays a warning message when the HTML contains unbalanced tags.
 	 *
 	 * @param string $html            The HTML content to process.
 	 * @param array  $context_stack   The reference to the array used to keep track of contexts during processing.
@@ -392,7 +391,7 @@ private function process_directives_args( string $html, array &$context_stack, a
 		 */
 		if ( $unbalanced || 0 < count( $tag_stack ) ) {
 			$tag_errored = 0 < count( $tag_stack ) ? end( $tag_stack )[0] : $tag_name;
-			/* translators: %s: Tag that caused the error, could by any HTML tag. */
+			/* translators: %s: The tag that caused the error; could be any HTML tag. */
 			$message = sprintf( __( 'Interactivity directives failed to process in "%1$s" due to a missing "%2$s" end tag.' ), end( $namespace_stack ), $tag_errored );
 			_doing_it_wrong( __METHOD__, $message, '6.6.0' );
 			return null;

From b15ad5f3cb9f6ac1f8249d50908d675cb9673204 Mon Sep 17 00:00:00 2001
From: Carlos Bravo <carlos.bravo@automattic.com>
Date: Sat, 1 Jun 2024 22:36:37 +0200
Subject: [PATCH 22/24] Add diferent message for inner SVG or MATH tags

---
 ...s-wp-interactivity-api-directives-processor.php | 14 ++++++++++----
 .../class-wp-interactivity-api.php                 |  5 +++++
 .../tests/interactivity-api/wpInteractivityAPI.php |  4 ++++
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/wp-includes/interactivity-api/class-wp-interactivity-api-directives-processor.php b/src/wp-includes/interactivity-api/class-wp-interactivity-api-directives-processor.php
index 5d195dd3bd0da..59d8db48fcc69 100644
--- a/src/wp-includes/interactivity-api/class-wp-interactivity-api-directives-processor.php
+++ b/src/wp-includes/interactivity-api/class-wp-interactivity-api-directives-processor.php
@@ -201,14 +201,20 @@ public function skip_to_tag_closer(): bool {
 
 		while ( $depth > 0 && $this->next_tag(
 			array(
-				'tag_name'    => $tag_name,
 				'tag_closers' => 'visit',
 			)
 		) ) {
-			if ( $this->has_self_closing_flag() ) {
-				continue;
+			if ( ! $this->is_tag_closer() && $this->get_attribute_names_with_prefix( 'data-wp-' ) ) {
+				/* translators: 1: SVG or MATH HTML tag, 2: Namespace of the interactive block. */
+				$message = sprintf( __( 'Interactivity directives were detected inside an incompatible %1$s tag. These directives will be ignored in the server side render.' ), $tag_name );
+				_doing_it_wrong( __METHOD__, $message, '6.6.0' );
+			}
+			if ( $this->get_tag() === $tag_name ) {
+				if ( $this->has_self_closing_flag() ) {
+						continue;
+				}
+				$depth += $this->is_tag_closer() ? -1 : 1;
 			}
-			$depth += $this->is_tag_closer() ? -1 : 1;
 		}
 
 		return 0 === $depth;
diff --git a/src/wp-includes/interactivity-api/class-wp-interactivity-api.php b/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
index bfdeb74a697fb..ac0ecaf851deb 100644
--- a/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
+++ b/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
@@ -296,6 +296,11 @@ private function process_directives_args( string $html, array &$context_stack, a
 			 * We still process the rest of the HTML.
 			 */
 			if ( 'SVG' === $tag_name || 'MATH' === $tag_name ) {
+				if ( $p->get_attribute_names_with_prefix( 'data-wp-' ) ) {
+					/* translators: 1: SVG or MATH HTML tag, 2: Namespace of the interactive block. */
+					$message = sprintf( __( 'Interactivity directives were detected on an incompatible %1$s tag when processing "%2$s". These directives will be ignored in the server side render.' ), $tag_name, end( $namespace_stack ) );
+					_doing_it_wrong( __METHOD__, $message, '6.6.0' );
+				}
 				$p->skip_to_tag_closer();
 				continue;
 			}
diff --git a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI.php b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI.php
index 81825396194e8..5b50978980b8d 100644
--- a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI.php
+++ b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI.php
@@ -719,6 +719,7 @@ public function test_process_directives_changes_html_if_contains_svgs() {
 	 * @ticket 60517
 	 *
 	 * @covers ::process_directives
+	 * @expectedIncorrectUsage WP_Interactivity_API_Directives_Processor::skip_to_tag_closer
 	 */
 	public function test_process_directives_does_not_change_inner_html_in_svgs() {
 		$this->interactivity->state(
@@ -748,6 +749,7 @@ public function test_process_directives_does_not_change_inner_html_in_svgs() {
 	 * @ticket 60517
 	 *
 	 * @covers ::process_directives
+	 * @expectedIncorrectUsage WP_Interactivity_API::process_directives_args
 	 */
 	public function test_process_directives_change_html_if_contains_math() {
 		$this->interactivity->state(
@@ -782,6 +784,8 @@ public function test_process_directives_change_html_if_contains_math() {
 	 * @ticket 60517
 	 *
 	 * @covers ::process_directives
+	 * @expectedIncorrectUsage WP_Interactivity_API::process_directives_args
+	 * @expectedIncorrectUsage WP_Interactivity_API_Directives_Processor::skip_to_tag_closer
 	 */
 	public function test_process_directives_does_not_change_inner_html_in_math() {
 		$this->interactivity->state(

From 01c69e0e045765b44f8fd11a528292eac3afcf8d Mon Sep 17 00:00:00 2001
From: Carlos Bravo <carlos.bravo@automattic.com>
Date: Mon, 3 Jun 2024 17:07:30 +0200
Subject: [PATCH 23/24] Address translate suggestions

---
 ...class-wp-interactivity-api-directives-processor.php | 10 +++-------
 .../interactivity-api/class-wp-interactivity-api.php   |  4 ++--
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/wp-includes/interactivity-api/class-wp-interactivity-api-directives-processor.php b/src/wp-includes/interactivity-api/class-wp-interactivity-api-directives-processor.php
index 59d8db48fcc69..cfcba51a64042 100644
--- a/src/wp-includes/interactivity-api/class-wp-interactivity-api-directives-processor.php
+++ b/src/wp-includes/interactivity-api/class-wp-interactivity-api-directives-processor.php
@@ -199,19 +199,15 @@ public function skip_to_tag_closer(): bool {
 		$depth    = 1;
 		$tag_name = $this->get_tag();
 
-		while ( $depth > 0 && $this->next_tag(
-			array(
-				'tag_closers' => 'visit',
-			)
-		) ) {
+		while ( $depth > 0 && $this->next_tag( array( 'tag_closers' => 'visit' ) ) ) {
 			if ( ! $this->is_tag_closer() && $this->get_attribute_names_with_prefix( 'data-wp-' ) ) {
-				/* translators: 1: SVG or MATH HTML tag, 2: Namespace of the interactive block. */
+				/* translators: 1: SVG or MATH HTML tag. */
 				$message = sprintf( __( 'Interactivity directives were detected inside an incompatible %1$s tag. These directives will be ignored in the server side render.' ), $tag_name );
 				_doing_it_wrong( __METHOD__, $message, '6.6.0' );
 			}
 			if ( $this->get_tag() === $tag_name ) {
 				if ( $this->has_self_closing_flag() ) {
-						continue;
+					continue;
 				}
 				$depth += $this->is_tag_closer() ? -1 : 1;
 			}
diff --git a/src/wp-includes/interactivity-api/class-wp-interactivity-api.php b/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
index ac0ecaf851deb..f96fc0ca6de0a 100644
--- a/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
+++ b/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
@@ -396,7 +396,7 @@ private function process_directives_args( string $html, array &$context_stack, a
 		 */
 		if ( $unbalanced || 0 < count( $tag_stack ) ) {
 			$tag_errored = 0 < count( $tag_stack ) ? end( $tag_stack )[0] : $tag_name;
-			/* translators: %s: The tag that caused the error; could be any HTML tag. */
+			/* translators: %1s: Namespace processed , %2s: The tag that caused the error; could be any HTML tag.  */
 			$message = sprintf( __( 'Interactivity directives failed to process in "%1$s" due to a missing "%2$s" end tag.' ), end( $namespace_stack ), $tag_errored );
 			_doing_it_wrong( __METHOD__, $message, '6.6.0' );
 			return null;
@@ -423,7 +423,7 @@ private function evaluate( $directive_value, string $default_namespace, $context
 		list( $ns, $path ) = $this->extract_directive_value( $directive_value, $default_namespace );
 		if ( ! $ns || ! $path ) {
 			/* translators: %s: The directive value referenced. */
-			$message = sprintf( 'Namespace or reference path cannot be empty. Directive value referenced: %s ', $directive_value );
+			$message = sprintf( __( 'Namespace or reference path cannot be empty. Directive value referenced: %s ' ), $directive_value );
 			_doing_it_wrong( __METHOD__, $message, '6.6.0' );
 			return null;
 		}

From 3e64ebb6a8e94a13f937d221e110633167d61af0 Mon Sep 17 00:00:00 2001
From: Carlos Bravo <carlos.bravo@automattic.com>
Date: Mon, 3 Jun 2024 18:40:21 +0200
Subject: [PATCH 24/24] Address suggestions

---
 .../interactivity-api/class-wp-interactivity-api.php        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/wp-includes/interactivity-api/class-wp-interactivity-api.php b/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
index f96fc0ca6de0a..c15bb7ef76b54 100644
--- a/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
+++ b/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
@@ -272,7 +272,7 @@ public function process_directives( string $html ): string {
 	 * it returns null if the HTML contains unbalanced tags.
 	 *
 	 * @since 6.5.0
-	 * @since 6.6.0 The function displays a warning message when the HTML contains unbalanced tags.
+	 * @since 6.6.0 The function displays a warning message when the HTML contains unbalanced tags or a directive appears in a MATH or SVG tag.
 	 *
 	 * @param string $html            The HTML content to process.
 	 * @param array  $context_stack   The reference to the array used to keep track of contexts during processing.
@@ -396,7 +396,7 @@ private function process_directives_args( string $html, array &$context_stack, a
 		 */
 		if ( $unbalanced || 0 < count( $tag_stack ) ) {
 			$tag_errored = 0 < count( $tag_stack ) ? end( $tag_stack )[0] : $tag_name;
-			/* translators: %1s: Namespace processed , %2s: The tag that caused the error; could be any HTML tag.  */
+			/* translators: %1s: Namespace processed, %2s: The tag that caused the error; could be any HTML tag.  */
 			$message = sprintf( __( 'Interactivity directives failed to process in "%1$s" due to a missing "%2$s" end tag.' ), end( $namespace_stack ), $tag_errored );
 			_doing_it_wrong( __METHOD__, $message, '6.6.0' );
 			return null;
@@ -423,7 +423,7 @@ private function evaluate( $directive_value, string $default_namespace, $context
 		list( $ns, $path ) = $this->extract_directive_value( $directive_value, $default_namespace );
 		if ( ! $ns || ! $path ) {
 			/* translators: %s: The directive value referenced. */
-			$message = sprintf( __( 'Namespace or reference path cannot be empty. Directive value referenced: %s ' ), $directive_value );
+			$message = sprintf( __( 'Namespace or reference path cannot be empty. Directive value referenced: %s' ), $directive_value );
 			_doing_it_wrong( __METHOD__, $message, '6.6.0' );
 			return null;
 		}