From bb547e4bbc281165e67219cfbcd8691b645b4b13 Mon Sep 17 00:00:00 2001
From: Luis Herranz <luisherranz@gmail.com>
Date: Wed, 31 Jan 2024 17:30:26 +0100
Subject: [PATCH 01/56] Code from GB

---
 ...interactivity-api-directives-processor.php | 141 ++++
 .../class-wp-interactivity-api.php            | 672 ++++++++++++++++++
 .../interactivity-api/interactivity-api.php   | 134 ++++
 src/wp-settings.php                           |   3 +
 .../interactivity-api/interactivity-api.php   | 217 ++++++
 .../wpInteractivityAPI-wp-bind.php            | 338 +++++++++
 .../wpInteractivityAPI-wp-class.php           | 291 ++++++++
 .../wpInteractivityAPI-wp-context.php         | 476 +++++++++++++
 .../wpInteractivityAPI-wp-interactive.php     | 206 ++++++
 .../wpInteractivityAPI-wp-style.php           | 403 +++++++++++
 .../wpInteractivityAPI-wp-text.php            | 123 ++++
 .../interactivity-api/wpInteractivityAPI.php  | 570 +++++++++++++++
 .../wpInteractivityAPIDirectivesProcessor.php | 369 ++++++++++
 13 files changed, 3943 insertions(+)
 create mode 100644 src/wp-includes/interactivity-api/class-wp-interactivity-api-directives-processor.php
 create mode 100644 src/wp-includes/interactivity-api/class-wp-interactivity-api.php
 create mode 100644 src/wp-includes/interactivity-api/interactivity-api.php
 create mode 100644 tests/phpunit/tests/interactivity-api/interactivity-api.php
 create mode 100644 tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-bind.php
 create mode 100644 tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-class.php
 create mode 100644 tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-context.php
 create mode 100644 tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-interactive.php
 create mode 100644 tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-style.php
 create mode 100644 tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-text.php
 create mode 100644 tests/phpunit/tests/interactivity-api/wpInteractivityAPI.php
 create mode 100644 tests/phpunit/tests/interactivity-api/wpInteractivityAPIDirectivesProcessor.php

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
new file mode 100644
index 0000000000000..a045e714711eb
--- /dev/null
+++ b/src/wp-includes/interactivity-api/class-wp-interactivity-api-directives-processor.php
@@ -0,0 +1,141 @@
+<?php
+/**
+ * Interactivity API: WP_Interactivity_API_Directives_Processor class.
+ *
+ * @package WordPress
+ * @subpackage Interactivity API
+ */
+
+/**
+ * Class used to iterate over the tags of an HTML string and help process the
+ * directive attributes.
+ *
+ * @access private
+ */
+class WP_Interactivity_API_Directives_Processor extends WP_HTML_Tag_Processor {
+	/**
+	 * Returns the content between two balanced tags.
+	 *
+	 * @access private
+	 *
+	 * @return string|null The content between the current opening and its matching closing tag or null if it doesn't
+	 *                     find the matching closing tag.
+	 */
+	public function get_content_between_balanced_tags() {
+		$bookmarks = $this->get_balanced_tag_bookmarks();
+		if ( ! $bookmarks ) {
+			return null;
+		}
+		list( $start_name, $end_name ) = $bookmarks;
+
+		$start = $this->bookmarks[ $start_name ]->start + $this->bookmarks[ $start_name ]->length + 1;
+		$end   = $this->bookmarks[ $end_name ]->start;
+
+		$this->seek( $start_name );
+		$this->release_bookmark( $start_name );
+		$this->release_bookmark( $end_name );
+
+		return substr( $this->html, $start, $end - $start );
+	}
+
+	/**
+	 * Sets the content between two balanced tags.
+	 *
+	 * @access private
+	 *
+	 * @param string $new_content The string to replace the content between the matching tags.
+	 * @return bool Whether the content was successfully replaced.
+	 */
+	public function set_content_between_balanced_tags( string $new_content ): bool {
+		$this->get_updated_html();
+
+		$bookmarks = $this->get_balanced_tag_bookmarks();
+		if ( ! $bookmarks ) {
+			return false;
+		}
+		list( $start_name, $end_name ) = $bookmarks;
+
+		$start = $this->bookmarks[ $start_name ]->start + $this->bookmarks[ $start_name ]->length + 1;
+		$end   = $this->bookmarks[ $end_name ]->start;
+
+		$this->seek( $start_name );
+		$this->release_bookmark( $start_name );
+		$this->release_bookmark( $end_name );
+
+		$this->lexical_updates[] = new WP_HTML_Text_Replacement( $start, $end - $start, esc_html( $new_content ) );
+		return true;
+	}
+
+	/**
+	 * Returns a pair of bookmarks for the current opening tag and the matching
+	 * closing tag.
+	 *
+	 * @return array|null A pair of bookmarks, or null if there's no matching closing tag.
+	 */
+	private function get_balanced_tag_bookmarks() {
+		static $i   = 0;
+		$start_name = 'start_of_balanced_tag_' . ++$i;
+
+		$this->set_bookmark( $start_name );
+		if ( ! $this->next_balanced_closer() ) {
+			$this->release_bookmark( $start_name );
+			return null;
+		}
+
+		$end_name = 'end_of_balanced_tag_' . ++$i;
+		$this->set_bookmark( $end_name );
+
+		return array( $start_name, $end_name );
+	}
+
+	/**
+	 * Finds the matching closing tag for an opening tag.
+	 *
+	 * When called while the processor is on an open tag, it traverses the HTML
+	 * until it finds the matching closing tag, respecting any in-between content,
+	 * including nested tags of the same name. Returns false when called on a
+	 * closing or void tag, or if no matching closing tag was found.
+	 *
+	 * @return bool Whether a matching closing tag was found.
+	 */
+	private function next_balanced_closer(): bool {
+		$depth    = 0;
+		$tag_name = $this->get_tag();
+
+		if ( $this->is_void() ) {
+			return false;
+		}
+
+		while ( $this->next_tag(
+			array(
+				'tag_name'    => $tag_name,
+				'tag_closers' => 'visit',
+			)
+		) ) {
+			if ( ! $this->is_tag_closer() ) {
+				++$depth;
+				continue;
+			}
+
+			if ( 0 === $depth ) {
+				return true;
+			}
+
+			--$depth;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Checks whether the current tag is void.
+	 *
+	 * @access private
+	 *
+	 * @return bool Whether the current tag is void or not.
+	 */
+	public function is_void(): bool {
+		$tag_name = $this->get_tag();
+		return WP_HTML_Processor::is_void( null !== $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
new file mode 100644
index 0000000000000..cb481b0c65e40
--- /dev/null
+++ b/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
@@ -0,0 +1,672 @@
+<?php
+/**
+ * Interactivity API: WP_Interactivity_API class.
+ *
+ * @package WordPress
+ * @subpackage Interactivity API
+ */
+
+/**
+ * Class used to process the Interactivity API in the server.
+ */
+class WP_Interactivity_API {
+	/**
+	 * Holds the mapping of directive attribute names to their processor methods.
+	 *
+	 * @since 6.5.0
+	 * @var array
+	 */
+	private static $directive_processors = array(
+		'data-wp-interactive' => 'data_wp_interactive_processor',
+		'data-wp-context'     => 'data_wp_context_processor',
+		'data-wp-bind'        => 'data_wp_bind_processor',
+		'data-wp-class'       => 'data_wp_class_processor',
+		'data-wp-style'       => 'data_wp_style_processor',
+		'data-wp-text'        => 'data_wp_text_processor',
+	);
+
+	/**
+	 * Holds the initial state of the different Interactivity API stores.
+	 *
+	 * This state is used during the server directive processing. Then, it is
+	 * serialized and sent to the client as part of the interactivity data to be
+	 * recovered during the hydration of the client interactivity stores.
+	 *
+	 * @since 6.5.0
+	 * @var array
+	 */
+	private $state_data = array();
+
+	/**
+	 * Holds the configuration required by the different Interactivity API stores.
+	 *
+	 * This configuration is serialized and sent to the client as part of the
+	 * interactivity data and can be accessed by the client interactivity stores.
+	 *
+	 * @since 6.5.0
+	 * @var array
+	 */
+	private $config_data = array();
+
+	/**
+	 * Gets and/or sets the initial state of an Interactivity API store for a
+	 * given namespace.
+	 *
+	 * If state for that store namespace already exists, it merges the new
+	 * provided state with the existing one.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @param string $store_namespace The unique store namespace identifier.
+	 * @param array  $state           Optional. The array that will be merged with the existing state for the specified
+	 *                                store namespace.
+	 * @return array The current state for the specified store namespace.
+	 */
+	public function state( string $store_namespace, array $state = null ): array {
+		if ( ! isset( $this->state_data[ $store_namespace ] ) ) {
+			$this->state_data[ $store_namespace ] = array();
+		}
+		if ( is_array( $state ) ) {
+			$this->state_data[ $store_namespace ] = array_replace_recursive(
+				$this->state_data[ $store_namespace ],
+				$state
+			);
+		}
+		return $this->state_data[ $store_namespace ];
+	}
+
+	/**
+	 * Gets and/or sets the configuration of the Interactivity API for a given
+	 * store namespace.
+	 *
+	 * If configuration for that store namespace exists, it merges the new
+	 * provided configuration with the existing one.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @param string $store_namespace The unique store namespace identifier.
+	 * @param array  $config          Optional. The array that will be merged with the existing configuration for the
+	 *                                specified store namespace.
+	 * @return array The current configuration for the specified store namespace.
+	 */
+	public function config( string $store_namespace, array $config = null ): array {
+		if ( ! isset( $this->config_data[ $store_namespace ] ) ) {
+			$this->config_data[ $store_namespace ] = array();
+		}
+		if ( is_array( $config ) ) {
+			$this->config_data[ $store_namespace ] = array_replace_recursive(
+				$this->config_data[ $store_namespace ],
+				$config
+			);
+		}
+		return $this->config_data[ $store_namespace ];
+	}
+
+	/**
+	 * Prints the serialized client-side interactivity data.
+	 *
+	 * Encodes the config and initial state into JSON and prints them inside a
+	 * script tag of type "application/json". Once in the browser, the state will
+	 * be parsed and used to hydrate the client-side interactivity stores and the
+	 * configuration will be available using a `getConfig` utility.
+	 *
+	 * @since 6.5.0
+	 */
+	public function print_client_interactivity_data() {
+		$store      = array();
+		$has_state  = ! empty( $this->state_data );
+		$has_config = ! empty( $this->config_data );
+
+		if ( $has_state || $has_config ) {
+			if ( $has_config ) {
+				$store['config'] = $this->config_data;
+			}
+			if ( $has_state ) {
+				$store['state'] = $this->state_data;
+			}
+			wp_print_inline_script_tag(
+				wp_json_encode(
+					$store,
+					JSON_HEX_TAG | JSON_HEX_AMP
+				),
+				array(
+					'type' => 'application/json',
+					'id'   => 'wp-interactivity-data',
+				)
+			);
+		}
+	}
+
+	/**
+	 * Registers the `@wordpress/interactivity` script modules.
+	 *
+	 * @since 6.5.0
+	 */
+	public function register_script_modules() {
+		wp_register_script_module(
+			'@wordpress/interactivity',
+			includes_url( 'js/dist/interactivity.min.js' )
+		);
+
+		wp_register_script_module(
+			'@wordpress/interactivity-router',
+			includes_url( 'js/dist/interactivity-router.min.js' ),
+			array( '@wordpress/interactivity' )
+		);
+	}
+
+	/**
+	 * Adds the necessary hooks for the Interactivity API.
+	 *
+	 * @since 6.5.0
+	 */
+	public function add_hooks() {
+		add_action( 'wp_footer', array( $this, 'print_client_interactivity_data' ) );
+	}
+
+	/**
+	 * Processes the interactivity directives contained within the HTML content
+	 * and updates the markup accordingly.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @param string $html The HTML content to process.
+	 * @return string The processed HTML content. It returns the original content when the HTML contains unbalanced tags.
+	 */
+	public function process_directives( string $html ): string {
+		$p               = new WP_Interactivity_API_Directives_Processor( $html );
+		$tag_stack       = array();
+		$namespace_stack = array();
+		$context_stack   = array();
+		$unbalanced      = false;
+
+		$directive_processor_prefixes          = array_keys( self::$directive_processors );
+		$directive_processor_prefixes_reversed = array_reverse( $directive_processor_prefixes );
+
+		while ( $p->next_tag( array( 'tag_closers' => 'visit' ) ) && false === $unbalanced ) {
+			$tag_name = $p->get_tag();
+
+			if ( $p->is_tag_closer() ) {
+				list( $opening_tag_name, $directives_prefixes ) = end( $tag_stack );
+
+				if ( 0 === count( $tag_stack ) || $opening_tag_name !== $tag_name ) {
+
+					/*
+						* If the tag stack is empty or the matching opening tag is not the
+						* same than the closing tag, it means the HTML is unbalanced and it
+						* stops processing it.
+						*/
+					$unbalanced = true;
+					continue;
+				} else {
+
+					/*
+						* It removes the last tag from the stack.
+						*/
+					array_pop( $tag_stack );
+
+					/*
+						* If the matching opening tag didn't have any directives, it can skip
+						* the processing.
+						*/
+					if ( 0 === count( $directives_prefixes ) ) {
+						continue;
+					}
+				}
+			} else {
+				$directives_prefixes = array();
+
+				foreach ( $p->get_attribute_names_with_prefix( 'data-wp-' ) as $attribute_name ) {
+
+					/*
+						* Extracts the directive prefix to see if there is a server directive
+						* processor registered for that directive.
+						*/
+					list( $directive_prefix ) = $this->extract_prefix_and_suffix( $attribute_name );
+					if ( array_key_exists( $directive_prefix, self::$directive_processors ) ) {
+						$directives_prefixes[] = $directive_prefix;
+					}
+				}
+
+				/*
+					* If this is not a void element, it adds it to the tag stack so it can
+					* process its closing tag and check for unbalanced tags.
+					*/
+				if ( ! $p->is_void() ) {
+					$tag_stack[] = array( $tag_name, $directives_prefixes );
+				}
+			}
+
+			/*
+				* Sorts the attributes by the order of the `directives_processor` array
+				* and checks what directives are present in this element. The processing
+				* order is reversed for tag closers.
+				*/
+			$directives_prefixes = array_intersect(
+				$p->is_tag_closer()
+					? $directive_processor_prefixes_reversed
+					: $directive_processor_prefixes,
+				$directives_prefixes
+			);
+
+			// Executes the directive processors present in this element.
+			foreach ( $directives_prefixes as $directive_prefix ) {
+				$func = is_array( self::$directive_processors[ $directive_prefix ] )
+					? self::$directive_processors[ $directive_prefix ]
+					: array( $this, self::$directive_processors[ $directive_prefix ] );
+				call_user_func_array(
+					$func,
+					array( $p, &$context_stack, &$namespace_stack )
+				);
+			}
+		}
+
+		/*
+			* It returns the original content 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.
+			*/
+		return $unbalanced || 0 < count( $tag_stack ) ? $html : $p->get_updated_html();
+	}
+
+	/**
+	 * Evaluates the reference path passed to a directive based on the current
+	 * store namespace, state and context.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @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.
+	 */
+	private function evaluate( $directive_value, string $default_namespace, $context = false ) {
+		list( $ns, $path ) = $this->extract_directive_value( $directive_value, $default_namespace );
+		if ( empty( $path ) ) {
+			return null;
+		}
+
+		$store = array(
+			'state'   => isset( $this->state_data[ $ns ] ) ? $this->state_data[ $ns ] : array(),
+			'context' => isset( $context[ $ns ] ) ? $context[ $ns ] : array(),
+		);
+
+		// Checks if the reference path is preceded by a negator operator (!).
+		$should_negate_value = '!' === $path[0];
+		$path                = $should_negate_value ? substr( $path, 1 ) : $path;
+
+		// Extracts the value from the store using the reference path.
+		$path_segments = explode( '.', $path );
+		$current       = $store;
+		foreach ( $path_segments as $path_segment ) {
+			if ( isset( $current[ $path_segment ] ) ) {
+				$current = $current[ $path_segment ];
+			} else {
+				return null;
+			}
+		}
+
+		// Returns the opposite if it contains a negator operator (!).
+		return $should_negate_value ? ! $current : $current;
+	}
+
+	/**
+	 * Extracts the directive attribute name to separate and return the directive
+	 * prefix and an optional suffix.
+	 *
+	 * The suffix is the string after the first double hyphen and the prefix is
+	 * everything that comes before the suffix.
+	 *
+	 * Example:
+	 *
+	 *     extract_prefix_and_suffix( 'data-wp-interactive' )   => array( 'data-wp-interactive', null )
+	 *     extract_prefix_and_suffix( 'data-wp-bind--src' )     => array( 'data-wp-bind', 'src' )
+	 *     extract_prefix_and_suffix( 'data-wp-foo--and--bar' ) => array( 'data-wp-foo', 'and--bar' )
+	 *
+	 * @since 6.5.0
+	 *
+	 * @param string $directive_name The directive attribute name.
+	 * @return array An array containing the directive prefix and optional suffix.
+	 */
+	private function extract_prefix_and_suffix( string $directive_name ): array {
+		return explode( '--', $directive_name, 2 );
+	}
+
+	/**
+	 * Parses and extracts the namespace and reference path from the given
+	 * directive attribute value.
+	 *
+	 * If the value doesn't contain an explicit namespace, it returns the
+	 * default one. If the value contains a JSON object instead of a reference
+	 * path, the function tries to parse it and return the resulting array. If
+	 * the value contains strings that reprenset booleans ("true" and "false"),
+	 * numbers ("1" and "1.2") or "null", the function also transform them to
+	 * regular booleans, numbers and `null`.
+	 *
+	 * Example:
+	 *
+	 *     extract_directive_value( 'actions.foo', 'myPlugin' )                      => array( 'myPlugin', 'actions.foo' )
+	 *     extract_directive_value( 'otherPlugin::actions.foo', 'myPlugin' )         => array( 'otherPlugin', 'actions.foo' )
+	 *     extract_directive_value( '{ "isOpen": false }', 'myPlugin' )              => array( 'myPlugin', array( 'isOpen' => false ) )
+	 *     extract_directive_value( 'otherPlugin::{ "isOpen": false }', 'myPlugin' ) => array( 'otherPlugin', array( 'isOpen' => false ) )
+	 *
+	 * @since 6.5.0
+	 *
+	 * @param string|true $directive_value   The directive attribute value. It can be `true` when it's a boolean
+	 *                                       attribute.
+	 * @param string|null $default_namespace Optional. The default namespace if none is explicitly defined.
+	 * @return array An array containing the namespace in the first item and the JSON, the reference path, or null on the
+	 *               second item.
+	 */
+	private function extract_directive_value( $directive_value, $default_namespace = null ): array {
+		if ( empty( $directive_value ) || is_bool( $directive_value ) ) {
+			return array( $default_namespace, null );
+		}
+
+		// Replaces the value and namespace if there is a namespace in the value.
+		if ( 1 === preg_match( '/^([\w\-_\/]+)::./', $directive_value ) ) {
+			list($default_namespace, $directive_value) = explode( '::', $directive_value, 2 );
+		}
+
+		/*
+			* Tries to decode the value as a JSON object. If it fails and the value
+			* isn't `null`, it returns the value as it is. Otherwise, it returns the
+			* decoded JSON or null for the string `null`.
+			*/
+		$decoded_json = json_decode( $directive_value, true );
+		if ( null !== $decoded_json || 'null' === $directive_value ) {
+			$directive_value = $decoded_json;
+		}
+
+		return array( $default_namespace, $directive_value );
+	}
+
+
+	/**
+	 * Processes the `data-wp-interactive` directive.
+	 *
+	 * It adds the default store namespace defined in the directive value to the
+	 * stack so it's available for the nested interactivity elements.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @param WP_Interactivity_API_Directives_Processor $p               The directives processor instance.
+	 * @param array                                     $context_stack   The reference to the context stack.
+	 * @param array                                     $namespace_stack The reference to the store namespace stack.
+	 */
+	private function data_wp_interactive_processor( WP_Interactivity_API_Directives_Processor $p, array &$context_stack, array &$namespace_stack ) {
+		// In closing tags, it removes the last namespace from the stack.
+		if ( $p->is_tag_closer() ) {
+			return array_pop( $namespace_stack );
+		}
+
+		// Tries to decode the `data-wp-interactive` attribute value.
+		$attribute_value = $p->get_attribute( 'data-wp-interactive' );
+		$decoded_json    = is_string( $attribute_value ) && ! empty( $attribute_value )
+			? json_decode( $attribute_value, true )
+			: null;
+
+		/*
+			* Pushes the newly defined namespace or the current one if the
+			* `data-wp-interactive` definition was invalid or does not contain a
+			* namespace. It does so because the function pops out the current namespace
+			* from the stack whenever it finds a `data-wp-interactive`'s closing tag,
+			* independently of whether the previous `data-wp-interactive` definition
+			* contained a valid namespace.
+			*/
+		$namespace_stack[] = isset( $decoded_json['namespace'] )
+			? $decoded_json['namespace']
+			: end( $namespace_stack );
+	}
+
+	/**
+	 * Processes the `data-wp-context` directive.
+	 *
+	 * It adds the context defined in the directive value to the stack so it's
+	 * available for the nested interactivity elements.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @param WP_Interactivity_API_Directives_Processor $p               The directives processor instance.
+	 * @param array                                     $context_stack   The reference to the context stack.
+	 * @param array                                     $namespace_stack The reference to the store namespace stack.
+	 */
+	private function data_wp_context_processor( WP_Interactivity_API_Directives_Processor $p, array &$context_stack, array &$namespace_stack ) {
+		// In closing tags, it removes the last context from the stack.
+		if ( $p->is_tag_closer() ) {
+			return array_pop( $context_stack );
+		}
+
+		$attribute_value = $p->get_attribute( 'data-wp-context' );
+		$namespace_value = end( $namespace_stack );
+
+		// Separates the namespace from the context JSON object.
+		list( $namespace_value, $decoded_json ) = is_string( $attribute_value ) && ! empty( $attribute_value )
+			? $this->extract_directive_value( $attribute_value, $namespace_value )
+			: array( $namespace_value, null );
+
+		/*
+			* If there is a namespace, it adds a new context to the stack merging the
+			* previous context with the new one.
+			*/
+		if ( is_string( $namespace_value ) ) {
+			array_push(
+				$context_stack,
+				array_replace_recursive(
+					end( $context_stack ) !== false ? end( $context_stack ) : array(),
+					array( $namespace_value => is_array( $decoded_json ) ? $decoded_json : array() )
+				)
+			);
+		} else {
+			/*
+				* If there is no namespace, it pushes the current context to the stack.
+				* It needs to do so because the function pops out the current context
+				* from the stack whenever it finds a `data-wp-context`'s closing tag.
+				*/
+			array_push( $context_stack, end( $context_stack ) );
+		}
+	}
+
+	/**
+	 * Processes the `data-wp-bind` directive.
+	 *
+	 * It updates or removes the bound attributes based on the evaluation of its
+	 * associated reference.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @param WP_Interactivity_API_Directives_Processor $p               The directives processor instance.
+	 * @param array                                     $context_stack   The reference to the context stack.
+	 * @param array                                     $namespace_stack The reference to the store namespace stack.
+	 */
+	private function data_wp_bind_processor( WP_Interactivity_API_Directives_Processor $p, array &$context_stack, array &$namespace_stack ) {
+		if ( ! $p->is_tag_closer() ) {
+			$all_bind_directives = $p->get_attribute_names_with_prefix( 'data-wp-bind--' );
+
+			foreach ( $all_bind_directives as $attribute_name ) {
+				list( , $bound_attribute ) = $this->extract_prefix_and_suffix( $attribute_name );
+				if ( empty( $bound_attribute ) ) {
+					return;
+				}
+
+				$attribute_value = $p->get_attribute( $attribute_name );
+				$result          = $this->evaluate( $attribute_value, end( $namespace_stack ), end( $context_stack ) );
+
+				if ( null !== $result && ( false !== $result || '-' === $bound_attribute[4] ) ) {
+					/*
+						* If the result of the evaluation is a boolean and the attribute is
+						* `aria-` or `data-, convert it to a string "true" or "false". It
+						* follows the exact same logic as Preact because it needs to
+						* replicate what Preact will later do in the client:
+						* https://github.com/preactjs/preact/blob/ea49f7a0f9d1ff2c98c0bdd66aa0cbc583055246/src/diff/props.js#L131C24-L136
+						*/
+					if ( is_bool( $result ) && '-' === $bound_attribute[4] ) {
+						$result = $result ? 'true' : 'false';
+					}
+					$p->set_attribute( $bound_attribute, $result );
+				} else {
+					$p->remove_attribute( $bound_attribute );
+				}
+			}
+		}
+	}
+
+
+	/**
+	 * Processes the `data-wp-class` directive.
+	 *
+	 * It adds or removes CSS classes in the current HTML element based on the
+	 * evaluation of its associated references.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @param WP_Interactivity_API_Directives_Processor $p               The directives processor instance.
+	 * @param array                                     $context_stack   The reference to the context stack.
+	 * @param array                                     $namespace_stack The reference to the store namespace stack.
+	 */
+	private function data_wp_class_processor( WP_Interactivity_API_Directives_Processor $p, array &$context_stack, array &$namespace_stack ) {
+		if ( ! $p->is_tag_closer() ) {
+			$all_class_directives = $p->get_attribute_names_with_prefix( 'data-wp-class--' );
+
+			foreach ( $all_class_directives as $attribute_name ) {
+				list( , $class_name ) = $this->extract_prefix_and_suffix( $attribute_name );
+				if ( empty( $class_name ) ) {
+					return;
+				}
+
+				$attribute_value = $p->get_attribute( $attribute_name );
+				$result          = $this->evaluate( $attribute_value, end( $namespace_stack ), end( $context_stack ) );
+
+				if ( $result ) {
+					$p->add_class( $class_name );
+				} else {
+					$p->remove_class( $class_name );
+				}
+			}
+		}
+	}
+
+	/**
+	 * Processes the `data-wp-style` directive.
+	 *
+	 * It updates the style attribute value of the current HTML element based on
+	 * the evaluation of its associated references.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @param WP_Interactivity_API_Directives_Processor $p               The directives processor instance.
+	 * @param array                                     $context_stack   The reference to the context stack.
+	 * @param array                                     $namespace_stack The reference to the store namespace stack.
+	 */
+	private function data_wp_style_processor( WP_Interactivity_API_Directives_Processor $p, array &$context_stack, array &$namespace_stack ) {
+		if ( ! $p->is_tag_closer() ) {
+			$all_style_attributes = $p->get_attribute_names_with_prefix( 'data-wp-style--' );
+
+			foreach ( $all_style_attributes as $attribute_name ) {
+				list( , $style_property ) = $this->extract_prefix_and_suffix( $attribute_name );
+				if ( empty( $style_property ) ) {
+					continue;
+				}
+
+				$directive_attribute_value = $p->get_attribute( $attribute_name );
+				$style_property_value      = $this->evaluate( $directive_attribute_value, end( $namespace_stack ), end( $context_stack ) );
+				$style_attribute_value     = $p->get_attribute( 'style' );
+				$style_attribute_value     = ( $style_attribute_value && ! is_bool( $style_attribute_value ) ) ? $style_attribute_value : '';
+
+				/*
+					* Checks first if the style property is not falsy and the style
+					* attribute value is not empty because if it is, it doesn't need to
+					* update the attribute value.
+					*/
+				if ( $style_property_value || ( ! $style_property_value && $style_attribute_value ) ) {
+					$style_attribute_value = $this->set_style_property( $style_attribute_value, $style_property, $style_property_value );
+					/*
+						* If the style attribute value is not empty, it sets it. Otherwise,
+						* it removes it.
+						*/
+					if ( ! empty( $style_attribute_value ) ) {
+						$p->set_attribute( 'style', $style_attribute_value );
+					} else {
+						$p->remove_attribute( 'style' );
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * Sets an individual style property in the `style` attribute of an HTML
+	 * element, updating or removing the property when necessary.
+	 *
+	 * If a property is modified, it is added at the end of the list to make sure
+	 * that it overrides the previous ones.
+	 *
+	 * @since 6.5.0
+	 *
+	 * Example:
+	 *
+	 *     set_style_property( 'color:green;', 'color', 'red' )      => 'color:red;'
+	 *     set_style_property( 'background:green;', 'color', 'red' ) => 'background:green;color:red;'
+	 *     set_style_property( 'color:green;', 'color', null )       => ''
+	 *
+	 * @param string            $style_attribute_value The current style attribute value.
+	 * @param string            $style_property_name   The style property name to set.
+	 * @param string|false|null $style_property_value  The value to set for the style property. With false, null or an
+	 *                                                 empty string, it removes the style property.
+	 * @return string The new style attribute value after the specified property has been added, updated or removed.
+	 */
+	private function set_style_property( string $style_attribute_value, string $style_property_name, $style_property_value ): string {
+		$style_assignments    = explode( ';', $style_attribute_value );
+		$result               = array();
+		$style_property_value = ! empty( $style_property_value ) ? rtrim( trim( $style_property_value ), ';' ) : null;
+		$new_style_property   = $style_property_value ? $style_property_name . ':' . $style_property_value . ';' : '';
+
+		// Generate an array with all the properties but the modified one.
+		foreach ( $style_assignments as $style_assignment ) {
+			if ( empty( trim( $style_assignment ) ) ) {
+				continue;
+			}
+			list( $name, $value ) = explode( ':', $style_assignment );
+			if ( trim( $name ) !== $style_property_name ) {
+				$result[] = trim( $name ) . ':' . trim( $value ) . ';';
+			}
+		}
+
+		// Add the new/modified property at the end of the list.
+		array_push( $result, $new_style_property );
+
+		return implode( '', $result );
+	}
+
+	/**
+	 * Processes the `data-wp-text` directive.
+	 *
+	 * It updates the inner content of the current HTML element based on the
+	 * evaluation of its associated reference.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @param WP_Interactivity_API_Directives_Processor $p               The directives processor instance.
+	 * @param array                                     $context_stack   The reference to the context stack.
+	 * @param array                                     $namespace_stack The reference to the store namespace stack.
+	 */
+	private function data_wp_text_processor( WP_Interactivity_API_Directives_Processor $p, array &$context_stack, array &$namespace_stack ) {
+		if ( ! $p->is_tag_closer() ) {
+			$attribute_value = $p->get_attribute( 'data-wp-text' );
+			$result          = $this->evaluate( $attribute_value, end( $namespace_stack ), end( $context_stack ) );
+
+			/*
+				* Follows the same logic as Preact in the client and only changes the
+				* content if the value is a string or a number. Otherwise, it removes the
+				* content.
+				*/
+			if ( is_string( $result ) || is_numeric( $result ) ) {
+				$p->set_content_between_balanced_tags( esc_html( $result ) );
+			} else {
+				$p->set_content_between_balanced_tags( '' );
+			}
+		}
+	}
+}
diff --git a/src/wp-includes/interactivity-api/interactivity-api.php b/src/wp-includes/interactivity-api/interactivity-api.php
new file mode 100644
index 0000000000000..7d9659e14b25d
--- /dev/null
+++ b/src/wp-includes/interactivity-api/interactivity-api.php
@@ -0,0 +1,134 @@
+<?php
+/**
+ * Interactivity API: Functions and hooks
+ *
+ * @package WordPress
+ * @subpackage Interactivity API
+ */
+
+/**
+ * Processes the directives on the rendered HTML of the interactive blocks.
+ *
+ * This processes only one root interactive block at a time because the
+ * rendered HTML of that block contains the rendered HTML of all its inner
+ * blocks, including any interactive block. It does so by ignoring all the
+ * interactive inner blocks until the root interactive block is processed.
+ *
+ * @since 6.5.0
+ *
+ * @param array $parsed_block The parsed block.
+ * @return array The same parsed block.
+ */
+function wp_interactivity_process_directives_of_interactive_blocks( $parsed_block ) {
+	static $root_interactive_block = null;
+
+	/*
+		* Checks whether a root interactive block is already annotated for
+		* processing, and if it is, it ignores the subsequent ones.
+		*/
+	if ( null === $root_interactive_block ) {
+		$block_name = $parsed_block['blockName'];
+		$block_type = WP_Block_Type_Registry::get_instance()->get_registered( $block_name );
+
+		if ( isset( $block_name ) && isset( $block_type->supports['interactivity'] ) && $block_type->supports['interactivity'] ) {
+			// Annotates the root interactive block for processing.
+			$root_interactive_block = array( $block_name, md5( serialize( $parsed_block ) ) );
+
+			/*
+				* Adds a filter to process the root interactive block once it has
+				* finished rendering.
+				*/
+			$process_interactive_blocks = static function ( $content, $parsed_block ) use ( &$root_interactive_block, &$process_interactive_blocks ) {
+				// Checks whether the current block is the root interactive block.
+				list($root_block_name, $root_block_md5) = $root_interactive_block;
+				if ( $root_block_name === $parsed_block['blockName'] && md5( serialize( $parsed_block ) ) === $root_block_md5 ) {
+					// The root interactive blocks has finished rendering, process it.
+					$content = wp_interactivity_process_directives( $content );
+					// Removes the filter and reset the root interactive block.
+					remove_filter( 'render_block', $process_interactive_blocks );
+					$root_interactive_block = null;
+				}
+				return $content;
+			};
+
+			/*
+				* Uses a priority of 20 to ensure that other filters can add additional
+				* directives before the processing starts.
+				*/
+			add_filter( 'render_block', $process_interactive_blocks, 20, 2 );
+		}
+	}
+
+	return $parsed_block;
+}
+add_filter( 'render_block_data', 'wp_interactivity_process_directives_of_interactive_blocks', 10, 1 );
+
+/**
+ * Retrieves the main WP_Interactivity_API instance.
+ *
+ * It provides access to the WP_Interactivity_API instance, creating one if it
+ * doesn't exist yet. It also registers the hooks and necessary script
+ * modules.
+ *
+ * @since 6.5.0
+ *
+ * @return WP_Interactivity_API The main WP_Interactivity_API instance.
+ */
+function wp_interactivity() {
+	static $instance = null;
+	if ( is_null( $instance ) ) {
+		$instance = new WP_Interactivity_API();
+		$instance->add_hooks();
+		$instance->register_script_modules();
+	}
+	return $instance;
+}
+
+/**
+ * Processes the interactivity directives contained within the HTML content
+ * and updates the markup accordingly.
+ *
+ * @since 6.5.0
+ *
+ * @param string $html The HTML content to process.
+ * @return string The processed HTML content. It returns the original content when the HTML contains unbalanced tags.
+ */
+function wp_interactivity_process_directives( $html ) {
+	return wp_interactivity()->process_directives( $html );
+}
+
+/**
+ * Gets and/or sets the initial state of an Interactivity API store for a
+ * given namespace.
+ *
+ * If state for that store namespace already exists, it merges the new
+ * provided state with the existing one.
+ *
+ * @since 6.5.0
+ *
+ * @param string $store_namespace The unique store namespace identifier.
+ * @param array  $state           Optional. The array that will be merged with the existing state for the specified
+ *                                store namespace.
+ * @return array The current state for the specified store namespace.
+ */
+function wp_interactivity_state( $store_namespace, $state = null ) {
+	return wp_interactivity()->state( $store_namespace, $state );
+}
+
+/**
+ * Gets and/or sets the configuration of the Interactivity API for a given
+ * store namespace.
+ *
+ * If configuration for that store namespace exists, it merges the new
+ * provided configuration with the existing one.
+ *
+ * @since 6.5.0
+ *
+ * @param string $store_namespace The unique store namespace identifier.
+ * @param array  $config          Optional. The array that will be merged with the existing configuration for the
+ *                                specified store namespace.
+ * @return array The current configuration for the specified store namespace.
+ */
+function wp_interactivity_config( $store_namespace, $initial_state = null ) {
+	return wp_interactivity()->config( $store_namespace, $initial_state );
+}
diff --git a/src/wp-settings.php b/src/wp-settings.php
index 624b1d804acf0..6cddae7550e16 100644
--- a/src/wp-settings.php
+++ b/src/wp-settings.php
@@ -377,6 +377,9 @@
 require ABSPATH . WPINC . '/class-wp-script-modules.php';
 require ABSPATH . WPINC . '/script-modules.php';
 require ABSPATH . WPINC . '/interactivity-api.php';
+require ABSPATH . WPINC . '/interactivity-api/class-wp-interactivity-api.php';
+require ABSPATH . WPINC . '/interactivity-api/class-wp-interactivity-api-directives-processor.php';
+require ABSPATH . WPINC . '/interactivity-api/interactivity-api.php';
 
 $GLOBALS['wp_embed'] = new WP_Embed();
 
diff --git a/tests/phpunit/tests/interactivity-api/interactivity-api.php b/tests/phpunit/tests/interactivity-api/interactivity-api.php
new file mode 100644
index 0000000000000..ba88737cd65d9
--- /dev/null
+++ b/tests/phpunit/tests/interactivity-api/interactivity-api.php
@@ -0,0 +1,217 @@
+<?php
+/**
+ * Unit tests covering the functionality of the public functions of the
+ * Interactivity API.
+ *
+ * @package WordPress
+ * @subpackage Interactivity API
+ *
+ * @group interactivity-api
+ */
+class Tests_Interactivity_API_Functions extends WP_UnitTestCase {
+	/**
+	 * Set up.
+	 */
+	public function set_up() {
+		parent::set_up();
+
+		register_block_type(
+			'test/interactive-block',
+			array(
+				'render_callback' => function ( $attributes, $content ) {
+					return '
+						<div
+							data-wp-interactive=\'{ "namespace": "myPlugin" }\'
+							data-wp-context=\'{ "block": ' . $attributes['block'] . ' }\'
+						>
+							<input
+								class="interactive/block-' . $attributes['block'] . '"
+								data-wp-bind--value="context.block"
+							>' .
+							$content .
+						'</div>';
+				},
+				'supports'        => array(
+					'interactivity' => true,
+				),
+			)
+		);
+
+		register_block_type(
+			'test/non-interactive-block',
+			array(
+				'render_callback' => function ( $attributes, $content ) {
+					$directive = isset( $attributes['hasDirective'] ) ? ' data-wp-bind--value="context.block"' : '';
+					return '
+						<div>
+							<input class="non-interactive/block-' . $attributes['block'] . '"' . $directive . '>' .
+							$content .
+						'</div>';
+				},
+			)
+		);
+	}
+
+	public function tear_down() {
+		unregister_block_type( 'test/interactive-block' );
+		unregister_block_type( 'test/non-interactive-block' );
+		parent::tear_down();
+	}
+
+	public function test_processs_directives_of_single_interactive_block() {
+		$post_content    = '<!-- wp:test/interactive-block { "block": 1 } /-->';
+		$rendered_blocks = do_blocks( $post_content );
+		$p               = new WP_HTML_Tag_Processor( $rendered_blocks );
+		$p->next_tag( array( 'class_name' => 'interactive/block-1' ) );
+		$this->assertEquals( '1', $p->get_attribute( 'value' ) );
+	}
+
+	public function test_processs_directives_of_multiple_interactive_blocks_in_paralell() {
+		$post_content    = '
+			<!-- wp:test/interactive-block { "block": 1 } /-->
+			<!-- wp:test/interactive-block { "block": 2 } /-->
+			<!-- wp:test/non-interactive-block { "block": 3, "hasDirective": true } /-->
+		';
+		$rendered_blocks = do_blocks( $post_content );
+		$p               = new WP_HTML_Tag_Processor( $rendered_blocks );
+		$p->next_tag( array( 'class_name' => 'interactive/block-1' ) );
+		$this->assertEquals( '1', $p->get_attribute( 'value' ) );
+		$p->next_tag( array( 'class_name' => 'interactive/block-2' ) );
+		$this->assertEquals( '2', $p->get_attribute( 'value' ) );
+		$p->next_tag( array( 'class_name' => 'non-interactive/block-3' ) );
+		$this->assertNull( $p->get_attribute( 'value' ) );
+	}
+
+	public function test_processs_directives_of_interactive_block_inside_non_interactive_block() {
+		$post_content    = '
+			<!-- wp:test/non-interactive-block { "block": 1 } -->
+				<!-- wp:test/interactive-block { "block": 2 } /-->
+			<!-- /wp:test/non-interactive-block -->
+		';
+		$rendered_blocks = do_blocks( $post_content );
+		$p               = new WP_HTML_Tag_Processor( $rendered_blocks );
+		$p->next_tag( array( 'class_name' => 'interactive/block-2' ) );
+		$this->assertEquals( '2', $p->get_attribute( 'value' ) );
+	}
+
+	public function test_processs_directives_of_multple_interactive_blocks_inside_non_interactive_block() {
+		$post_content    = '
+			<!-- wp:test/non-interactive-block { "block": 1 } -->
+				<!-- wp:test/interactive-block { "block": 2 } /-->
+				<!-- wp:test/interactive-block { "block": 3 } /-->
+			<!-- /wp:test/non-interactive-block -->
+		';
+		$rendered_blocks = do_blocks( $post_content );
+		$p               = new WP_HTML_Tag_Processor( $rendered_blocks );
+		$p->next_tag( array( 'class_name' => 'interactive/block-2' ) );
+		$this->assertEquals( '2', $p->get_attribute( 'value' ) );
+		$p->next_tag( array( 'class_name' => 'interactive/block-3' ) );
+		$this->assertEquals( '3', $p->get_attribute( 'value' ) );
+	}
+
+	public function test_processs_directives_of_interactive_block_inside_multple_non_interactive_block() {
+		$post_content    = '
+			<!-- wp:test/non-interactive-block { "block": 1 } -->
+				<!-- wp:test/interactive-block { "block": 2 } /-->
+			<!-- /wp:test/non-interactive-block -->
+			<!-- wp:test/non-interactive-block { "block": 3 } -->
+				<!-- wp:test/interactive-block { "block": 4 } /-->
+			<!-- /wp:test/non-interactive-block -->
+		';
+		$rendered_blocks = do_blocks( $post_content );
+		$p               = new WP_HTML_Tag_Processor( $rendered_blocks );
+		$p->next_tag( array( 'class_name' => 'interactive/block-2' ) );
+		$this->assertEquals( '2', $p->get_attribute( 'value' ) );
+		$p->next_tag( array( 'class_name' => 'interactive/block-4' ) );
+		$this->assertEquals( '4', $p->get_attribute( 'value' ) );
+	}
+
+	public function test_processs_directives_of_interactive_block_containing_non_interactive_block_without_directives() {
+		$post_content    = '
+			<!-- wp:test/interactive-block { "block": 1 } -->
+				<!-- wp:test/non-interactive-block { "block": 2 } /-->
+			<!-- /wp:test/interactive-block -->
+		';
+		$rendered_blocks = do_blocks( $post_content );
+		$p               = new WP_HTML_Tag_Processor( $rendered_blocks );
+		$p->next_tag( array( 'class_name' => 'interactive/block-1' ) );
+		$this->assertEquals( '1', $p->get_attribute( 'value' ) );
+		$p->next_tag( array( 'class_name' => 'non-interactive/block-2' ) );
+		$this->assertNull( $p->get_attribute( 'value' ) );
+	}
+
+	public function test_processs_directives_of_interactive_block_containing_non_interactive_block_with_directives() {
+		$post_content    = '
+			<!-- wp:test/interactive-block { "block": 1 } -->
+				<!-- wp:test/non-interactive-block { "block": 2, "hasDirective": true } /-->
+			<!-- /wp:test/interactive-block -->
+		';
+		$rendered_blocks = do_blocks( $post_content );
+		$p               = new WP_HTML_Tag_Processor( $rendered_blocks );
+		$p->next_tag( array( 'class_name' => 'interactive/block-1' ) );
+		$this->assertEquals( '1', $p->get_attribute( 'value' ) );
+		$p->next_tag( array( 'class_name' => 'non-interactive/block-2' ) );
+		$this->assertEquals( '1', $p->get_attribute( 'value' ) );
+	}
+
+	public function test_processs_directives_of_interactive_block_containing_nested_interactive_and_non_interactive_blocks() {
+		$post_content    = '
+			<!-- wp:test/interactive-block { "block": 1 } -->
+				<!-- wp:test/interactive-block { "block": 2 } -->
+					<!-- wp:test/non-interactive-block { "block": 3, "hasDirective": true } /-->
+				<!-- /wp:test/interactive-block -->
+				<!-- wp:test/non-interactive-block { "block": 4, "hasDirective": true } /-->
+			<!-- /wp:test/interactive-block -->
+		';
+		$rendered_blocks = do_blocks( $post_content );
+		$p               = new WP_HTML_Tag_Processor( $rendered_blocks );
+		$p->next_tag( array( 'class_name' => 'interactive/block-1' ) );
+		$this->assertEquals( '1', $p->get_attribute( 'value' ) );
+		$p->next_tag( array( 'class_name' => 'interactive/block-2' ) );
+		$this->assertEquals( '2', $p->get_attribute( 'value' ) );
+		$p->next_tag( array( 'class_name' => 'non-interactive/block-3' ) );
+		$this->assertEquals( '2', $p->get_attribute( 'value' ) );
+		$p->next_tag( array( 'class_name' => 'non-interactive/block-4' ) );
+		$this->assertEquals( '1', $p->get_attribute( 'value' ) );
+	}
+
+	private $data_wp_test_processor_count = 0;
+
+	public function data_wp_test_processor( $p ) {
+		if ( ! $p->is_tag_closer() ) {
+			$this->data_wp_test_processor_count = $this->data_wp_test_processor_count + 1;
+		}
+	}
+
+	public function test_process_directives_only_process_the_root_interactive_blocks() {
+		$class                = new ReflectionClass( 'WP_Interactivity_API' );
+		$directive_processors = $class->getProperty( 'directive_processors' );
+		$directive_processors->setAccessible( true );
+		$directive_processors->setValue( null, array( 'data-wp-test' => array( $this, 'data_wp_test_processor' ) ) );
+		$html                               = '<div data-wp-test></div>';
+		$this->data_wp_test_processor_count = 0;
+		wp_interactivity_process_directives( $html );
+		$this->assertEquals( 1, $this->data_wp_test_processor_count );
+
+		register_block_type(
+			'test/custom-directive-block',
+			array(
+				'render_callback' => function ( $attributes, $content ) {
+					return '<div class="test" data-wp-test>' . $content . '</div>';
+				},
+				'supports'        => array(
+					'interactivity' => true,
+				),
+			)
+		);
+		$post_content                       = '
+			<!-- wp:test/custom-directive-block -->
+				<!-- wp:test/custom-directive-block /-->
+			<!-- /wp:test/custom-directive-block -->
+		';
+		$this->data_wp_test_processor_count = 0;
+		do_blocks( $post_content );
+		$this->assertEquals( 2, $this->data_wp_test_processor_count );
+		unregister_block_type( 'test/custom-directive-block' );
+	}
+}
diff --git a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-bind.php b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-bind.php
new file mode 100644
index 0000000000000..7b82d728f0382
--- /dev/null
+++ b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-bind.php
@@ -0,0 +1,338 @@
+<?php
+/**
+ * Unit tests covering the data_wp_bind_processor functionality of the
+ * WP_Interactivity_API class.
+ *
+ * @package WordPress
+ * @subpackage Interactivity API
+ *
+ * @group interactivity-api
+ */
+class Tests_WP_Interactivity_API_WP_Bind extends WP_UnitTestCase {
+	/**
+	 * Instance of WP_Interactivity_API.
+	 *
+	 * @var WP_Interactivity_API
+	 */
+	protected $interactivity;
+
+	/**
+	 * Set up.
+	 */
+	public function set_up() {
+		parent::set_up();
+		$this->interactivity = new WP_Interactivity_API();
+		$this->interactivity->state(
+			'myPlugin',
+			array(
+				'id'          => 'some-id',
+				'width'       => 100,
+				'isOpen'      => false,
+				'null'        => null,
+				'trueString'  => 'true',
+				'falseString' => 'false',
+			)
+		);
+	}
+
+	/**
+	 * Invokes the `process_directives` method of WP_Interactivity_API class.
+	 *
+	 * @param string $html The HTML that needs to be processed.
+	 * @return array An array containing an instance of the WP_HTML_Tag_Processor and the processed HTML.
+	 */
+	private function process_directives( $html ) {
+		$new_html = $this->interactivity->process_directives( $html );
+		$p        = new WP_HTML_Tag_Processor( $new_html );
+		$p->next_tag();
+		return array( $p, $new_html );
+	}
+
+	/**
+	 * Tests setting an attribute via `data-wp-bind`.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_bind_sets_attribute() {
+		$html    = '<div data-wp-bind--id="myPlugin::state.id">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'some-id', $p->get_attribute( 'id' ) );
+	}
+
+	/**
+	 * Tests replacing an existing attribute via `data-wp-bind`.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_bind_replaces_attribute() {
+		$html    = '<div id="other-id" data-wp-bind--id="myPlugin::state.id">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'some-id', $p->get_attribute( 'id' ) );
+	}
+
+	/**
+	 * Tests setting a numerical value as an attribute via `data-wp-bind`.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_bind_sets_number_value() {
+		$html    = '<img data-wp-bind--width="myPlugin::state.width">';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( '100', $p->get_attribute( 'width' ) );
+	}
+
+	/**
+	 * Tests that true strings are set properly as attribute values.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_bind_sets_true_string() {
+		$html               = '<div data-wp-bind--id="myPlugin::state.trueString">Text</div>';
+		list($p, $new_html) = $this->process_directives( $html );
+		$this->assertEquals( 'true', $p->get_attribute( 'id' ) );
+		$this->assertEquals( '<div id="true" data-wp-bind--id="myPlugin::state.trueString">Text</div>', $new_html );
+	}
+
+	/**
+	 * Tests that false strings are set properly as attribute values.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_bind_sets_false_string() {
+		$html               = '<div data-wp-bind--id="myPlugin::state.falseString">Text</div>';
+		list($p, $new_html) = $this->process_directives( $html );
+		$this->assertEquals( 'false', $p->get_attribute( 'id' ) );
+		$this->assertEquals( '<div id="false" data-wp-bind--id="myPlugin::state.falseString">Text</div>', $new_html );
+	}
+
+	/**
+	 * Tests that `data-wp-bind` ignores directives with no suffix.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_bind_ignores_empty_bound_attribute() {
+		$html     = '<div data-wp-bind="myPlugin::state.id">Text</div>';
+		$new_html = $this->interactivity->process_directives( $html );
+		$this->assertEquals( $html, $new_html );
+	}
+
+	/**
+	 * Tests that `data-wp-bind` does nothing when referencing non-existent
+	 * references.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_bind_doesnt_do_anything_on_non_existent_references() {
+		$html     = '<div data-wp-bind--id="myPlugin::state.nonExistengKey">Text</div>';
+		$new_html = $this->interactivity->process_directives( $html );
+		$this->assertEquals( $html, $new_html );
+	}
+
+	/**
+	 * Tests that `data-wp-bind` ignores directives with empty values.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_bind_ignores_empty_value() {
+		$html     = '<div data-wp-bind--id="">Text</div>';
+		$new_html = $this->interactivity->process_directives( $html );
+		$this->assertEquals( $html, $new_html );
+	}
+
+	/**
+	 * Tests that `data-wp-bind` ignores directives without values.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_bind_ignores_without_value() {
+		$html     = '<div data-wp-bind--id>Text</div>';
+		$new_html = $this->interactivity->process_directives( $html );
+		$this->assertEquals( $html, $new_html );
+	}
+
+	/**
+	 * Tests that `data-wp-bind` works with multiple instances of the same
+	 * directive on a tag.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_bind_works_with_multiple_same_directives() {
+		$html    = '<div data-wp-bind--id="myPlugin::state.id" data-wp-bind--id="myPlugin::state.id">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'some-id', $p->get_attribute( 'id' ) );
+	}
+
+	/**
+	 * Tests that `data-wp-bind` works with multiple instances of different
+	 * directives on a tag.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_bind_works_with_multiple_different_directives() {
+		$html    = '<img data-wp-bind--id="myPlugin::state.id" data-wp-bind--width="myPlugin::state.width">';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'some-id', $p->get_attribute( 'id' ) );
+		$this->assertEquals( '100', $p->get_attribute( 'width' ) );
+	}
+
+	/**
+	 * Tests adding boolean attributes to a tag using `data-wp-bind`.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_bind_adds_boolean_attribute_if_true() {
+		$html               = '<div data-wp-bind--hidden="myPlugin::!state.isOpen">Text</div>';
+		list($p, $new_html) = $this->process_directives( $html );
+		$this->assertTrue( $p->get_attribute( 'hidden' ) );
+		$this->assertEquals( '<div hidden data-wp-bind--hidden="myPlugin::!state.isOpen">Text</div>', $new_html );
+	}
+
+	/**
+	 * Tests replacing a pre-existing boolean attribute on a tag using
+	 * `data-wp-bind`.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_bind_replaces_existing_attribute_if_true() {
+		$html               = '<div hidden="true" data-wp-bind--hidden="myPlugin::!state.isOpen">Text</div>';
+		list($p, $new_html) = $this->process_directives( $html );
+		$this->assertTrue( $p->get_attribute( 'hidden' ) );
+		$this->assertEquals( '<div hidden data-wp-bind--hidden="myPlugin::!state.isOpen">Text</div>', $new_html );
+	}
+
+	/**
+	 * Tests that boolean attributes are not added when bound to false or null
+	 * values.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_bind_doesnt_add_boolean_attribute_if_false_or_null() {
+		$html               = '<div data-wp-bind--hidden="myPlugin::state.isOpen">Text</div>';
+		list($p, $new_html) = $this->process_directives( $html );
+		$this->assertNull( $p->get_attribute( 'hidden' ) );
+		$this->assertEquals( $html, $new_html );
+
+		$html               = '<div data-wp-bind--hidden="myPlugin::state.null">Text</div>';
+		list($p, $new_html) = $this->process_directives( $html );
+		$this->assertNull( $p->get_attribute( 'hidden' ) );
+		$this->assertEquals( $html, $new_html );
+	}
+
+	/**
+	 * Tests removing boolean attributes from a tag using `data-wp-bind` and a
+	 * false or null value.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_bind_removes_boolean_attribute_if_false_or_null() {
+		$html    = '<div hidden data-wp-bind--hidden="myPlugin::state.isOpen">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertNull( $p->get_attribute( 'hidden' ) );
+
+		$html    = '<div hidden data-wp-bind--hidden="myPlugin::state.null">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertNull( $p->get_attribute( 'hidden' ) );
+	}
+
+	/**
+	 * Tests adding values to aria or data attributes when the condition evaluates
+	 * to true.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_bind_adds_value_if_true_in_aria_or_data_attributes() {
+		$html               = '<div data-wp-bind--aria-hidden="myPlugin::!state.isOpen">Text</div>';
+		list($p, $new_html) = $this->process_directives( $html );
+		$this->assertEquals( 'true', $p->get_attribute( 'aria-hidden' ) );
+		$this->assertEquals( '<div aria-hidden="true" data-wp-bind--aria-hidden="myPlugin::!state.isOpen">Text</div>', $new_html );
+
+		$html               = '<div data-wp-bind--data-is-closed="myPlugin::!state.isOpen">Text</div>';
+		list($p, $new_html) = $this->process_directives( $html );
+		$this->assertEquals( 'true', $p->get_attribute( 'data-is-closed' ) );
+		$this->assertEquals( '<div data-is-closed="true" data-wp-bind--data-is-closed="myPlugin::!state.isOpen">Text</div>', $new_html );
+	}
+
+	/**
+	 * Tests replacing values in aria or data attributes when the condition
+	 * evaluates to true.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_bind_replaces_value_if_true_in_aria_or_data_attributes() {
+		$html               = '<div aria-hidden="false" data-wp-bind--aria-hidden="myPlugin::!state.isOpen">Text</div>';
+		list($p, $new_html) = $this->process_directives( $html );
+		$this->assertEquals( 'true', $p->get_attribute( 'aria-hidden' ) );
+		$this->assertEquals( '<div aria-hidden="true" data-wp-bind--aria-hidden="myPlugin::!state.isOpen">Text</div>', $new_html );
+
+		$html     = '<div data-is-closed="false" data-wp-bind--data-is-closed="myPlugin::!state.isOpen">Text</div>';
+		$new_html = $this->interactivity->process_directives( $html );
+		$p        = new WP_HTML_Tag_Processor( $new_html );
+		$p->next_tag();
+		$this->assertEquals( 'true', $p->get_attribute( 'data-is-closed' ) );
+		$this->assertEquals( '<div data-is-closed="true" data-wp-bind--data-is-closed="myPlugin::!state.isOpen">Text</div>', $new_html );
+	}
+
+	/**
+	 * Tests adding the value 'false' to aria or data attributes when the
+	 * condition evaluates to false.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_bind_adds_value_if_false_in_aria_or_data_attributes() {
+		$html               = '<div data-wp-bind--aria-hidden="myPlugin::state.isOpen">Text</div>';
+		list($p, $new_html) = $this->process_directives( $html );
+		$this->assertEquals( 'false', $p->get_attribute( 'aria-hidden' ) );
+		$this->assertEquals( '<div aria-hidden="false" data-wp-bind--aria-hidden="myPlugin::state.isOpen">Text</div>', $new_html );
+
+		$html               = '<div data-wp-bind--data-is-closed="myPlugin::state.isOpen">Text</div>';
+		list($p, $new_html) = $this->process_directives( $html );
+		$this->assertEquals( 'false', $p->get_attribute( 'data-is-closed' ) );
+		$this->assertEquals( '<div data-is-closed="false" data-wp-bind--data-is-closed="myPlugin::state.isOpen">Text</div>', $new_html );
+	}
+
+	/**
+	 * Tests replacing values in aria or data attributes when the condition
+	 * evaluates to false.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_bind_replaces_value_if_false_in_aria_or_data_attributes() {
+		$html               = '<div aria-hidden="true" data-wp-bind--aria-hidden="myPlugin::state.isOpen">Text</div>';
+		list($p, $new_html) = $this->process_directives( $html );
+		$this->assertEquals( 'false', $p->get_attribute( 'aria-hidden' ) );
+		$this->assertEquals( '<div aria-hidden="false" data-wp-bind--aria-hidden="myPlugin::state.isOpen">Text</div>', $new_html );
+
+		$html               = '<div data-is-closed="true" data-wp-bind--data-is-closed="myPlugin::state.isOpen">Text</div>';
+		list($p, $new_html) = $this->process_directives( $html );
+		$this->assertEquals( 'false', $p->get_attribute( 'data-is-closed' ) );
+		$this->assertEquals( '<div data-is-closed="false" data-wp-bind--data-is-closed="myPlugin::state.isOpen">Text</div>', $new_html );
+	}
+
+	/**
+	 * Tests removing values from aria or data attributes when the value is null.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_bind_removes_value_if_null_in_aria_or_data_attributes() {
+		$html    = '<div aria-hidden="true" data-wp-bind--aria-hidden="myPlugin::state.null">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertNull( $p->get_attribute( 'aria-hidden' ) );
+
+		$html    = '<div data-is-closed="true" data-wp-bind--data-is-closed="myPlugin::state.null">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertNull( $p->get_attribute( 'data-is-closed' ) );
+	}
+
+	/**
+	 * Tests handling of bindings within nested tags.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_bind_handles_nested_bindings() {
+		$html    = '<div data-wp-bind--id="myPlugin::state.id"><img data-wp-bind--width="myPlugin::state.width"></div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'some-id', $p->get_attribute( 'id' ) );
+		$p->next_tag();
+		$this->assertEquals( '100', $p->get_attribute( 'width' ) );
+	}
+}
diff --git a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-class.php b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-class.php
new file mode 100644
index 0000000000000..7484d7ea50ccc
--- /dev/null
+++ b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-class.php
@@ -0,0 +1,291 @@
+<?php
+/**
+ * Unit tests covering the data_wp_class_processor functionality of the
+ * WP_Interactivity_API class.
+ *
+ * @package WordPress
+ * @subpackage Interactivity API
+ *
+ * @group interactivity-api
+ */
+class Tests_WP_Interactivity_API_WP_Class extends WP_UnitTestCase {
+	/**
+	 * Instance of WP_Interactivity_API.
+	 *
+	 * @var WP_Interactivity_API
+	 */
+	protected $interactivity;
+
+	/**
+	 * Set up.
+	 */
+	public function set_up() {
+		parent::set_up();
+		$this->interactivity = new WP_Interactivity_API();
+		$this->interactivity->state(
+			'myPlugin',
+			array(
+				'true'  => true,
+				'false' => false,
+			)
+		);
+	}
+
+	/**
+	 * Invokes the `process_directives` method of WP_Interactivity_API class.
+	 *
+	 * @param string $html The HTML that needs to be processed.
+	 * @return array An array containing an instance of the WP_HTML_Tag_Processor and the processed HTML.
+	 */
+	private function process_directives( $html ) {
+		$new_html = $this->interactivity->process_directives( $html );
+		$p        = new WP_HTML_Tag_Processor( $new_html );
+		$p->next_tag();
+		return array( $p, $new_html );
+	}
+
+	/**
+	 * Tests that `data-wp-class` adds a class when the condition is true.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_class_sets_class_name() {
+		$html    = '<div data-wp-class--some-class="myPlugin::state.true">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'some-class', $p->get_attribute( 'class' ) );
+	}
+
+	/**
+	 * Tests that `data-wp-class` can add multiple classes based on true
+	 * conditions.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_class_sets_multiple_class_names() {
+		$html    = '
+			<div
+				data-wp-class--some-class="myPlugin::state.true"
+				data-wp-class--other-class="myPlugin::state.true"
+			>Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'some-class other-class', $p->get_attribute( 'class' ) );
+	}
+
+	/**
+	 * Tests handling of adding one and not adding another class based on
+	 * different boolean values.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_class_handles_multiple_class_names_with_different_values() {
+		$html    = '
+			<div
+				data-wp-class--some-class="myPlugin::state.true"
+				data-wp-class--other-class="myPlugin::state.false"
+			>Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'some-class', $p->get_attribute( 'class' ) );
+
+		$html    = '
+			<div
+				class="other-class"
+				data-wp-class--some-class="myPlugin::state.true"
+				data-wp-class--other-class="myPlugin::state.false"
+			>Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'some-class', $p->get_attribute( 'class' ) );
+	}
+
+	/**
+	 * Tests that `data-wp-class` adds new classes alongside existing ones.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_class_sets_class_name_when_class_attribute_exists() {
+		$html    = '<div class="other-class" data-wp-class--some-class="myPlugin::state.true">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'other-class some-class', $p->get_attribute( 'class' ) );
+	}
+
+	/**
+	 * Tests that no class is added when the associated state is false.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_class_doesnt_add_class_attribute_on_false() {
+		$html    = '<div data-wp-class--some-class="myPlugin::state.false">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertNull( $p->get_attribute( 'class' ) );
+	}
+
+	/**
+	 * Tests that existing class names are preserved when the directive condition
+	 * is false.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_class_doesnt_add_class_name_on_false() {
+		$html    = '<div class="other-class" data-wp-class--some-class="myPlugin::state.false">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'other-class', $p->get_attribute( 'class' ) );
+	}
+
+	/**
+	 * Tests that existing class names remain intact when they should be re-added
+	 * as per their directive.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_class_keeps_class_name_when_class_name_exists() {
+		$html    = '<div class="some-class" data-wp-class--some-class="myPlugin::state.true">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'some-class', $p->get_attribute( 'class' ) );
+	}
+
+	/**
+	 * Tests preservation of existing class names, even when one is repeated in a
+	 * directive that evaluates to true.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_class_keeps_class_name_when_class_name_exists_and_is_not_the_only_one() {
+		$html    = '<div class="other-class some-class" data-wp-class--some-class="myPlugin::state.true">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'other-class some-class', $p->get_attribute( 'class' ) );
+	}
+
+	/**
+	 * Tests that a class attribute with only one class name is removed when the
+	 * directive evaluates to false.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_class_removes_class_attribute_when_class_name_exists_and_is_the_only_one() {
+		$html    = '<div class="some-class" data-wp-class--some-class="myPlugin::state.false">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertNull( $p->get_attribute( 'class' ) );
+	}
+
+	/**
+	 * Tests that one of several class names is removed when its directive
+	 * evaluates to false.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_class_removes_class_name_when_class_name_exists_and_is_not_the_only_one() {
+		$html    = '<div class="other-class some-class" data-wp-class--some-class="myPlugin::state.false">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'other-class', $p->get_attribute( 'class' ) );
+	}
+
+	/**
+	 * Tests that an empty class attribute is not removed even if a directive
+	 * evaluates to false.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_class_doesnt_remove_empty_class_attribute() {
+		$html    = '<div class data-wp-class--some-class="myPlugin::state.false">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertTrue( $p->get_attribute( 'class' ) );
+	}
+
+	/**
+	 * Tests that the class attribute remains unchanged if the data-wp-class
+	 * suffix is empty.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_class_doesnt_change_class_attribute_with_empty_directive_suffix() {
+		$html    = '<div class="other-class" data-wp-class="myPlugin::state.true">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'other-class', $p->get_attribute( 'class' ) );
+	}
+
+	/**
+	 * Tests that the class attribute is not altered if the value of the
+	 * `data-wp-class` directive is empty.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_class_doesnt_change_class_attribute_with_empty_value() {
+		$html    = '<div class="other-class" data-wp-class--some-class="">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'other-class', $p->get_attribute( 'class' ) );
+	}
+
+	/**
+	 * Tests that an existing class attribute is not affected by a `data-wp-class`
+	 * directive without a value.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_class_doesnt_change_class_attribute_without_value() {
+		$html    = '<div class="other-class" data-wp-class--some-class>Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'other-class', $p->get_attribute( 'class' ) );
+	}
+
+	/**
+	 * Tests that multiple directives for the same class yield the correct result
+	 * when the condition is true.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_class_works_with_multiple_directives() {
+		$html    = '<div data-wp-class--some-class="myPlugin::state.true" data-wp-class--some-class="myPlugin::state.true">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'some-class', $p->get_attribute( 'class' ) );
+	}
+
+	/**
+	 * Tests setting class names based on truthy values other than just true
+	 * booleans.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_class_sets_class_name_on_truthy_values() {
+		$this->interactivity->state( 'myPlugin', array( 'text' => 'some text' ) );
+		$html    = '<div data-wp-class--some-class="myPlugin::state.text">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'some-class', $p->get_attribute( 'class' ) );
+
+		$this->interactivity->state( 'myPlugin', array( 'array' => array( 1, 2 ) ) );
+		$html    = '<div data-wp-class--some-class="myPlugin::state.array">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'some-class', $p->get_attribute( 'class' ) );
+
+		$this->interactivity->state( 'myPlugin', array( 'number' => 1 ) );
+		$html    = '<div data-wp-class--some-class="myPlugin::state.number">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'some-class', $p->get_attribute( 'class' ) );
+	}
+
+	/**
+	 * Tests that class attributes aren't set for falsy values other than just
+	 * false booleans.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_class_sets_class_name_on_falsy_values() {
+		$this->interactivity->state( 'myPlugin', array( 'text' => '' ) );
+		$html    = '<div data-wp-class--some-class="myPlugin::state.text">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertNull( $p->get_attribute( 'class' ) );
+
+		$this->interactivity->state( 'myPlugin', array( 'array' => array() ) );
+		$html    = '<div data-wp-class--some-class="myPlugin::state.array">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertNull( $p->get_attribute( 'class' ) );
+
+		$this->interactivity->state( 'myPlugin', array( 'number' => 0 ) );
+		$html    = '<div data-wp-class--some-class="myPlugin::state.number">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertNull( $p->get_attribute( 'class' ) );
+
+		$this->interactivity->state( 'myPlugin', array( 'null' => null ) );
+		$html    = '<div data-wp-class--some-class="myPlugin::state.null">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertNull( $p->get_attribute( 'class' ) );
+	}
+}
diff --git a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-context.php b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-context.php
new file mode 100644
index 0000000000000..0e0ef3c35f016
--- /dev/null
+++ b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-context.php
@@ -0,0 +1,476 @@
+<?php
+/**
+ * Unit tests covering the data_wp_context_processor functionality of the
+ * WP_Interactivity_API class.
+ *
+ * @package WordPress
+ * @subpackage Interactivity API
+ *
+ * @group interactivity-api
+ */
+class Tests_WP_Interactivity_API_WP_Context extends WP_UnitTestCase {
+	/**
+	 * Instance of WP_Interactivity_API.
+	 *
+	 * @var WP_Interactivity_API
+	 */
+	protected $interactivity;
+
+	/**
+	 * Set up.
+	 */
+	public function set_up() {
+		parent::set_up();
+		$this->interactivity = new WP_Interactivity_API();
+	}
+
+	/**
+	 * Invokes the `process_directives` method of WP_Interactivity_API class.
+	 *
+	 * @param string $html The HTML that needs to be processed.
+	 * @return array An array containing an instance of the WP_HTML_Tag_Processor and the processed HTML.
+	 */
+	private function process_directives( $html ) {
+		$new_html = $this->interactivity->process_directives( $html );
+		$p        = new WP_HTML_Tag_Processor( $new_html );
+		$p->next_tag( array( 'class_name' => 'test' ) );
+		return array( $p, $new_html );
+	}
+
+	/**
+	 * Tests that the `data-wp-context` directive can set a context in a custom
+	 * namespace.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_context_directive_sets_a_context_in_a_custom_namespace() {
+		$html    = '
+			<div data-wp-context=\'myPlugin::{ "id": "some-id" }\'>
+				<div class="test" data-wp-bind--id="myPlugin::context.id">Text</div>
+			</div>
+		';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'some-id', $p->get_attribute( 'id' ) );
+	}
+
+	/**
+	 * Tests that the `data-wp-context` directive can set a context in the same
+	 * tag.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_context_directive_can_set_a_context_in_the_same_tag() {
+		$html    = '
+			<div
+				class="test"
+				data-wp-context=\'myPlugin::{ "id": "some-id" }\'
+				data-wp-bind--id="myPlugin::context.id"
+			>
+				Text
+			</div>
+		';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'some-id', $p->get_attribute( 'id' ) );
+	}
+
+	/**
+	 * Tests that the `data-wp-context` directive merges context in the same
+	 * custom namespace.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_context_directive_merges_context_in_the_same_custom_namespace() {
+		$html    = '
+			<div data-wp-context=\'myPlugin::{ "id1": "some-id-1" }\'>
+				<div data-wp-context=\'myPlugin::{ "id2": "some-id-2" }\'>
+					<div class="test" data-wp-bind--id="myPlugin::context.id1">Text</div>
+					<div class="test" data-wp-bind--id="myPlugin::context.id2">Text</div>
+				</div>
+			</div>
+		';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'some-id-1', $p->get_attribute( 'id' ) );
+		$p->next_tag( array( 'class_name' => 'test' ) );
+		$this->assertEquals( 'some-id-2', $p->get_attribute( 'id' ) );
+	}
+
+	/**
+	 * Tests that the `data-wp-context` directive overwrites context in the same
+	 * custom namespace.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_context_directive_overwrites_context_in_the_same_custom_namespace() {
+		$html    = '
+			<div data-wp-context=\'myPlugin::{ "id": "some-id-1" }\'>
+				<div data-wp-context=\'myPlugin::{ "id": "some-id-2" }\'>
+					<div class="test" data-wp-bind--id="myPlugin::context.id">Text</div>
+				</div>
+			</div>
+		';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'some-id-2', $p->get_attribute( 'id' ) );
+	}
+
+	/**
+	 * Tests that the `data-wp-context` directive replaces the old context after a
+	 * closing tag in the same custom namespace.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_context_directive_replaces_old_context_after_closing_tag_in_the_same_custom_namespace() {
+		$html    = '
+			<div data-wp-context=\'myPlugin::{ "id": "some-id-1" }\'>
+				<div data-wp-context=\'myPlugin::{ "id": "some-id-2" }\'>
+					<div class="test" data-wp-bind--id="myPlugin::context.id">Text</div>
+				</div>
+				<div class="test" data-wp-bind--id="myPlugin::context.id">Text</div>
+			</div>
+		';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'some-id-2', $p->get_attribute( 'id' ) );
+		$p->next_tag( array( 'class_name' => 'test' ) );
+		$this->assertEquals( 'some-id-1', $p->get_attribute( 'id' ) );
+	}
+
+	/**
+	 * Tests that the `data-wp-context` directive merges context in different
+	 * custom namespaces.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_context_directive_merges_context_in_different_custom_namespaces() {
+		$html    = '
+			<div data-wp-context=\'myPlugin::{ "id": "some-id-1" }\'>
+				<div data-wp-context=\'otherPlugin::{ "id": "some-id-2" }\'>
+					<div class="test" data-wp-bind--id="myPlugin::context.id">Text</div>
+					<div class="test" data-wp-bind--id="otherPlugin::context.id">Text</div>
+				</div>
+			</div>
+		';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'some-id-1', $p->get_attribute( 'id' ) );
+		$p->next_tag( array( 'class_name' => 'test' ) );
+		$this->assertEquals( 'some-id-2', $p->get_attribute( 'id' ) );
+	}
+
+	/**
+	 * Tests that the `data-wp-context` directive doesn't throw on malformed
+	 * context objects.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_context_directive_doesnt_throw_on_malformed_context_objects() {
+		$html    = '
+			<div data-wp-context=\'myPlugin::{ id: "some-id" }\'>
+				<div class="test" data-wp-bind--id="myPlugin::context.id">Text</div>
+			</div>
+		';
+		list($p) = $this->process_directives( $html );
+		$this->assertNull( $p->get_attribute( 'id' ) );
+	}
+
+	/**
+	 * Tests that the `data-wp-context` directive doesn't overwrite context on
+	 * malformed context objects.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_context_directive_doesnt_overwrite_context_on_malformed_context_objects() {
+		$html    = '
+			<div data-wp-context=\'myPlugin::{ "id": "some-id-1" }\'>
+				<div data-wp-context=\'myPlugin::{ id: "some-id-2" }\'>
+					<div class="test" data-wp-bind--id="myPlugin::context.id">Text</div>
+				</div>
+				<div class="test" data-wp-bind--id="myPlugin::context.id">Text</div>
+			</div>
+		';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'some-id-1', $p->get_attribute( 'id' ) );
+		$p->next_tag( array( 'class_name' => 'test' ) );
+		$this->assertEquals( 'some-id-1', $p->get_attribute( 'id' ) );
+	}
+
+	/**
+	 * Tests that the `data-wp-context` directive doesn't throw on an empty
+	 * context object.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_context_directive_doesnt_throw_on_empty_context() {
+		$html    = '
+			<div data-wp-context="">
+				<div class="test" data-wp-bind--id="myPlugin::context.id">Text</div>
+			</div>
+		';
+		list($p) = $this->process_directives( $html );
+		$this->assertNull( $p->get_attribute( 'id' ) );
+	}
+
+	/**
+	 * Tests that the `data-wp-context` directive doesn't overwrite the context on
+	 * empty context directive.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_context_directive_doesnt_overwrite_context_on_empty_context() {
+		$html    = '
+			<div data-wp-context=\'myPlugin::{ "id": "some-id-1" }\'>
+				<div data-wp-context="">
+					<div class="test" data-wp-bind--id="myPlugin::context.id">Text</div>
+				</div>
+				<div class="test" data-wp-bind--id="myPlugin::context.id">Text</div>
+			</div>
+		';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'some-id-1', $p->get_attribute( 'id' ) );
+		$p->next_tag( array( 'class_name' => 'test' ) );
+		$this->assertEquals( 'some-id-1', $p->get_attribute( 'id' ) );
+	}
+
+	/**
+	 * Tests that the `data-wp-context` directive doesn't throw on context without
+	 * value.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_context_directive_doesnt_throw_on_context_without_value() {
+		$html    = '
+			<div data-wp-context>
+				<div class="test" data-wp-bind--id="myPlugin::context.id">Text</div>
+			</div>
+		';
+		list($p) = $this->process_directives( $html );
+		$this->assertNull( $p->get_attribute( 'id' ) );
+	}
+
+	/**
+	 * Tests that the `data-wp-context` directive doesn't overwrite context on
+	 * context without value.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_context_directive_doesnt_overwrite_context_on_context_without_value() {
+		$html    = '
+			<div data-wp-context=\'myPlugin::{ "id": "some-id-1" }\'>
+				<div data-wp-context>
+					<div class="test" data-wp-bind--id="myPlugin::context.id">Text</div>
+				</div>
+				<div class="test" data-wp-bind--id="myPlugin::context.id">Text</div>
+			</div>
+		';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'some-id-1', $p->get_attribute( 'id' ) );
+		$p->next_tag( array( 'class_name' => 'test' ) );
+		$this->assertEquals( 'some-id-1', $p->get_attribute( 'id' ) );
+	}
+
+	/**
+	 * Tests that the `data-wp-context` directive works with multiple directives.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_context_works_with_multiple_directives() {
+		$html    = '
+			<div data-wp-context=\'myPlugin::{ "id": "some-id" }\' data-wp-context=\'myPlugin::{ "id": "some-id" }\'>
+				<div class="test" data-wp-bind--id="myPlugin::context.id">Text</div>
+			</div>
+		';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'some-id', $p->get_attribute( 'id' ) );
+	}
+
+	/**
+	 * Tests that the `data-wp-context` directive doesn't work without any
+	 * namespace.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_context_directive_doesnt_work_without_any_namespace() {
+		$html    = '
+			<div data-wp-context=\'{ "id": "some-id" }\'>
+				<div class="test" data-wp-bind--id="context.id">Text</div>
+			</div>
+		';
+		list($p) = $this->process_directives( $html );
+		$this->assertNull( $p->get_attribute( 'id' ) );
+	}
+
+	/**
+	 * Tests that the `data-wp-context` directive works with a default namespace.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_context_directive_works_with_default_namespace() {
+		$html    = '
+			<div
+			 data-wp-interactive=\'{ "namespace": "myPlugin" }\'
+			 data-wp-context=\'{ "id": "some-id" }\'
+			>
+				<div class="test" data-wp-bind--id="context.id">Text</div>
+			</div>
+		';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'some-id', $p->get_attribute( 'id' ) );
+	}
+
+	/**
+	 * Tests that the `data-wp-context` directive overrides a default namespace.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_context_directive_overrides_default_namespace() {
+		$html    = '
+			<div
+			 data-wp-interactive=\'{ "namespace": "myPlugin" }\'
+			 data-wp-context=\'otherPlugin::{ "id": "some-id" }\'
+			>
+				<div data-wp-interactive=\'{ "namespace": "otherPlugin" }\'>
+					<div class="test" data-wp-bind--id="context.id">Text</div>
+				</div>
+			</div>
+		';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'some-id', $p->get_attribute( 'id' ) );
+	}
+
+	/**
+	 * Tests that the `data-wp-context` directive overrides the default namespace
+	 * with the same namespace.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_context_directive_overrides_default_namespace_with_same_namespace() {
+		$html    = '
+			<div
+			 data-wp-interactive=\'{ "namespace": "myPlugin" }\'
+			 data-wp-context=\'myPlugin::{ "id": "some-id" }\'
+			>
+				<div class="test" data-wp-bind--id="context.id">Text</div>
+			</div>
+		';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'some-id', $p->get_attribute( 'id' ) );
+	}
+
+	/**
+	 * Tests that the `data-wp-context` directive works with nested default
+	 * namespaces.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_context_directive_works_with_nested_default_namespaces() {
+		$html    = '
+			<div data-wp-interactive=\'{ "namespace": "myPlugin" }\'>
+				<div data-wp-context=\'{ "id": "some-id" }\'>
+					<div data-wp-interactive=\'{ "namespace": "otherPlugin" }\'>
+						<div data-wp-context=\'{ "id": "other-id" }\'>
+							<div class="test" data-wp-bind--id="context.id">Text</div>
+							<div class="test" data-wp-bind--id="myPlugin::context.id">Text</div>
+						</div>
+					</div>
+					<div class="test" data-wp-bind--id="context.id">Text</div>
+				</div>
+				<div class="test" data-wp-bind--id="context.id">Text</div>
+			</div>
+		';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'other-id', $p->get_attribute( 'id' ) );
+		$p->next_tag( array( 'class_name' => 'test' ) );
+		$this->assertEquals( 'some-id', $p->get_attribute( 'id' ) );
+		$p->next_tag( array( 'class_name' => 'test' ) );
+		$this->assertEquals( 'some-id', $p->get_attribute( 'id' ) );
+		$p->next_tag( array( 'class_name' => 'test' ) );
+		$this->assertNull( $p->get_attribute( 'id' ) );
+	}
+
+	/**
+	 * Tests that the `data-wp-context` directive works with a default namespace
+	 * in the same tag.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_context_directive_works_with_default_namespace_in_the_same_tag() {
+		$html    = '
+			<div
+			 class="test"
+			 data-wp-interactive=\'{ "namespace": "myPlugin" }\'
+			 data-wp-context=\'{ "id": "some-id" }\'
+			 data-wp-bind--id="context.id"
+			>
+				Text
+			</div>
+		';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'some-id', $p->get_attribute( 'id' ) );
+	}
+
+	/**
+	 * Tests that the `data-wp-context` directive merges the context in the same
+	 * default namespace.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_context_directive_merges_context_in_the_same_default_namespace() {
+		$html    = '
+			<div
+				data-wp-interactive=\'{ "namespace": "myPlugin" }\'
+				data-wp-context=\'{ "id1": "some-id-1" }\'
+			>
+				<div data-wp-context=\'{ "id2": "some-id-2" }\'>
+					<div class="test" data-wp-bind--id="context.id1">Text</div>
+					<div class="test" data-wp-bind--id="context.id2">Text</div>
+				</div>
+			</div>
+		';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'some-id-1', $p->get_attribute( 'id' ) );
+		$p->next_tag( array( 'class_name' => 'test' ) );
+		$this->assertEquals( 'some-id-2', $p->get_attribute( 'id' ) );
+	}
+
+	/**
+	 * Tests that the `data-wp-context` directive overwrites context in the same
+	 * default namespace.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_context_directive_overwrites_context_in_the_same_default_namespace() {
+		$html    = '
+			<div
+				data-wp-interactive=\'{ "namespace": "myPlugin" }\'
+				data-wp-context=\'{ "id": "some-id-1" }\'
+			>
+				<div data-wp-context=\'{ "id": "some-id-2" }\'>
+					<div class="test" data-wp-bind--id="context.id">Text</div>
+				</div>
+			</div>
+		';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'some-id-2', $p->get_attribute( 'id' ) );
+	}
+
+	/**
+	 * Tests that the `data-wp-context` directive replaces the old context after
+	 * the closing tag in the same default namespace.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_context_directive_replaces_old_context_after_closing_tag_in_the_same_default_namespace() {
+		$html    = '
+			<div
+				data-wp-interactive=\'{ "namespace": "myPlugin" }\'
+				data-wp-context=\'{ "id": "some-id-1" }\'
+			>
+				<div data-wp-context=\'{ "id": "some-id-2" }\'>
+					<div class="test" data-wp-bind--id="context.id">Text</div>
+				</div>
+				<div class="test" data-wp-bind--id="context.id">Text</div>
+			</div>
+		';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'some-id-2', $p->get_attribute( 'id' ) );
+		$p->next_tag( array( 'class_name' => 'test' ) );
+		$this->assertEquals( 'some-id-1', $p->get_attribute( 'id' ) );
+	}
+}
diff --git a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-interactive.php b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-interactive.php
new file mode 100644
index 0000000000000..d821c4504a513
--- /dev/null
+++ b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-interactive.php
@@ -0,0 +1,206 @@
+<?php
+/**
+ * Unit tests covering the data_wp_interactive_processor functionality of the
+ * WP_Interactivity_API class.
+ *
+ * @package WordPress
+ * @subpackage Interactivity API
+ *
+ * @group interactivity-api
+ */
+class Tests_WP_Interactivity_API_WP_Interactive extends WP_UnitTestCase {
+	/**
+	 * Instance of WP_Interactivity_API.
+	 *
+	 * @var WP_Interactivity_API
+	 */
+	protected $interactivity;
+
+	/**
+	 * Set up.
+	 */
+	public function set_up() {
+		parent::set_up();
+		$this->interactivity = new WP_Interactivity_API();
+		$this->interactivity->state( 'myPlugin', array( 'id' => 'some-id' ) );
+		$this->interactivity->state( 'otherPlugin', array( 'id' => 'other-id' ) );
+	}
+
+	/**
+	 * Invokes the `process_directives` method of WP_Interactivity_API class.
+	 *
+	 * @param string $html The HTML that needs to be processed.
+	 * @return array An array containing an instance of the WP_HTML_Tag_Processor and the processed HTML.
+	 */
+	private function process_directives( $html ) {
+		$new_html = $this->interactivity->process_directives( $html );
+		$p        = new WP_HTML_Tag_Processor( $new_html );
+		$p->next_tag( array( 'class_name' => 'test' ) );
+		return array( $p, $new_html );
+	}
+
+	/**
+	 * Tests that a default namespace is applied when using the
+	 * `data-wp-interactive` directive.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_interactive_sets_a_default_namespace() {
+		$html    = '
+					<div data-wp-interactive=\'{ "namespace": "myPlugin" }\'>
+							<div class="test" data-wp-bind--id="state.id">Text</div>
+					</div>
+			';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'some-id', $p->get_attribute( 'id' ) );
+	}
+
+	/**
+	 * Tests that the most recent `data-wp-interactive` directive replaces the
+	 * previous default namespace.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_interactive_replaces_the_previous_default_namespace() {
+		$html    = '
+					<div data-wp-interactive=\'{ "namespace": "otherPlugin" }\'>
+							<div data-wp-interactive=\'{ "namespace": "myPlugin" }\'>
+									<div class="test" data-wp-bind--id="state.id">Text</div>
+							</div>
+							<div class="test" data-wp-bind--id="state.id">Text</div>
+					</div>
+			';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'some-id', $p->get_attribute( 'id' ) );
+		$p->next_tag( array( 'class_name' => 'test' ) );
+		$this->assertEquals( 'other-id', $p->get_attribute( 'id' ) );
+	}
+
+	/**
+	 * Tests that a `data-wp-interactive` directive without a namespace does not
+	 * replace the previously established default namespace.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_interactive_without_namespace_doesnt_replace_the_previous_default_namespace() {
+		$html    = '
+					<div data-wp-interactive=\'{ "namespace": "myPlugin" }\'>
+							<div data-wp-interactive=\'{}\'>
+									<div class="test" data-wp-bind--id="state.id">Text</div>
+							</div>
+							<div class="test" data-wp-bind--id="state.id">Text</div>
+					</div>
+			';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'some-id', $p->get_attribute( 'id' ) );
+		$p->next_tag( array( 'class_name' => 'test' ) );
+		$this->assertEquals( 'some-id', $p->get_attribute( 'id' ) );
+	}
+
+	/**
+	 * Tests that an empty value for `data-wp-interactive` does not replace the
+	 * previously established default namespace.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_interactive_with_empty_value_doesnt_replace_the_previous_default_namespace() {
+		$html    = '
+					<div data-wp-interactive=\'{ "namespace": "myPlugin" }\'>
+							<div data-wp-interactive="">
+									<div class="test" data-wp-bind--id="state.id">Text</div>
+							</div>
+							<div class="test" data-wp-bind--id="state.id">Text</div>
+					</div>
+			';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'some-id', $p->get_attribute( 'id' ) );
+		$p->next_tag( array( 'class_name' => 'test' ) );
+		$this->assertEquals( 'some-id', $p->get_attribute( 'id' ) );
+	}
+
+	/**
+	 * Tests that a `data-wp-interactive` directive with no assigned value does
+	 * not replace the previously established default namespace.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_interactive_without_value_doesnt_replace_the_previous_default_namespace() {
+		$html    = '
+					<div data-wp-interactive=\'{ "namespace": "myPlugin" }\'>
+							<div data-wp-interactive>
+									<div class="test" data-wp-bind--id="state.id">Text</div>
+							</div>
+							<div class="test" data-wp-bind--id="state.id">Text</div>
+					</div>
+			';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'some-id', $p->get_attribute( 'id' ) );
+		$p->next_tag( array( 'class_name' => 'test' ) );
+		$this->assertEquals( 'some-id', $p->get_attribute( 'id' ) );
+	}
+
+	/**
+	 * Tests that multiple `data-wp-interactive` directives work correctly.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_interactive_works_with_multiple_directives() {
+		$html    = '
+					<div data-wp-interactive=\'{ "namespace": "myPlugin" }\' data-wp-interactive=\'{ "namespace": "myPlugin" }\'>
+							<div class="test" data-wp-bind--id="state.id">Text</div>
+					</div>
+			';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'some-id', $p->get_attribute( 'id' ) );
+	}
+
+	/**
+	 * Tests that a custom namespace can override the default one provided by a
+	 * `data-wp-interactive` directive.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_interactive_namespace_can_be_override_by_custom_one() {
+		$html    = '
+					<div data-wp-interactive=\'{ "namespace": "myPlugin" }\'>
+							<div class="test" data-wp-bind--id="otherPlugin::state.id">Text</div>
+					</div>
+			';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'other-id', $p->get_attribute( 'id' ) );
+	}
+
+	/**
+	 * Tests that the `data-wp-interactive` setting is reset appropriately after a
+	 * closing HTML tag.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_interactive_set_is_unset_on_closing_tag() {
+		$html    = '
+					<div data-wp-interactive=\'{ "namespace": "myPlugin" }\'>
+							<div class="test" data-wp-bind--id="state.id">Text</div>
+					</div>
+					<div data-wp-interactive=\'{ "namespace": "otherPlugin" }\'>
+							<div class="test" data-wp-bind--id="state.id">Text</div>
+					</div>
+			';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'some-id', $p->get_attribute( 'id' ) );
+		$p->next_tag( array( 'class_name' => 'test' ) );
+		$this->assertEquals( 'other-id', $p->get_attribute( 'id' ) );
+
+		$html    = '
+					<div data-wp-interactive=\'{ "namespace": "myPlugin" }\'>
+							<div data-wp-interactive=\'{ "namespace": "otherPlugin" }\'>
+									<div class="test" data-wp-bind--id="state.id">Text</div>
+							</div>
+							<div class="test" data-wp-bind--id="state.id">Text</div>
+					</div>
+			';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'other-id', $p->get_attribute( 'id' ) );
+		$p->next_tag( array( 'class_name' => 'test' ) );
+		$this->assertEquals( 'some-id', $p->get_attribute( 'id' ) );
+	}
+}
diff --git a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-style.php b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-style.php
new file mode 100644
index 0000000000000..ce224787d8753
--- /dev/null
+++ b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-style.php
@@ -0,0 +1,403 @@
+<?php
+/**
+ * Unit tests covering the data_wp_style_processor functionality of the
+ * WP_Interactivity_API class.
+ *
+ * @package WordPress
+ * @subpackage Interactivity API
+ *
+ * @group interactivity-api
+ */
+class Tests_WP_Interactivity_API_WP_Style extends WP_UnitTestCase {
+	/**
+	 * Instance of WP_Interactivity_API.
+	 *
+	 * @var WP_Interactivity_API
+	 */
+	protected $interactivity;
+
+	/**
+	 * Set up.
+	 */
+	public function set_up() {
+		parent::set_up();
+		$this->interactivity = new WP_Interactivity_API();
+		$this->interactivity->state(
+			'myPlugin',
+			array(
+				'green' => 'green',
+				'false' => false,
+			)
+		);
+	}
+
+	/**
+	 * Invokes the private `set_style_property` method of WP_Interactivity_API
+	 * class.
+	 *
+	 * @param string            $style_attribute_value The current style attribute value.
+	 * @param string            $style_property_name   The style property name to set.
+	 * @param string|false|null $style_property_value  The value to set for the style property. With false, null or an
+	 *                                                 empty string, it removes the style property.
+	 * @return string The new style attribute value after the specified property has been added, updated or removed.
+	 */
+	private function set_style_property( $style_attribute_value, $style_property_name, $style_property_value ) {
+		$evaluate = new ReflectionMethod( $this->interactivity, 'set_style_property' );
+		$evaluate->setAccessible( true );
+		return $evaluate->invokeArgs( $this->interactivity, array( $style_attribute_value, $style_property_name, $style_property_value ) );
+	}
+
+	/**
+	 * Tests that `set_style_property` correctly sets style properties.
+	 *
+	 * @covers ::set_style_property
+	 */
+	public function test_set_style_property_sets_properties() {
+		// Adds property on empty style attribute.
+		$result = $this->set_style_property( '', 'color', 'green' );
+		$this->assertEquals( 'color:green;', $result );
+
+		// Changes style property when there is an existing property.
+		$result = $this->set_style_property( 'color:red;', 'color', 'green' );
+		$this->assertEquals( 'color:green;', $result );
+
+		// Adds a new property when the existing one does not match.
+		$result = $this->set_style_property( 'color:red;', 'background', 'blue' );
+		$this->assertEquals( 'color:red;background:blue;', $result );
+
+		// Handles multiple existing properties.
+		$result = $this->set_style_property( 'color:red;margin:5px;', 'color', 'green' );
+		$this->assertEquals( 'margin:5px;color:green;', $result );
+
+		// Adds a new property when multiple existing properties do not match.
+		$result = $this->set_style_property( 'color:red;margin:5px;', 'padding', '10px' );
+		$this->assertEquals( 'color:red;margin:5px;padding:10px;', $result );
+
+		// Removes whitespaces in all properties.
+		$result = $this->set_style_property( ' color : red; margin : 5px; ', 'padding', ' 10px ' );
+		$this->assertEquals( 'color:red;margin:5px;padding:10px;', $result );
+
+		// Updates a property when it's not the first one in the value.
+		$result = $this->set_style_property( 'color:red;margin:5px;', 'margin', '15px' );
+		$this->assertEquals( 'color:red;margin:15px;', $result );
+
+		// Adds missing trailing semicolon.
+		$result = $this->set_style_property( 'color:red;margin:5px', 'padding', '10px' );
+		$this->assertEquals( 'color:red;margin:5px;padding:10px;', $result );
+
+		// Doesn't add double semicolons.
+		$result = $this->set_style_property( 'color:red;margin:5px;', 'padding', '10px;' );
+		$this->assertEquals( 'color:red;margin:5px;padding:10px;', $result );
+
+		// Handles empty properties in the input.
+		$result = $this->set_style_property( 'color:red;;margin:5px;;', 'padding', '10px' );
+		$this->assertEquals( 'color:red;margin:5px;padding:10px;', $result );
+
+		// Moves the modified property to the end.
+		$result = $this->set_style_property( 'border-style: dashed; border: 3px solid red;', 'border-style', 'inset' );
+		$this->assertEquals( 'border:3px solid red;border-style:inset;', $result );
+	}
+
+	/**
+	 * Tests that `set_style_property` works correctly with falsy values, removing
+	 * or ignoring them as appropriate.
+	 *
+	 * @covers ::set_style_property
+	 */
+	public function test_set_style_property_with_falsy_values() {
+		// Removes a property with an empty string.
+		$result = $this->set_style_property( 'color:red;margin:5px;', 'color', '' );
+		$this->assertEquals( 'margin:5px;', $result );
+
+		// Removes a property with null.
+		$result = $this->set_style_property( 'color:red;margin:5px;', 'color', null );
+		$this->assertEquals( 'margin:5px;', $result );
+
+		// Removes a property with false.
+		$result = $this->set_style_property( 'color:red;margin:5px;', 'color', false );
+		$this->assertEquals( 'margin:5px;', $result );
+
+		// Removes a property with 0.
+		$result = $this->set_style_property( 'color:red;margin:5px;', 'color', 0 );
+		$this->assertEquals( 'margin:5px;', $result );
+
+		// It doesn't add a new property with an empty string.
+		$result = $this->set_style_property( 'color:red;', 'padding', '' );
+		$this->assertEquals( 'color:red;', $result );
+
+		// It doesn't add a new property with null.
+		$result = $this->set_style_property( 'color:red;', 'padding', null );
+		$this->assertEquals( 'color:red;', $result );
+
+		// It doesn't add a new property with false.
+		$result = $this->set_style_property( 'color:red;', 'padding', false );
+		$this->assertEquals( 'color:red;', $result );
+
+		// It doesn't add a new property with 0.
+		$result = $this->set_style_property( 'color:red;', 'padding', 0 );
+		$this->assertEquals( 'color:red;', $result );
+	}
+
+	/**
+	 * Invokes the `process_directives` method of WP_Interactivity_API class.
+	 *
+	 * @param string $html The HTML that needs to be processed.
+	 * @return array An array containing an instance of the WP_HTML_Tag_Processor and the processed HTML.
+	 */
+	private function process_directives( $html ) {
+		$new_html = $this->interactivity->process_directives( $html );
+		$p        = new WP_HTML_Tag_Processor( $new_html );
+		$p->next_tag();
+		return array( $p, $new_html );
+	}
+
+	/**
+	 * Tests that the `data-wp-style` directive sets a style attribute with
+	 * correct property and value.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_style_sets_style_attribute() {
+		$html    = '<div data-wp-style--color="myPlugin::state.green">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'color:green;', $p->get_attribute( 'style' ) );
+	}
+
+	/**
+	 * Tests that the `data-wp-style` directive applies multiple style properties
+	 * correctly.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_style_sets_multiple_style_properties() {
+		$html    = '
+			<div
+				data-wp-style--color="myPlugin::state.green"
+				data-wp-style--background="myPlugin::state.green"
+			>Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'color:green;background:green;', $p->get_attribute( 'style' ) );
+	}
+
+	/**
+	 * Tests that the `data-wp-style` directive correctly handles different style
+	 * property values.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_style_sets_multiple_style_properties_with_different_values() {
+		$html    = '
+			<div
+				data-wp-style--color="myPlugin::state.green"
+				data-wp-style--background="myPlugin::state.false"
+			>Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'color:green;', $p->get_attribute( 'style' ) );
+
+		$html    = '
+			<div
+				style="background:red;"
+				data-wp-style--color="myPlugin::state.green"
+				data-wp-style--background="myPlugin::state.false"
+			>Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'color:green;', $p->get_attribute( 'style' ) );
+	}
+
+	/**
+	 * Tests that the `data-wp-style` directive sets a new style property when
+	 * another already exists.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_style_sets_style_property_when_style_attribute_exists() {
+		$html    = '<div style="padding:10px;" data-wp-style--color="myPlugin::state.green">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'padding:10px;color:green;', $p->get_attribute( 'style' ) );
+	}
+
+	/**
+	 * Tests that the `data-wp-style` directive overwrites an existing style
+	 * property with a new value.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_style_overwrites_style_property_when_style_property_exists() {
+		$html    = '<div style="color:red;" data-wp-style--color="myPlugin::state.green">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'color:green;', $p->get_attribute( 'style' ) );
+	}
+
+	/**
+	 * Tests that the `data-wp-style` directive doesn't add a style property when
+	 * the directive value is false.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_style_doesnt_add_style_attribute_on_false() {
+		$html    = '<div data-wp-style--color="myPlugin::state.false">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertNull( $p->get_attribute( 'style' ) );
+	}
+
+	/**
+	 * Tests that the `data-wp-style` directive doesn't modify existing style
+	 * properties when directive value is false.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_style_doesnt_add_style_property_on_false() {
+		$html    = '<div style="padding:10px;" data-wp-style--color="myPlugin::state.false">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'padding:10px;', $p->get_attribute( 'style' ) );
+	}
+
+	/**
+	 * Tests that the `data-wp-style` directive keeps an existing style property
+	 * with a matching value.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_style_keeps_style_property_when_style_property_exists() {
+		$html    = '<div style="color:green;" data-wp-style--color="myPlugin::state.green">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'color:green;', $p->get_attribute( 'style' ) );
+	}
+
+	/**
+	 * Tests that the `data-wp-style` directive maintains style properties even
+	 * when they aren't the only ones present.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_style_keeps_style_property_when_style_property_exists_and_is_not_the_only_one() {
+		$html    = '<div style="padding:10px;color:green;" data-wp-style--color="myPlugin::state.green">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'padding:10px;color:green;', $p->get_attribute( 'style' ) );
+	}
+
+	/**
+	 * Tests that the `data-wp-style` directive removes the style attribute when
+	 * it contains only one property which is being removed.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_style_removes_style_attribute_when_style_property_exists_and_is_the_only_one() {
+		$html    = '<div style="color:green;" data-wp-style--color="myPlugin::state.false">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertNull( $p->get_attribute( 'style' ) );
+	}
+
+	/**
+	 * Tests that the `data-wp-style` directive removes a style property when it's
+	 * not the only one present and the directive value is false.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_style_removes_style_property_when_style_property_exists_and_is_not_the_only_one() {
+		$html    = '<div style="padding:10px;color:green;" data-wp-style--color="myPlugin::state.false">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'padding:10px;', $p->get_attribute( 'style' ) );
+	}
+
+	/**
+	 * Tests that the `data-wp-style` directive does not remove an empty style
+	 * attribute.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_style_doesnt_remove_empty_style_attribute() {
+		$html    = '<div style data-wp-style--color="myPlugin::state.false">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertTrue( $p->get_attribute( 'style' ) );
+	}
+
+	/**
+	 * Tests that the `data-wp-style` directive does not change the style
+	 * attribute when the directive suffix is empty.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_style_doesnt_change_style_attribute_with_empty_directive_suffix() {
+		$html    = '<div style="padding:10px;" data-wp-style="myPlugin::state.green">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'padding:10px;', $p->get_attribute( 'style' ) );
+	}
+
+	/**
+	 * Tests that the `data-wp-style` directive does not change the style
+	 * attribute when the value of the directive is empty.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_style_doesnt_change_style_attribute_with_empty_value() {
+		$html    = '<div style="padding:10px" data-wp-style--color="">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'padding:10px;', $p->get_attribute( 'style' ) );
+	}
+
+	/**
+	 * Tests that the `data-wp-style` directive doesn't apply changes if no value
+	 * is provided for the style property.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_style_doesnt_change_style_attribute_without_value() {
+		$html    = '<div style="padding: 10px;" data-wp-style--color>Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'padding:10px;', $p->get_attribute( 'style' ) );
+	}
+
+	/**
+	 * Tests that the `data-wp-style` directive functions correctly with multiple
+	 * identical directives.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_style_works_with_multiple_directives() {
+		$html    = '<div data-wp-style--color="myPlugin::state.green" data-wp-style--color="myPlugin::state.green">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'color:green;', $p->get_attribute( 'style' ) );
+	}
+
+	/**
+	 * Tests that the `data-wp-style` directive doesn't apply any changes when the
+	 * state value is true.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_style_doesnt_do_anything_on_true_values() {
+		$this->interactivity->state( 'myPlugin', array( 'true' => true ) );
+		$html    = '<div data-wp-style--color="myPlugin::state.text">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertNull( $p->get_attribute( 'style' ) );
+	}
+
+	/**
+	 * Tests that the `data-wp-style` directive doesn't add a style property for
+	 * various falsy values in the state.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_style_doesnt_add_style_property_on_falsy_values() {
+		$this->interactivity->state( 'myPlugin', array( 'text' => '' ) );
+		$html    = '<div data-wp-style--color="myPlugin::state.text">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertNull( $p->get_attribute( 'style' ) );
+
+		$this->interactivity->state( 'myPlugin', array( 'array' => array() ) );
+		$html    = '<div data-wp-style--color="myPlugin::state.array">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertNull( $p->get_attribute( 'style' ) );
+
+		$this->interactivity->state( 'myPlugin', array( 'number' => 0 ) );
+		$html    = '<div data-wp-style--color="myPlugin::state.number">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertNull( $p->get_attribute( 'style' ) );
+
+		$this->interactivity->state( 'myPlugin', array( 'null' => null ) );
+		$html    = '<div data-wp-style--color="myPlugin::state.null">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertNull( $p->get_attribute( 'style' ) );
+	}
+}
diff --git a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-text.php b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-text.php
new file mode 100644
index 0000000000000..f5b570a197a29
--- /dev/null
+++ b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-text.php
@@ -0,0 +1,123 @@
+<?php
+/**
+ * Unit tests covering the data_wp_text_processor functionality of the
+ * WP_Interactivity_API class.
+ *
+ * @package WordPress
+ * @subpackage Interactivity API
+ *
+ * @group interactivity-api
+ */
+class Tests_WP_Interactivity_API_WP_Text extends WP_UnitTestCase {
+	/**
+	 * Instance of WP_Interactivity_API.
+	 *
+	 * @var WP_Interactivity_API
+	 */
+	protected $interactivity;
+
+	/**
+	 * Set up.
+	 */
+	public function set_up() {
+		parent::set_up();
+		$this->interactivity = new WP_Interactivity_API();
+		$this->interactivity->state( 'myPlugin', array( 'text' => 'Updated' ) );
+	}
+
+	/**
+	 * Tests that the `data-wp-text` directive sets inner text content.
+	 */
+	public function test_wp_text_sets_inner_content() {
+		$html     = '<div data-wp-text="myPlugin::state.text">Text</div>';
+		$new_html = $this->interactivity->process_directives( $html );
+		$this->assertEquals( '<div data-wp-text="myPlugin::state.text">Updated</div>', $new_html );
+	}
+
+	/**
+	 * Tests that the `data-wp-text` directive works with numerical values.
+	 */
+	public function test_wp_text_sets_inner_content_numbers() {
+		$this->interactivity->state( 'myPlugin', array( 'number' => 100 ) );
+		$html     = '<div data-wp-text="myPlugin::state.number">Text</div>';
+		$new_html = $this->interactivity->process_directives( $html );
+		$this->assertEquals( '<div data-wp-text="myPlugin::state.number">100</div>', $new_html );
+	}
+
+	/**
+	 * Tests that the `data-wp-text` directive removes inner text content when the
+	 * state is not a string or number.
+	 */
+	public function test_wp_text_removes_inner_content_on_types_that_are_not_strings_or_numbers() {
+		$this->interactivity->state(
+			'myPlugin',
+			array(
+				'true'  => true,
+				'false' => false,
+				'null'  => null,
+				'array' => array(),
+				'func'  => function () {},
+			)
+		);
+		$html     = '<div data-wp-text="myPlugin::state.true">Text</div>';
+		$new_html = $this->interactivity->process_directives( $html );
+		$this->assertEquals( '<div data-wp-text="myPlugin::state.true"></div>', $new_html );
+
+		$html     = '<div data-wp-text="myPlugin::state.false">Text</div>';
+		$new_html = $this->interactivity->process_directives( $html );
+		$this->assertEquals( '<div data-wp-text="myPlugin::state.false"></div>', $new_html );
+
+		$html     = '<div data-wp-text="myPlugin::state.null">Text</div>';
+		$new_html = $this->interactivity->process_directives( $html );
+		$this->assertEquals( '<div data-wp-text="myPlugin::state.null"></div>', $new_html );
+
+		$html     = '<div data-wp-text="myPlugin::state.array">Text</div>';
+		$new_html = $this->interactivity->process_directives( $html );
+		$this->assertEquals( '<div data-wp-text="myPlugin::state.array"></div>', $new_html );
+
+		$html     = '<div data-wp-text="myPlugin::state.func">Text</div>';
+		$new_html = $this->interactivity->process_directives( $html );
+		$this->assertEquals( '<div data-wp-text="myPlugin::state.func"></div>', $new_html );
+	}
+
+	/**
+	 * Tests that the `data-wp-text` directive overwrites entire inner content,
+	 * including nested tags.
+	 */
+	public function test_wp_text_sets_inner_content_with_nested_tags() {
+		$html     = '<div data-wp-text="myPlugin::state.text"><div><div>Text</div><div>Another text</div></div></div>';
+		$new_html = $this->interactivity->process_directives( $html );
+		$this->assertEquals( '<div data-wp-text="myPlugin::state.text">Updated</div>', $new_html );
+	}
+
+	/**
+	 * Tests that the `data-wp-text` directive works even with unbalanced tags
+	 * when they are different tags (div -> unbalanced span).
+	 */
+	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>';
+		$new_html = $this->interactivity->process_directives( $html );
+		$this->assertEquals( '<div data-wp-text="myPlugin::state.text">Updated</div>', $new_html );
+	}
+
+	/**
+	 * Tests that the `data-wp-text` fails to overwrite inner content if there are
+	 * unbalanced when they are the same tags (div -> unbalanced div).
+	 */
+	public function test_wp_text_fails_with_unbalanced_and_same_tags_inside_content() {
+		$html     = '<div data-wp-text="myPlugin::state.text">Text<div></div>';
+		$new_html = $this->interactivity->process_directives( $html );
+		$this->assertEquals( '<div data-wp-text="myPlugin::state.text">Text<div></div>', $new_html );
+	}
+
+	/**
+	 * Tests that the `data-wp-text` directive cannot set inner HTML content and
+	 * it will be encoded as text.
+	 */
+	public function test_wp_text_cant_set_inner_html_in_the_content() {
+		$this->interactivity->state( 'myPlugin', array( 'text' => '<span>Updated</span>' ) );
+		$html     = '<div data-wp-text="myPlugin::state.text">Text</div>';
+		$new_html = $this->interactivity->process_directives( $html );
+		$this->assertEquals( '<div data-wp-text="myPlugin::state.text">&lt;span&gt;Updated&lt;/span&gt;</div>', $new_html );
+	}
+}
diff --git a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI.php b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI.php
new file mode 100644
index 0000000000000..719f9592563c3
--- /dev/null
+++ b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI.php
@@ -0,0 +1,570 @@
+<?php
+/**
+ * Unit tests covering WP_Interactivity_API functionality.
+ *
+ * @package WordPress
+ * @subpackage Interactivity API
+ *
+ * @group interactivity-api
+ *
+ * @coversDefaultClass WP_Interactivity_API
+ */
+class Tests_WP_Interactivity_API extends WP_UnitTestCase {
+	/**
+	 * Instance of WP_Interactivity_API.
+	 *
+	 * @var WP_Interactivity_API
+	 */
+	protected $interactivity;
+
+	/**
+	 * Set up.
+	 */
+	public function set_up() {
+		parent::set_up();
+		$this->interactivity = new WP_Interactivity_API();
+	}
+
+	/**
+	 * Tests that the state and config methods return an empty array at the
+	 * beginning.
+	 *
+	 * @covers ::state
+	 * @covers ::config
+	 */
+	public function test_state_and_config_should_be_empty() {
+		$this->assertEquals( array(), $this->interactivity->state( 'myPlugin' ) );
+		$this->assertEquals( array(), $this->interactivity->config( 'myPlugin' ) );
+	}
+
+	/**
+	 * Tests that the state and config methods can change the state and
+	 * configuration.
+	 *
+	 * @covers ::state
+	 * @covers ::config
+	 */
+	public function test_state_and_config_can_be_changed() {
+		$state  = array(
+			'a'      => 1,
+			'b'      => 2,
+			'nested' => array( 'c' => 3 ),
+		);
+		$result = $this->interactivity->state( 'myPlugin', $state );
+		$this->assertEquals( $state, $result );
+		$result = $this->interactivity->config( 'myPlugin', $state );
+		$this->assertEquals( $state, $result );
+	}
+
+	/**
+	 * Tests that different initial states and configurations can be merged.
+	 *
+	 * @covers ::state
+	 * @covers ::config
+	 */
+	public function test_state_and_config_can_be_merged() {
+		$this->interactivity->state( 'myPlugin', array( 'a' => 1 ) );
+		$this->interactivity->state( 'myPlugin', array( 'b' => 2 ) );
+		$this->interactivity->state( 'otherPlugin', array( 'c' => 3 ) );
+		$this->assertEquals(
+			array(
+				'a' => 1,
+				'b' => 2,
+			),
+			$this->interactivity->state( 'myPlugin' )
+		);
+		$this->assertEquals(
+			array( 'c' => 3 ),
+			$this->interactivity->state( 'otherPlugin' )
+		);
+
+		$this->interactivity->config( 'myPlugin', array( 'a' => 1 ) );
+		$this->interactivity->config( 'myPlugin', array( 'b' => 2 ) );
+		$this->interactivity->config( 'otherPlugin', array( 'c' => 3 ) );
+		$this->assertEquals(
+			array(
+				'a' => 1,
+				'b' => 2,
+			),
+			$this->interactivity->config( 'myPlugin' )
+		);
+		$this->assertEquals(
+			array( 'c' => 3 ),
+			$this->interactivity->config( 'otherPlugin' )
+		);  }
+
+	/**
+	 * Tests that existing keys in the initial state and configuration can be
+	 * overwritten.
+	 *
+	 * @covers ::state
+	 * @covers ::config
+	 */
+	public function test_state_and_config_existing_props_can_be_overwritten() {
+		$this->interactivity->state( 'myPlugin', array( 'a' => 1 ) );
+		$this->interactivity->state( 'myPlugin', array( 'a' => 2 ) );
+		$this->assertEquals(
+			array( 'a' => 2 ),
+			$this->interactivity->state( 'myPlugin' )
+		);
+
+		$this->interactivity->config( 'myPlugin', array( 'a' => 1 ) );
+		$this->interactivity->config( 'myPlugin', array( 'a' => 2 ) );
+		$this->assertEquals(
+			array( 'a' => 2 ),
+			$this->interactivity->config( 'myPlugin' )
+		);
+	}
+
+	/**
+	 * Tests that existing indexed arrays in the initial state and configuration
+	 * are replaced, not merged.
+	 *
+	 * @covers ::state
+	 * @covers ::config
+	 */
+	public function test_state_and_config_existing_indexed_arrays_are_replaced() {
+		$this->interactivity->state( 'myPlugin', array( 'a' => array( 1, 2 ) ) );
+		$this->interactivity->state( 'myPlugin', array( 'a' => array( 3, 4 ) ) );
+		$this->assertEquals(
+			array( 'a' => array( 3, 4 ) ),
+			$this->interactivity->state( 'myPlugin' )
+		);
+
+		$this->interactivity->config( 'myPlugin', array( 'a' => array( 1, 2 ) ) );
+		$this->interactivity->config( 'myPlugin', array( 'a' => array( 3, 4 ) ) );
+		$this->assertEquals(
+			array( 'a' => array( 3, 4 ) ),
+			$this->interactivity->config( 'myPlugin' )
+		);
+	}
+
+	/**
+	 * Invokes the private `print_client_interactivity` method of
+	 * WP_Interactivity_API class.
+	 *
+	 * @return array|null The content of the JSON object printed on the client-side or null if nothings was printed.
+	 */
+	private function print_client_interactivity_data() {
+		$interactivity_data_markup = get_echo( array( $this->interactivity, 'print_client_interactivity_data' ) );
+		preg_match( '/<script type="application\/json" id="wp-interactivity-data">.*?(\{.*\}).*?<\/script>/s', $interactivity_data_markup, $interactivity_data_string );
+		return isset( $interactivity_data_string[1] ) ? json_decode( $interactivity_data_string[1], true ) : null;
+	}
+
+	/**
+	 * Tests that the initial state and config are correctly printed on the
+	 * client-side.
+	 *
+	 * @covers ::print_client_interactivity_data
+	 */
+	public function test_state_and_config_is_correctly_printed() {
+		$this->interactivity->state( 'myPlugin', array( 'a' => 1 ) );
+		$this->interactivity->state( 'otherPlugin', array( 'b' => 2 ) );
+		$this->interactivity->config( 'myPlugin', array( 'a' => 1 ) );
+		$this->interactivity->config( 'otherPlugin', array( 'b' => 2 ) );
+
+		$result = $this->print_client_interactivity_data();
+
+		$data = array(
+			'myPlugin'    => array( 'a' => 1 ),
+			'otherPlugin' => array( 'b' => 2 ),
+		);
+
+		$this->assertEquals(
+			array(
+				'state'  => $data,
+				'config' => $data,
+			),
+			$result
+		);
+	}
+
+	/**
+	 * Tests that the wp-interactivity-data script is not printed if both state
+	 * and config are empty.
+	 *
+	 * @covers ::print_client_interactivity_data
+	 */
+	public function test_state_and_config_dont_print_when_empty() {
+		$result = $this->print_client_interactivity_data();
+		$this->assertNull( $result );
+	}
+
+	/**
+	 * Tests that the config is not printed if it's empty.
+	 *
+	 * @covers ::print_client_interactivity_data
+	 */
+	public function test_config_not_printed_when_empty() {
+		$this->interactivity->state( 'myPlugin', array( 'a' => 1 ) );
+		$result = $this->print_client_interactivity_data();
+		$this->assertEquals( array( 'state' => array( 'myPlugin' => array( 'a' => 1 ) ) ), $result );
+	}
+
+	/**
+	 * Tests that the state is not printed if it's empty.
+	 *
+	 * @covers ::print_client_interactivity_data
+	 */
+	public function test_state_not_printed_when_empty() {
+		$this->interactivity->config( 'myPlugin', array( 'a' => 1 ) );
+		$result = $this->print_client_interactivity_data();
+		$this->assertEquals( array( 'config' => array( 'myPlugin' => array( 'a' => 1 ) ) ), $result );
+	}
+
+
+
+	/**
+	 * Tests that special characters in the initial state and configuration are
+	 * properly escaped.
+	 *
+	 * @covers ::print_client_interactivity_data
+	 */
+	public function test_state_and_config_escape_special_characters() {
+		$this->interactivity->state( 'myPlugin', array( 'amps' => 'http://site.test/?foo=1&baz=2' ) );
+		$this->interactivity->config( 'myPlugin', array( 'tags' => 'Tags: <!-- <script>' ) );
+
+		$interactivity_data_markup = get_echo( array( $this->interactivity, 'print_client_interactivity_data' ) );
+		preg_match( '/<script type="application\/json" id="wp-interactivity-data">.*?(\{.*\}).*?<\/script>/s', $interactivity_data_markup, $interactivity_data_string );
+
+		$this->assertEquals(
+			'{"config":{"myPlugin":{"tags":"Tags: \u003C!-- \u003Cscript\u003E"}},"state":{"myPlugin":{"amps":"http:\/\/site.test\/?foo=1\u0026baz=2"}}}',
+			$interactivity_data_string[1]
+		);
+	}
+
+	/**
+	 * Tests extracting directive values from different string formats.
+	 *
+	 * @covers ::extract_directive_value
+	 */
+	public function test_extract_directive_value() {
+		$extract_directive_value = new ReflectionMethod( $this->interactivity, 'extract_directive_value' );
+		$extract_directive_value->setAccessible( true );
+
+		$result = $extract_directive_value->invoke( $this->interactivity, 'state.foo', 'myPlugin' );
+		$this->assertEquals( array( 'myPlugin', 'state.foo' ), $result );
+
+		$result = $extract_directive_value->invoke( $this->interactivity, 'otherPlugin::state.foo', 'myPlugin' );
+		$this->assertEquals( array( 'otherPlugin', 'state.foo' ), $result );
+
+		$result = $extract_directive_value->invoke( $this->interactivity, '{ "isOpen": false }', 'myPlugin' );
+		$this->assertEquals( array( 'myPlugin', array( 'isOpen' => false ) ), $result );
+
+		$result = $extract_directive_value->invoke( $this->interactivity, 'otherPlugin::{ "isOpen": false }', 'myPlugin' );
+		$this->assertEquals( array( 'otherPlugin', array( 'isOpen' => false ) ), $result );
+
+		$result = $extract_directive_value->invoke( $this->interactivity, 'true', 'myPlugin' );
+		$this->assertEquals( array( 'myPlugin', true ), $result );
+
+		$result = $extract_directive_value->invoke( $this->interactivity, 'false', 'myPlugin' );
+		$this->assertEquals( array( 'myPlugin', false ), $result );
+
+		$result = $extract_directive_value->invoke( $this->interactivity, 'null', 'myPlugin' );
+		$this->assertEquals( array( 'myPlugin', null ), $result );
+
+		$result = $extract_directive_value->invoke( $this->interactivity, '100', 'myPlugin' );
+		$this->assertEquals( array( 'myPlugin', 100 ), $result );
+
+		$result = $extract_directive_value->invoke( $this->interactivity, '1.2', 'myPlugin' );
+		$this->assertEquals( array( 'myPlugin', 1.2 ), $result );
+
+		$result = $extract_directive_value->invoke( $this->interactivity, '1.2.3', 'myPlugin' );
+		$this->assertEquals( array( 'myPlugin', '1.2.3' ), $result );
+
+		$result = $extract_directive_value->invoke( $this->interactivity, 'otherPlugin::true', 'myPlugin' );
+		$this->assertEquals( array( 'otherPlugin', true ), $result );
+
+		$result = $extract_directive_value->invoke( $this->interactivity, 'otherPlugin::false', 'myPlugin' );
+		$this->assertEquals( array( 'otherPlugin', false ), $result );
+
+		$result = $extract_directive_value->invoke( $this->interactivity, 'otherPlugin::null', 'myPlugin' );
+		$this->assertEquals( array( 'otherPlugin', null ), $result );
+
+		$result = $extract_directive_value->invoke( $this->interactivity, 'otherPlugin::100', 'myPlugin' );
+		$this->assertEquals( array( 'otherPlugin', 100 ), $result );
+
+		$result = $extract_directive_value->invoke( $this->interactivity, 'otherPlugin::1.2', 'myPlugin' );
+		$this->assertEquals( array( 'otherPlugin', 1.2 ), $result );
+
+		$result = $extract_directive_value->invoke( $this->interactivity, 'otherPlugin::1.2.3', 'myPlugin' );
+		$this->assertEquals( array( 'otherPlugin', '1.2.3' ), $result );
+
+		$result = $extract_directive_value->invoke( $this->interactivity, 'otherPlugin::[{"o":4}, null, 3e6]', 'myPlugin' );
+		$this->assertEquals( array( 'otherPlugin', array( array( 'o' => 4 ), null, 3000000.0 ) ), $result );
+	}
+
+	/**
+	 * Tests extracting directive values with empty or invalid input.
+	 *
+	 * @covers ::extract_directive_value
+	 */
+	public function test_extract_directive_value_empty_values() {
+		$extract_directive_value = new ReflectionMethod( $this->interactivity, 'extract_directive_value' );
+		$extract_directive_value->setAccessible( true );
+
+		$result = $extract_directive_value->invoke( $this->interactivity, '', 'myPlugin' );
+		$this->assertEquals( array( 'myPlugin', null ), $result );
+
+		// This is a boolean attribute.
+		$result = $extract_directive_value->invoke( $this->interactivity, true, 'myPlugin' );
+		$this->assertEquals( array( 'myPlugin', null ), $result );
+
+		$result = $extract_directive_value->invoke( $this->interactivity, false, 'myPlugin' );
+		$this->assertEquals( array( 'myPlugin', null ), $result );
+
+		$result = $extract_directive_value->invoke( $this->interactivity, null, 'myPlugin' );
+		$this->assertEquals( array( 'myPlugin', null ), $result );
+
+		// A string ending in `::` without any extra characters is not considered a
+		// namespace.
+		$result = $extract_directive_value->invoke( $this->interactivity, 'myPlugin::', 'myPlugin' );
+		$this->assertEquals( array( 'myPlugin', 'myPlugin::' ), $result );
+
+		// A namespace with invalid characters is not considered a valid namespace.
+		$result = $extract_directive_value->invoke( $this->interactivity, '$myPlugin::state.foo', 'myPlugin' );
+		$this->assertEquals( array( 'myPlugin', '$myPlugin::state.foo' ), $result );
+	}
+
+	/**
+	 * Tests extracting directive values from invalid JSON strings.
+	 *
+	 * @covers ::extract_directive_value
+	 */
+	public function test_extract_directive_value_invalid_json() {
+		$extract_directive_value = new ReflectionMethod( $this->interactivity, 'extract_directive_value' );
+		$extract_directive_value->setAccessible( true );
+
+		// Invalid JSON due to missing quotes. Returns the original value.
+		$result = $extract_directive_value->invoke( $this->interactivity, '{ isOpen: false }', 'myPlugin' );
+		$this->assertEquals( array( 'myPlugin', '{ isOpen: false }' ), $result );
+
+		// Null string. Returns null.
+		$result = $extract_directive_value->invoke( $this->interactivity, 'null', 'myPlugin' );
+		$this->assertEquals( array( 'myPlugin', null ), $result );
+	}
+
+	/**
+	 * Tests the ability to extract prefix and suffix from a directive attribute
+	 * name.
+	 *
+	 * @covers ::extract_prefix_and_suffix
+	 */
+	public function test_extract_prefix_and_suffix() {
+		$extract_prefix_and_suffix = new ReflectionMethod( $this->interactivity, 'extract_prefix_and_suffix' );
+		$extract_prefix_and_suffix->setAccessible( true );
+
+		$result = $extract_prefix_and_suffix->invoke( $this->interactivity, 'data-wp-interactive' );
+		$this->assertEquals( array( 'data-wp-interactive' ), $result );
+
+		$result = $extract_prefix_and_suffix->invoke( $this->interactivity, 'data-wp-bind--src' );
+		$this->assertEquals( array( 'data-wp-bind', 'src' ), $result );
+
+		$result = $extract_prefix_and_suffix->invoke( $this->interactivity, 'data-wp-foo--and--bar' );
+		$this->assertEquals( array( 'data-wp-foo', 'and--bar' ), $result );
+	}
+
+	/**
+	 * Tests that the `process_directives` method doesn't change the HTML if it
+	 * doesn't contain directives.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_process_directives_do_nothing_without_directives() {
+		$html           = '<div>Inner content here</div>';
+		$processed_html = $this->interactivity->process_directives( $html );
+		$this->assertEquals( $html, $processed_html );
+
+		$html           = '<div><span>Content</span><strong>More Content</strong></div>';
+		$processed_html = $this->interactivity->process_directives( $html );
+		$this->assertEquals( $html, $processed_html );
+	}
+
+	/**
+	 * Tests that the `process_directives` method changes the HTML if it contains
+	 * directives.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_process_directives_changes_html_with_balanced_tags() {
+		$this->interactivity->state( 'myPlugin', array( 'id' => 'some-id' ) );
+		$html           = '<div data-wp-bind--id="myPlugin::state.id">Inner content</div>';
+		$processed_html = $this->interactivity->process_directives( $html );
+		$p              = new WP_HTML_Tag_Processor( $processed_html );
+		$p->next_tag();
+		$this->assertEquals( 'some-id', $p->get_attribute( 'id' ) );
+	}
+
+	/**
+	 * Tests how `process_directives` handles HTML with unknown directives.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_process_directives_doesnt_fail_with_unknown_directives() {
+		$html           = '<div data-wp-uknown="">Text</div>';
+		$processed_html = $this->interactivity->process_directives( $html );
+		$this->assertEquals( $html, $processed_html );
+	}
+
+	/**
+	 * Tests that directives are processed in the correct order.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_process_directives_process_the_directives_in_the_correct_order() {
+		$html           = '
+			<div
+				data-wp-interactive=\'{ "namespace": "test" }\'
+				data-wp-context=\'{ "isClass": true, "id": "some-id", "text": "Updated", "display": "none" }\'
+				data-wp-bind--id="context.id"
+				data-wp-class--some-class="context.isClass"
+				data-wp-style--display="context.display"
+				data-wp-text="context.text"
+			>Text</div>';
+		$processed_html = $this->interactivity->process_directives( $html );
+		$p              = new WP_HTML_Tag_Processor( $processed_html );
+		$p->next_tag();
+		$this->assertEquals( 'some-id', $p->get_attribute( 'id' ) );
+		$this->assertEquals( 'some-class', $p->get_attribute( 'class' ) );
+		$this->assertEquals( 'display:none;', $p->get_attribute( 'style' ) );
+		$this->assertStringContainsString( 'Updated', $p->get_updated_html() );
+		$this->assertStringNotContainsString( 'Text', $p->get_updated_html() );
+	}
+
+	/**
+	 * Tests that the `process_directives` returns the same HTML if it contains
+	 * unbalanced tags.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_process_directives_doesnt_change_html_if_contains_unbalanced_tags() {
+		$this->interactivity->state( 'myPlugin', array( 'id' => 'some-id' ) );
+
+		$html_samples = array(
+			'<div data-wp-bind--id="myPlugin::state.id">Inner content</div></div>',
+			'<div data-wp-bind--id="myPlugin::state.id">Inner content</div><div>',
+			'<div><div data-wp-bind--id="myPlugin::state.id">Inner content</div>',
+			'</div><div data-wp-bind--id="myPlugin::state.id">Inner content</div>',
+			'<div data-wp-bind--id="myPlugin::state.id">Inner<div>content</div>',
+			'<div data-wp-bind--id="myPlugin::state.id">Inner</div>content</div>',
+			'<div data-wp-bind--id="myPlugin::state.id"><span>Inner content</div>',
+			'<div data-wp-bind--id="myPlugin::state.id">Inner content</div></span>',
+			'<div data-wp-bind--id="myPlugin::state.id"><span>Inner content</div></span>',
+			'<div data-wp-bind--id="myPlugin::state.id">Inner conntent</ ></div>',
+		);
+
+		foreach ( $html_samples as $html ) {
+			$processed_html = $this->interactivity->process_directives( $html );
+			$p              = new WP_HTML_Tag_Processor( $processed_html );
+			$p->next_tag();
+			$this->assertNull( $p->get_attribute( 'id' ) );
+		}
+	}
+
+	/**
+	 * Invokes the private `evaluate` method of WP_Interactivity_API class.
+	 *
+	 * @param string $directive_value The directive attribute value to evaluate.
+	 * @return mixed The result of the evaluate method.
+	 */
+	private function evaluate( $directive_value ) {
+		$generate_state = function ( $name ) {
+			return array(
+				'key'    => $name,
+				'nested' => array( 'key' => $name . '-nested' ),
+			);
+		};
+		$this->interactivity->state( 'myPlugin', $generate_state( 'myPlugin-state' ) );
+		$this->interactivity->state( 'otherPlugin', $generate_state( 'otherPlugin-state' ) );
+		$context  = array(
+			'myPlugin'    => $generate_state( 'myPlugin-context' ),
+			'otherPlugin' => $generate_state( 'otherPlugin-context' ),
+		);
+		$evaluate = new ReflectionMethod( $this->interactivity, 'evaluate' );
+		$evaluate->setAccessible( true );
+		return $evaluate->invokeArgs( $this->interactivity, array( $directive_value, 'myPlugin', $context ) );
+	}
+
+	/**
+	 * Tests that the `evaluate` method operates correctly for valid expressions.
+	 *
+	 * @covers ::evaluate
+	 */
+	public function test_evaluate_value() {
+		$result = $this->evaluate( 'state.key' );
+		$this->assertEquals( 'myPlugin-state', $result );
+
+		$result = $this->evaluate( 'context.key' );
+		$this->assertEquals( 'myPlugin-context', $result );
+
+		$result = $this->evaluate( 'otherPlugin::state.key' );
+		$this->assertEquals( 'otherPlugin-state', $result );
+
+		$result = $this->evaluate( 'otherPlugin::context.key' );
+		$this->assertEquals( 'otherPlugin-context', $result );
+	}
+
+	/**
+	 * Tests that the `evaluate` method operates correctly when used with negation
+	 * (!).
+	 *
+	 * @covers ::evaluate
+	 */
+	public function test_evaluate_value_negation() {
+		$result = $this->evaluate( '!state.key' );
+		$this->assertFalse( $result );
+
+		$result = $this->evaluate( '!context.key' );
+		$this->assertFalse( $result );
+
+		$result = $this->evaluate( 'otherPlugin::!state.key' );
+		$this->assertFalse( $result );
+
+		$result = $this->evaluate( 'otherPlugin::!context.key' );
+		$this->assertFalse( $result );
+	}
+
+	/**
+	 * Tests the `evaluate` method with non-existent paths.
+	 *
+	 * @covers ::evaluate
+	 */
+	public function test_evaluate_non_existent_path() {
+		$result = $this->evaluate( 'state.nonExistentKey' );
+		$this->assertNull( $result );
+
+		$result = $this->evaluate( 'context.nonExistentKey' );
+		$this->assertNull( $result );
+
+		$result = $this->evaluate( 'otherPlugin::state.nonExistentKey' );
+		$this->assertNull( $result );
+
+		$result = $this->evaluate( 'otherPlugin::context.nonExistentKey' );
+		$this->assertNull( $result );
+
+		$result = $this->evaluate( ' state.key' ); // Extra space.
+		$this->assertNull( $result );
+
+		$result = $this->evaluate( 'otherPlugin:: state.key' ); // Extra space.
+		$this->assertNull( $result );
+	}
+
+	/**
+	 * Tests the `evaluate` method for retrieving nested values.
+	 *
+	 * @covers ::evaluate
+	 */
+	public function test_evaluate_nested_value() {
+		$result = $this->evaluate( 'state.nested.key' );
+		$this->assertEquals( 'myPlugin-state-nested', $result );
+
+		$result = $this->evaluate( 'context.nested.key' );
+		$this->assertEquals( 'myPlugin-context-nested', $result );
+
+		$result = $this->evaluate( 'otherPlugin::state.nested.key' );
+		$this->assertEquals( 'otherPlugin-state-nested', $result );
+
+		$result = $this->evaluate( 'otherPlugin::context.nested.key' );
+		$this->assertEquals( 'otherPlugin-context-nested', $result );
+	}
+}
diff --git a/tests/phpunit/tests/interactivity-api/wpInteractivityAPIDirectivesProcessor.php b/tests/phpunit/tests/interactivity-api/wpInteractivityAPIDirectivesProcessor.php
new file mode 100644
index 0000000000000..aa1ee999fd58f
--- /dev/null
+++ b/tests/phpunit/tests/interactivity-api/wpInteractivityAPIDirectivesProcessor.php
@@ -0,0 +1,369 @@
+<?php
+/**
+ * Unit tests covering WP_Interactivity_API_Directives_Processor functionality.
+ *
+ * @package WordPress
+ * @subpackage Interactivity API
+ *
+ * @group interactivity-api
+ *
+ * @coversDefaultClass WP_Interactivity_API_Directives_Processor
+ */
+class Tests_WP_Interactivity_API_Directives_Processor extends WP_UnitTestCase {
+	/**
+	 * Tests the `get_content_between_balanced_tags` method on standard tags.
+	 *
+	 * @covers ::get_content_between_balanced_tags
+	 */
+	public function test_get_content_between_balanced_tags_standard_tags() {
+		$content = '<div>Text</div>';
+		$p       = new WP_Interactivity_API_Directives_Processor( $content );
+		$p->next_tag();
+		$this->assertEquals( 'Text', $p->get_content_between_balanced_tags() );
+
+		$content = '<div>Text</div><div>More text</div>';
+		$p       = new WP_Interactivity_API_Directives_Processor( $content );
+		$p->next_tag();
+		$this->assertEquals( 'Text', $p->get_content_between_balanced_tags() );
+		$p->next_tag();
+		$this->assertEquals( 'More text', $p->get_content_between_balanced_tags() );
+	}
+
+	/**
+	 * Tests the `get_content_between_balanced_tags` method on an empty tag.
+	 *
+	 * @covers ::get_content_between_balanced_tags
+	 */
+	public function test_get_content_between_balanced_tags_empty_tag() {
+		$content = '<div></div>';
+		$p       = new WP_Interactivity_API_Directives_Processor( $content );
+		$p->next_tag();
+		$this->assertEquals( '', $p->get_content_between_balanced_tags() );
+	}
+
+	/**
+	 * Tests the `get_content_between_balanced_tags` method with a self-closing
+	 * tag.
+	 *
+	 * @covers ::get_content_between_balanced_tags
+	 */
+	public function test_get_content_between_balanced_tags_self_closing_tag() {
+		$content = '<img src="example.jpg">';
+		$p       = new WP_Interactivity_API_Directives_Processor( $content );
+		$p->next_tag();
+		$this->assertNull( $p->get_content_between_balanced_tags() );
+	}
+
+	/**
+	 * Tests the `get_content_between_balanced_tags` method with nested tags.
+	 *
+	 * @covers ::get_content_between_balanced_tags
+	 */
+	public function test_get_content_between_balanced_tags_nested_tags() {
+		$content = '<div><span>Content</span><strong>More Content</strong></div>';
+		$p       = new WP_Interactivity_API_Directives_Processor( $content );
+		$p->next_tag();
+		$this->assertEquals( '<span>Content</span><strong>More Content</strong>', $p->get_content_between_balanced_tags() );
+
+		$content = '<div><div>Content</div><img src="example.jpg"></div>';
+		$p       = new WP_Interactivity_API_Directives_Processor( $content );
+		$p->next_tag();
+		$this->assertEquals( '<div>Content</div><img src="example.jpg">', $p->get_content_between_balanced_tags() );
+	}
+
+	/**
+	 * Tests the `get_content_between_balanced_tags` method when no tags are
+	 * present.
+	 *
+	 * @covers ::get_content_between_balanced_tags
+	 */
+	public function test_get_content_between_balanced_tags_no_tags() {
+		$content = 'Just a string with no tags.';
+		$p       = new WP_Interactivity_API_Directives_Processor( $content );
+		$p->next_tag();
+		$this->assertNull( $p->get_content_between_balanced_tags() );
+	}
+
+	/**
+	 * Tests the `get_content_between_balanced_tags` method with unbalanced tags.
+	 *
+	 * @covers ::get_content_between_balanced_tags
+	 */
+	public function test_get_content_between_balanced_tags_with_unbalanced_tags() {
+		$content = '<div>Missing closing div';
+		$p       = new WP_Interactivity_API_Directives_Processor( $content );
+		$p->next_tag();
+		$this->assertNull( $p->get_content_between_balanced_tags() );
+
+		$content = '<div><div>Missing closing div</div>';
+		$p       = new WP_Interactivity_API_Directives_Processor( $content );
+		$p->next_tag();
+		$this->assertNull( $p->get_content_between_balanced_tags() );
+
+		$content = '<div>Missing closing div</span>';
+		$p       = new WP_Interactivity_API_Directives_Processor( $content );
+		$p->next_tag();
+		$this->assertNull( $p->get_content_between_balanced_tags() );
+
+		// It supports unbalanced tags inside the content.
+		$content = '<div>Missing opening span</span></div>';
+		$p       = new WP_Interactivity_API_Directives_Processor( $content );
+		$p->next_tag();
+		$this->assertEquals( 'Missing opening span</span>', $p->get_content_between_balanced_tags() );
+	}
+
+	/**
+	 * Tests the `get_content_between_balanced_tags` method when called on a
+	 * closing tag.
+	 *
+	 * @covers ::get_content_between_balanced_tags
+	 */
+	public function test_get_content_between_balanced_tags_on_closing_tag() {
+		$content = '<div>Text</div>';
+		$p       = new WP_Interactivity_API_Directives_Processor( $content );
+		$p->next_tag( array( 'tag_closers' => 'visit' ) );
+		$p->next_tag( array( 'tag_closers' => 'visit' ) );
+		$this->assertNull( $p->get_content_between_balanced_tags() );
+	}
+
+	/**
+	 * Tests the `set_content_between_balanced_tags` method on standard tags.
+	 *
+	 * @covers ::set_content_between_balanced_tags
+	 */
+	public function test_set_content_between_balanced_tags_standard_tags() {
+		$content = '<div>Text</div>';
+		$p       = new WP_Interactivity_API_Directives_Processor( $content );
+		$p->next_tag();
+		$result = $p->set_content_between_balanced_tags( 'New text' );
+		$this->assertTrue( $result );
+		$this->assertEquals( '<div>New text</div>', $p );
+
+		$content = '<div>Text</div><div>More text</div>';
+		$p       = new WP_Interactivity_API_Directives_Processor( $content );
+		$p->next_tag();
+		$result = $p->set_content_between_balanced_tags( 'New text' );
+		$this->assertTrue( $result );
+		$this->assertEquals( '<div>New text</div><div>More text</div>', $p );
+		$p->next_tag();
+		$result = $p->set_content_between_balanced_tags( 'More new text' );
+		$this->assertTrue( $result );
+		$this->assertEquals( '<div>New text</div><div>More new text</div>', $p );
+	}
+
+	/**
+	 * Tests the `set_content_between_balanced_tags` method when called on a
+	 * closing tag.
+	 *
+	 * @covers ::set_content_between_balanced_tags
+	 */
+	public function test_set_content_between_balanced_tags_on_closing_tag() {
+		$content = '<div>Text</div>';
+		$p       = new WP_Interactivity_API_Directives_Processor( $content );
+		$p->next_tag( array( 'tag_closers' => 'visit' ) );
+		$p->next_tag( array( 'tag_closers' => 'visit' ) );
+		$result = $p->set_content_between_balanced_tags( 'New text' );
+		$this->assertFalse( $result );
+		$this->assertEquals( '<div>Text</div>', $p );
+	}
+
+	/**
+	 * Tests the `set_content_between_balanced_tags` method on multiple calls to
+	 * the same tag.
+	 *
+	 * @covers ::set_content_between_balanced_tags
+	 */
+	public function test_set_content_between_balanced_tags_multiple_calls_in_same_tag() {
+		$content = '<div>Text</div>';
+		$p       = new WP_Interactivity_API_Directives_Processor( $content );
+		$p->next_tag();
+		$result = $p->set_content_between_balanced_tags( 'New text' );
+		$this->assertTrue( $result );
+		$this->assertEquals( '<div>New text</div>', $p );
+		$result = $p->set_content_between_balanced_tags( 'More text' );
+		$this->assertTrue( $result );
+		$this->assertEquals( '<div>More text</div>', $p );
+	}
+
+	/**
+	 * Tests the `set_content_between_balanced_tags` method on combinations with
+	 * set_attribute calls.
+	 *
+	 * @covers ::set_content_between_balanced_tags
+	 */
+	public function test_set_content_between_balanced_tags_with_set_attribute() {
+		$content = '<div>Text</div>';
+		$p       = new WP_Interactivity_API_Directives_Processor( $content );
+		$p->next_tag();
+		$p->set_attribute( 'class', 'test' );
+		$result = $p->set_content_between_balanced_tags( 'New text' );
+		$this->assertTrue( $result );
+		$this->assertEquals( '<div class="test">New text</div>', $p );
+
+		$content = '<div>Text</div>';
+		$p       = new WP_Interactivity_API_Directives_Processor( $content );
+		$p->next_tag();
+		$result = $p->set_content_between_balanced_tags( 'New text' );
+		$this->assertTrue( $result );
+		$p->set_attribute( 'class', 'test' );
+		$this->assertEquals( '<div class="test">New text</div>', $p );
+	}
+
+	/**
+	 * Tests the `set_content_between_balanced_tags` method where the existing
+	 * content includes tags.
+	 *
+	 * @covers ::set_content_between_balanced_tags
+	 */
+	public function test_set_content_between_balanced_tags_with_existing_tags() {
+		$content = '<div><span>Text</span></div>';
+		$p       = new WP_Interactivity_API_Directives_Processor( $content );
+		$p->next_tag();
+		$result = $p->set_content_between_balanced_tags( 'New text' );
+		$this->assertTrue( $result );
+		$this->assertEquals( '<div>New text</div>', $p );
+	}
+
+	/**
+	 * Tests the `set_content_between_balanced_tags` method where the new content
+	 * includes tags.
+	 *
+	 * @covers ::set_content_between_balanced_tags
+	 */
+	public function test_set_content_between_balanced_tags_with_new_tags() {
+		$content     = '<div>Text</div>';
+		$new_content = '<span>New text</span><a href="#">Link</a>';
+		$p           = new WP_Interactivity_API_Directives_Processor( $content );
+		$p->next_tag();
+		$p->set_content_between_balanced_tags( $new_content );
+		$this->assertEquals( '<div>&lt;span&gt;New text&lt;/span&gt;&lt;a href=&quot;#&quot;&gt;Link&lt;/a&gt;</div>', $p );
+	}
+
+	/**
+	 * Tests the `set_content_between_balanced_tags` method with an empty string.
+	 *
+	 * @covers ::set_content_between_balanced_tags
+	 */
+	public function test_set_content_between_balanced_tags_empty() {
+		$content = '<div>Text</div>';
+		$p       = new WP_Interactivity_API_Directives_Processor( $content );
+		$p->next_tag();
+		$result = $p->set_content_between_balanced_tags( '' );
+		$this->assertTrue( $result );
+		$this->assertEquals( '<div></div>', $p );
+
+		$content = '<div><div>Text</div></div>';
+		$p       = new WP_Interactivity_API_Directives_Processor( $content );
+		$p->next_tag();
+		$result = $p->set_content_between_balanced_tags( '' );
+		$this->assertTrue( $result );
+		$this->assertEquals( '<div></div>', $p );
+	}
+
+	/**
+	 * Tests the `set_content_between_balanced_tags` method on self-closing tags.
+	 *
+	 * @covers ::set_content_between_balanced_tags
+	 */
+	public function test_set_content_between_balanced_tags_self_closing_tag() {
+		$content = '<img src="example.jpg">';
+		$p       = new WP_Interactivity_API_Directives_Processor( $content );
+		$p->next_tag();
+		$result = $p->set_content_between_balanced_tags( 'New text' );
+		$this->assertFalse( $result );
+		$this->assertEquals( $content, $p );
+	}
+
+	/**
+	 * Tests the `set_content_between_balanced_tags` method on a non-existent tag.
+	 *
+	 * @covers ::set_content_between_balanced_tags
+	 */
+	public function test_set_content_between_balanced_tags_non_existent_tag() {
+		$content = 'Just a string with no tags.';
+		$p       = new WP_Interactivity_API_Directives_Processor( $content );
+		$p->next_tag();
+		$result = $p->set_content_between_balanced_tags( 'New text' );
+		$this->assertFalse( $result );
+		$this->assertEquals( $content, $p );
+	}
+
+	/**
+	 * Tests the `set_content_between_balanced_tags` method with unbalanced tags.
+	 *
+	 * @covers ::set_content_between_balanced_tags
+	 */
+	public function test_set_content_between_balanced_tags_with_unbalanced_tags() {
+		$new_content = 'New text';
+
+		$content = '<div>Missing closing div';
+		$p       = new WP_Interactivity_API_Directives_Processor( $content );
+		$p->next_tag();
+		$result = $p->set_content_between_balanced_tags( $new_content );
+		$this->assertFalse( $result );
+		$this->assertEquals( '<div>Missing closing div', $p );
+
+		$content = '<div><div>Missing closing div</div>';
+		$p       = new WP_Interactivity_API_Directives_Processor( $content );
+		$p->next_tag();
+		$result = $p->set_content_between_balanced_tags( $new_content );
+		$this->assertFalse( $result );
+		$this->assertEquals( '<div><div>Missing closing div</div>', $p );
+
+		$content = '<div>Missing closing div</span>';
+		$p       = new WP_Interactivity_API_Directives_Processor( $content );
+		$p->next_tag();
+		$result = $p->set_content_between_balanced_tags( $new_content );
+		$this->assertFalse( $result );
+		$this->assertEquals( '<div>Missing closing div</span>', $p );
+
+		// It supports unbalanced tags inside the content.
+		$content = '<div>Missing opening span</span></div>';
+		$p       = new WP_Interactivity_API_Directives_Processor( $content );
+		$p->next_tag();
+		$result = $p->set_content_between_balanced_tags( $new_content );
+		$this->assertTrue( $result );
+		$this->assertEquals( '<div>New text</div>', $p );
+	}
+
+	/**
+	 * Tests the is_void method.
+	 *
+	 * @covers ::is_void
+	 */
+	public function test_is_void_element() {
+		$void_elements = array( 'area', 'base', 'br', 'col', 'embed', 'hr', 'img', 'input', 'link', 'meta', 'source', 'track', 'wbr' );
+		foreach ( $void_elements as $tag_name ) {
+			$content = "<{$tag_name} id={$tag_name}>";
+			$p       = new WP_Interactivity_API_Directives_Processor( $content );
+			$p->next_tag();
+			$this->assertTrue( $p->is_void() );
+		}
+
+		$non_void_elements = array( 'div', 'span', 'p', 'script', 'style' );
+		foreach ( $non_void_elements as $tag_name ) {
+			$content = "<{$tag_name} id={$tag_name}>Some content</{$tag_name}>";
+			$p       = new WP_Interactivity_API_Directives_Processor( $content );
+			$p->next_tag();
+			$this->assertFalse( $p->is_void() );
+		}
+
+		// Test an upercase tag.
+		$content = '<IMG src="example.jpg">';
+		$p       = new WP_Interactivity_API_Directives_Processor( $content );
+		$p->next_tag();
+		$this->assertTrue( $p->is_void() );
+
+		// Test an empty string.
+		$content = '';
+		$p       = new WP_Interactivity_API_Directives_Processor( $content );
+		$p->next_tag();
+		$this->assertFalse( $p->is_void() );
+
+		// Test on text nodes.
+		$content = 'This is just some text';
+		$p       = new WP_Interactivity_API_Directives_Processor( $content );
+		$p->next_tag();
+		$this->assertFalse( $p->is_void() );
+	}
+}

From 236eda22ca0de9d93f164dca4939d5b71e55228e Mon Sep 17 00:00:00 2001
From: Luis Herranz <luisherranz@gmail.com>
Date: Wed, 31 Jan 2024 17:30:26 +0100
Subject: [PATCH 02/56] Fix test pollution

---
 tests/phpunit/tests/interactivity-api/interactivity-api.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/phpunit/tests/interactivity-api/interactivity-api.php b/tests/phpunit/tests/interactivity-api/interactivity-api.php
index ba88737cd65d9..9c86ca74aa018 100644
--- a/tests/phpunit/tests/interactivity-api/interactivity-api.php
+++ b/tests/phpunit/tests/interactivity-api/interactivity-api.php
@@ -187,6 +187,7 @@ public function test_process_directives_only_process_the_root_interactive_blocks
 		$class                = new ReflectionClass( 'WP_Interactivity_API' );
 		$directive_processors = $class->getProperty( 'directive_processors' );
 		$directive_processors->setAccessible( true );
+		$old_directive_processors = $directive_processors->getValue();
 		$directive_processors->setValue( null, array( 'data-wp-test' => array( $this, 'data_wp_test_processor' ) ) );
 		$html                               = '<div data-wp-test></div>';
 		$this->data_wp_test_processor_count = 0;
@@ -213,5 +214,6 @@ public function test_process_directives_only_process_the_root_interactive_blocks
 		do_blocks( $post_content );
 		$this->assertEquals( 2, $this->data_wp_test_processor_count );
 		unregister_block_type( 'test/custom-directive-block' );
+		$directive_processors->setValue( null, $old_directive_processors );
 	}
 }

From 7c95ee5fed2f31ff2863154c8367b36b554a7139 Mon Sep 17 00:00:00 2001
From: Luis Herranz <luisherranz@gmail.com>
Date: Wed, 31 Jan 2024 17:30:26 +0100
Subject: [PATCH 03/56] Fix tabs in multiline comments

Co-authored-by: Jon Surrell <sirreal@users.noreply.github.com>
---
 .../class-wp-interactivity-api.php            | 117 +++++++++---------
 .../interactivity-api/interactivity-api.php   |  18 +--
 2 files changed, 66 insertions(+), 69 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 cb481b0c65e40..7ccc59ca01813 100644
--- a/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
+++ b/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
@@ -192,23 +192,20 @@ public function process_directives( string $html ): string {
 				if ( 0 === count( $tag_stack ) || $opening_tag_name !== $tag_name ) {
 
 					/*
-						* If the tag stack is empty or the matching opening tag is not the
-						* same than the closing tag, it means the HTML is unbalanced and it
-						* stops processing it.
-						*/
+					 * If the tag stack is empty or the matching opening tag is not the
+					 * same than the closing tag, it means the HTML is unbalanced and it
+					 * stops processing it.
+					 */
 					$unbalanced = true;
 					continue;
 				} else {
-
-					/*
-						* It removes the last tag from the stack.
-						*/
+					// Remove the last tag from the stack.
 					array_pop( $tag_stack );
 
 					/*
-						* If the matching opening tag didn't have any directives, it can skip
-						* the processing.
-						*/
+					 * If the matching opening tag didn't have any directives, it can skip
+					 * the processing.
+					 */
 					if ( 0 === count( $directives_prefixes ) ) {
 						continue;
 					}
@@ -219,9 +216,9 @@ public function process_directives( string $html ): string {
 				foreach ( $p->get_attribute_names_with_prefix( 'data-wp-' ) as $attribute_name ) {
 
 					/*
-						* Extracts the directive prefix to see if there is a server directive
-						* processor registered for that directive.
-						*/
+					 * Extracts the directive prefix to see if there is a server directive
+					 * processor registered for that directive.
+					 */
 					list( $directive_prefix ) = $this->extract_prefix_and_suffix( $attribute_name );
 					if ( array_key_exists( $directive_prefix, self::$directive_processors ) ) {
 						$directives_prefixes[] = $directive_prefix;
@@ -229,19 +226,19 @@ public function process_directives( string $html ): string {
 				}
 
 				/*
-					* If this is not a void element, it adds it to the tag stack so it can
-					* process its closing tag and check for unbalanced tags.
-					*/
+				 * If this is not a void element, it adds it to the tag stack so it can
+				 * process its closing tag and check for unbalanced tags.
+				 */
 				if ( ! $p->is_void() ) {
 					$tag_stack[] = array( $tag_name, $directives_prefixes );
 				}
 			}
 
 			/*
-				* Sorts the attributes by the order of the `directives_processor` array
-				* and checks what directives are present in this element. The processing
-				* order is reversed for tag closers.
-				*/
+			 * Sorts the attributes by the order of the `directives_processor` array
+			 * and checks what directives are present in this element. The processing
+			 * order is reversed for tag closers.
+			 */
 			$directives_prefixes = array_intersect(
 				$p->is_tag_closer()
 					? $directive_processor_prefixes_reversed
@@ -262,10 +259,10 @@ public function process_directives( string $html ): string {
 		}
 
 		/*
-			* It returns the original content 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.
-			*/
+		 * It returns the original content 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.
+		 */
 		return $unbalanced || 0 < count( $tag_stack ) ? $html : $p->get_updated_html();
 	}
 
@@ -371,10 +368,10 @@ private function extract_directive_value( $directive_value, $default_namespace =
 		}
 
 		/*
-			* Tries to decode the value as a JSON object. If it fails and the value
-			* isn't `null`, it returns the value as it is. Otherwise, it returns the
-			* decoded JSON or null for the string `null`.
-			*/
+		 * Tries to decode the value as a JSON object. If it fails and the value
+		 * isn't `null`, it returns the value as it is. Otherwise, it returns the
+		 * decoded JSON or null for the string `null`.
+		 */
 		$decoded_json = json_decode( $directive_value, true );
 		if ( null !== $decoded_json || 'null' === $directive_value ) {
 			$directive_value = $decoded_json;
@@ -409,13 +406,13 @@ private function data_wp_interactive_processor( WP_Interactivity_API_Directives_
 			: null;
 
 		/*
-			* Pushes the newly defined namespace or the current one if the
-			* `data-wp-interactive` definition was invalid or does not contain a
-			* namespace. It does so because the function pops out the current namespace
-			* from the stack whenever it finds a `data-wp-interactive`'s closing tag,
-			* independently of whether the previous `data-wp-interactive` definition
-			* contained a valid namespace.
-			*/
+		 * Pushes the newly defined namespace or the current one if the
+		 * `data-wp-interactive` definition was invalid or does not contain a
+		 * namespace. It does so because the function pops out the current namespace
+		 * from the stack whenever it finds a `data-wp-interactive`'s closing tag,
+		 * independently of whether the previous `data-wp-interactive` definition
+		 * contained a valid namespace.
+		 */
 		$namespace_stack[] = isset( $decoded_json['namespace'] )
 			? $decoded_json['namespace']
 			: end( $namespace_stack );
@@ -448,9 +445,9 @@ private function data_wp_context_processor( WP_Interactivity_API_Directives_Proc
 			: array( $namespace_value, null );
 
 		/*
-			* If there is a namespace, it adds a new context to the stack merging the
-			* previous context with the new one.
-			*/
+		 * If there is a namespace, it adds a new context to the stack merging the
+		 * previous context with the new one.
+		 */
 		if ( is_string( $namespace_value ) ) {
 			array_push(
 				$context_stack,
@@ -461,10 +458,10 @@ private function data_wp_context_processor( WP_Interactivity_API_Directives_Proc
 			);
 		} else {
 			/*
-				* If there is no namespace, it pushes the current context to the stack.
-				* It needs to do so because the function pops out the current context
-				* from the stack whenever it finds a `data-wp-context`'s closing tag.
-				*/
+			 * If there is no namespace, it pushes the current context to the stack.
+			 * It needs to do so because the function pops out the current context
+			 * from the stack whenever it finds a `data-wp-context`'s closing tag.
+			 */
 			array_push( $context_stack, end( $context_stack ) );
 		}
 	}
@@ -496,12 +493,12 @@ private function data_wp_bind_processor( WP_Interactivity_API_Directives_Process
 
 				if ( null !== $result && ( false !== $result || '-' === $bound_attribute[4] ) ) {
 					/*
-						* If the result of the evaluation is a boolean and the attribute is
-						* `aria-` or `data-, convert it to a string "true" or "false". It
-						* follows the exact same logic as Preact because it needs to
-						* replicate what Preact will later do in the client:
-						* https://github.com/preactjs/preact/blob/ea49f7a0f9d1ff2c98c0bdd66aa0cbc583055246/src/diff/props.js#L131C24-L136
-						*/
+					 * If the result of the evaluation is a boolean and the attribute is
+					 * `aria-` or `data-, convert it to a string "true" or "false". It
+					 * follows the exact same logic as Preact because it needs to
+					 * replicate what Preact will later do in the client:
+					 * https://github.com/preactjs/preact/blob/ea49f7a0f9d1ff2c98c0bdd66aa0cbc583055246/src/diff/props.js#L131C24-L136
+					 */
 					if ( is_bool( $result ) && '-' === $bound_attribute[4] ) {
 						$result = $result ? 'true' : 'false';
 					}
@@ -576,16 +573,16 @@ private function data_wp_style_processor( WP_Interactivity_API_Directives_Proces
 				$style_attribute_value     = ( $style_attribute_value && ! is_bool( $style_attribute_value ) ) ? $style_attribute_value : '';
 
 				/*
-					* Checks first if the style property is not falsy and the style
-					* attribute value is not empty because if it is, it doesn't need to
-					* update the attribute value.
-					*/
+				 * Checks first if the style property is not falsy and the style
+				 * attribute value is not empty because if it is, it doesn't need to
+				 * update the attribute value.
+				 */
 				if ( $style_property_value || ( ! $style_property_value && $style_attribute_value ) ) {
 					$style_attribute_value = $this->set_style_property( $style_attribute_value, $style_property, $style_property_value );
 					/*
-						* If the style attribute value is not empty, it sets it. Otherwise,
-						* it removes it.
-						*/
+					 * If the style attribute value is not empty, it sets it. Otherwise,
+					 * it removes it.
+					 */
 					if ( ! empty( $style_attribute_value ) ) {
 						$p->set_attribute( 'style', $style_attribute_value );
 					} else {
@@ -658,10 +655,10 @@ private function data_wp_text_processor( WP_Interactivity_API_Directives_Process
 			$result          = $this->evaluate( $attribute_value, end( $namespace_stack ), end( $context_stack ) );
 
 			/*
-				* Follows the same logic as Preact in the client and only changes the
-				* content if the value is a string or a number. Otherwise, it removes the
-				* content.
-				*/
+			 * Follows the same logic as Preact in the client and only changes the
+			 * content if the value is a string or a number. Otherwise, it removes the
+			 * content.
+			 */
 			if ( is_string( $result ) || is_numeric( $result ) ) {
 				$p->set_content_between_balanced_tags( esc_html( $result ) );
 			} else {
diff --git a/src/wp-includes/interactivity-api/interactivity-api.php b/src/wp-includes/interactivity-api/interactivity-api.php
index 7d9659e14b25d..8a5f96a2a9b17 100644
--- a/src/wp-includes/interactivity-api/interactivity-api.php
+++ b/src/wp-includes/interactivity-api/interactivity-api.php
@@ -23,9 +23,9 @@ function wp_interactivity_process_directives_of_interactive_blocks( $parsed_bloc
 	static $root_interactive_block = null;
 
 	/*
-		* Checks whether a root interactive block is already annotated for
-		* processing, and if it is, it ignores the subsequent ones.
-		*/
+	 * Checks whether a root interactive block is already annotated for
+	 * processing, and if it is, it ignores the subsequent ones.
+	 */
 	if ( null === $root_interactive_block ) {
 		$block_name = $parsed_block['blockName'];
 		$block_type = WP_Block_Type_Registry::get_instance()->get_registered( $block_name );
@@ -35,9 +35,9 @@ function wp_interactivity_process_directives_of_interactive_blocks( $parsed_bloc
 			$root_interactive_block = array( $block_name, md5( serialize( $parsed_block ) ) );
 
 			/*
-				* Adds a filter to process the root interactive block once it has
-				* finished rendering.
-				*/
+			 * Adds a filter to process the root interactive block once it has
+			 * finished rendering.
+			 */
 			$process_interactive_blocks = static function ( $content, $parsed_block ) use ( &$root_interactive_block, &$process_interactive_blocks ) {
 				// Checks whether the current block is the root interactive block.
 				list($root_block_name, $root_block_md5) = $root_interactive_block;
@@ -52,9 +52,9 @@ function wp_interactivity_process_directives_of_interactive_blocks( $parsed_bloc
 			};
 
 			/*
-				* Uses a priority of 20 to ensure that other filters can add additional
-				* directives before the processing starts.
-				*/
+			 * Uses a priority of 20 to ensure that other filters can add additional
+			 * directives before the processing starts.
+			 */
 			add_filter( 'render_block', $process_interactive_blocks, 20, 2 );
 		}
 	}

From c0842768ea4c4bce24367fa8ed42ee46a59ad3ae Mon Sep 17 00:00:00 2001
From: Luis Herranz <luisherranz@gmail.com>
Date: Wed, 31 Jan 2024 17:30:26 +0100
Subject: [PATCH 04/56] Improve state/config return msg and fix arg name

---
 .../interactivity-api/class-wp-interactivity-api.php   |  6 ++++--
 .../interactivity-api/interactivity-api.php            | 10 ++++++----
 2 files changed, 10 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 7ccc59ca01813..c2a0a286d42a0 100644
--- a/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
+++ b/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
@@ -60,7 +60,8 @@ class WP_Interactivity_API {
 	 * @param string $store_namespace The unique store namespace identifier.
 	 * @param array  $state           Optional. The array that will be merged with the existing state for the specified
 	 *                                store namespace.
-	 * @return array The current state for the specified store namespace.
+	 * @return array The current state for the specified store namespace. This will be the updated state if a $state
+	 *               argument was provided.
 	 */
 	public function state( string $store_namespace, array $state = null ): array {
 		if ( ! isset( $this->state_data[ $store_namespace ] ) ) {
@@ -87,7 +88,8 @@ public function state( string $store_namespace, array $state = null ): array {
 	 * @param string $store_namespace The unique store namespace identifier.
 	 * @param array  $config          Optional. The array that will be merged with the existing configuration for the
 	 *                                specified store namespace.
-	 * @return array The current configuration for the specified store namespace.
+	 * @return array The configuration for the specified store namespace. This will be the updated configuration if a
+	 *               $config argument was provided.
 	 */
 	public function config( string $store_namespace, array $config = null ): array {
 		if ( ! isset( $this->config_data[ $store_namespace ] ) ) {
diff --git a/src/wp-includes/interactivity-api/interactivity-api.php b/src/wp-includes/interactivity-api/interactivity-api.php
index 8a5f96a2a9b17..1859ea081ddb8 100644
--- a/src/wp-includes/interactivity-api/interactivity-api.php
+++ b/src/wp-includes/interactivity-api/interactivity-api.php
@@ -109,7 +109,8 @@ function wp_interactivity_process_directives( $html ) {
  * @param string $store_namespace The unique store namespace identifier.
  * @param array  $state           Optional. The array that will be merged with the existing state for the specified
  *                                store namespace.
- * @return array The current state for the specified store namespace.
+ * @return array The state for the specified store namespace. This will be the updated state if a $state argument was
+ *               provided.
  */
 function wp_interactivity_state( $store_namespace, $state = null ) {
 	return wp_interactivity()->state( $store_namespace, $state );
@@ -127,8 +128,9 @@ function wp_interactivity_state( $store_namespace, $state = null ) {
  * @param string $store_namespace The unique store namespace identifier.
  * @param array  $config          Optional. The array that will be merged with the existing configuration for the
  *                                specified store namespace.
- * @return array The current configuration for the specified store namespace.
+ * @return array The configuration for the specified store namespace. This will be the updated configuration if a
+ *               $config argument was provided.
  */
-function wp_interactivity_config( $store_namespace, $initial_state = null ) {
-	return wp_interactivity()->config( $store_namespace, $initial_state );
+function wp_interactivity_config( $store_namespace, $config = null ) {
+	return wp_interactivity()->config( $store_namespace, $config );
 }

From 0fe322570f46b82546720b3794f507f7fb5ff94b Mon Sep 17 00:00:00 2001
From: Luis Herranz <luisherranz@gmail.com>
Date: Wed, 31 Jan 2024 17:33:50 +0100
Subject: [PATCH 05/56] Remove unnecessary module registration

---
 src/wp-includes/interactivity-api.php | 26 --------------------------
 src/wp-settings.php                   |  1 -
 2 files changed, 27 deletions(-)
 delete mode 100644 src/wp-includes/interactivity-api.php

diff --git a/src/wp-includes/interactivity-api.php b/src/wp-includes/interactivity-api.php
deleted file mode 100644
index de9e877c9a761..0000000000000
--- a/src/wp-includes/interactivity-api.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/**
- * Interactivity API: Functions and hooks
- *
- * @package WordPress
- * @subpackage Interactivity API
- */
-
-/**
- * Registers the interactivity modules.
- */
-function wp_interactivity_register_script_modules() {
-	wp_register_script_module(
-		'@wordpress/interactivity',
-		includes_url( '/js/dist/interactivity.min.js' ),
-		array()
-	);
-
-	wp_register_script_module(
-		'@wordpress/interactivity-router',
-		includes_url( '/js/dist/interactivity-router.min.js' ),
-		array( '@wordpress/interactivity' )
-	);
-}
-
-add_action( 'init', 'wp_interactivity_register_script_modules' );
diff --git a/src/wp-settings.php b/src/wp-settings.php
index 6cddae7550e16..282e2a0d905f7 100644
--- a/src/wp-settings.php
+++ b/src/wp-settings.php
@@ -376,7 +376,6 @@
 require ABSPATH . WPINC . '/fonts.php';
 require ABSPATH . WPINC . '/class-wp-script-modules.php';
 require ABSPATH . WPINC . '/script-modules.php';
-require ABSPATH . WPINC . '/interactivity-api.php';
 require ABSPATH . WPINC . '/interactivity-api/class-wp-interactivity-api.php';
 require ABSPATH . WPINC . '/interactivity-api/class-wp-interactivity-api-directives-processor.php';
 require ABSPATH . WPINC . '/interactivity-api/interactivity-api.php';

From e8daa1c89140249202d9976ef73d5eef9bd78c2c Mon Sep 17 00:00:00 2001
From: Luis Herranz <luisherranz@gmail.com>
Date: Thu, 1 Feb 2024 10:08:08 +0100
Subject: [PATCH 06/56] Fix typos

---
 .../interactivity-api/class-wp-interactivity-api.php      | 8 ++++----
 1 file changed, 4 insertions(+), 4 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 c2a0a286d42a0..7cf527c45410f 100644
--- a/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
+++ b/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
@@ -7,7 +7,7 @@
  */
 
 /**
- * Class used to process the Interactivity API in the server.
+ * Class used to process the Interactivity API on the server.
  */
 class WP_Interactivity_API {
 	/**
@@ -292,7 +292,7 @@ private function evaluate( $directive_value, string $default_namespace, $context
 			'context' => isset( $context[ $ns ] ) ? $context[ $ns ] : array(),
 		);
 
-		// Checks if the reference path is preceded by a negator operator (!).
+		// Checks if the reference path is preceded by a negation operator (!).
 		$should_negate_value = '!' === $path[0];
 		$path                = $should_negate_value ? substr( $path, 1 ) : $path;
 
@@ -307,7 +307,7 @@ private function evaluate( $directive_value, string $default_namespace, $context
 			}
 		}
 
-		// Returns the opposite if it contains a negator operator (!).
+		// Returns the opposite if it contains a negation operator (!).
 		return $should_negate_value ? ! $current : $current;
 	}
 
@@ -340,7 +340,7 @@ private function extract_prefix_and_suffix( string $directive_name ): array {
 	 * If the value doesn't contain an explicit namespace, it returns the
 	 * default one. If the value contains a JSON object instead of a reference
 	 * path, the function tries to parse it and return the resulting array. If
-	 * the value contains strings that reprenset booleans ("true" and "false"),
+	 * the value contains strings that represent booleans ("true" and "false"),
 	 * numbers ("1" and "1.2") or "null", the function also transform them to
 	 * regular booleans, numbers and `null`.
 	 *

From c0f580454a2ddf4db571f3f5e28f5d3a0822a761 Mon Sep 17 00:00:00 2001
From: Luis Herranz <luisherranz@gmail.com>
Date: Thu, 1 Feb 2024 10:16:14 +0100
Subject: [PATCH 07/56] Add missing @since statements

---
 ...ss-wp-interactivity-api-directives-processor.php | 13 +++++++++++++
 .../class-wp-interactivity-api.php                  |  3 +++
 .../interactivity-api/interactivity-api.php         |  1 +
 3 files changed, 17 insertions(+)

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 a045e714711eb..bf2d30964a931 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
@@ -4,18 +4,23 @@
  *
  * @package WordPress
  * @subpackage Interactivity API
+ * @since 6.5.0
  */
 
 /**
  * Class used to iterate over the tags of an HTML string and help process the
  * directive attributes.
  *
+ * @since 6.5.0
+ *
  * @access private
  */
 class WP_Interactivity_API_Directives_Processor extends WP_HTML_Tag_Processor {
 	/**
 	 * Returns the content between two balanced tags.
 	 *
+	 * @since 6.5.0
+	 *
 	 * @access private
 	 *
 	 * @return string|null The content between the current opening and its matching closing tag or null if it doesn't
@@ -41,6 +46,8 @@ public function get_content_between_balanced_tags() {
 	/**
 	 * Sets the content between two balanced tags.
 	 *
+	 * @since 6.5.0
+	 *
 	 * @access private
 	 *
 	 * @param string $new_content The string to replace the content between the matching tags.
@@ -70,6 +77,8 @@ public function set_content_between_balanced_tags( string $new_content ): bool {
 	 * Returns a pair of bookmarks for the current opening tag and the matching
 	 * closing tag.
 	 *
+	 * @since 6.5.0
+	 *
 	 * @return array|null A pair of bookmarks, or null if there's no matching closing tag.
 	 */
 	private function get_balanced_tag_bookmarks() {
@@ -96,6 +105,8 @@ private function get_balanced_tag_bookmarks() {
 	 * including nested tags of the same name. Returns false when called on a
 	 * closing or void tag, or if no matching closing tag was found.
 	 *
+	 * @since 6.5.0
+	 *
 	 * @return bool Whether a matching closing tag was found.
 	 */
 	private function next_balanced_closer(): bool {
@@ -130,6 +141,8 @@ private function next_balanced_closer(): bool {
 	/**
 	 * Checks whether the current tag is void.
 	 *
+	 * @since 6.5.0
+	 *
 	 * @access private
 	 *
 	 * @return bool Whether the current tag is void or not.
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 7cf527c45410f..ed75fab66e7e2 100644
--- a/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
+++ b/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
@@ -4,10 +4,13 @@
  *
  * @package WordPress
  * @subpackage Interactivity API
+ * @since 6.5.0
  */
 
 /**
  * Class used to process the Interactivity API on the server.
+ *
+ * @since 6.5.0
  */
 class WP_Interactivity_API {
 	/**
diff --git a/src/wp-includes/interactivity-api/interactivity-api.php b/src/wp-includes/interactivity-api/interactivity-api.php
index 1859ea081ddb8..b7fb5ad4c41d9 100644
--- a/src/wp-includes/interactivity-api/interactivity-api.php
+++ b/src/wp-includes/interactivity-api/interactivity-api.php
@@ -4,6 +4,7 @@
  *
  * @package WordPress
  * @subpackage Interactivity API
+ * @since 6.5.0
  */
 
 /**

From eab8f288a5e5861214696ed0fe3ef22ac333bcdf Mon Sep 17 00:00:00 2001
From: Luis Herranz <luisherranz@gmail.com>
Date: Thu, 1 Feb 2024 10:25:09 +0100
Subject: [PATCH 08/56] Switch to null coalescing operator

---
 .../interactivity-api/class-wp-interactivity-api.php      | 8 +++-----
 1 file changed, 3 insertions(+), 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 ed75fab66e7e2..93509404b5c5a 100644
--- a/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
+++ b/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
@@ -291,8 +291,8 @@ private function evaluate( $directive_value, string $default_namespace, $context
 		}
 
 		$store = array(
-			'state'   => isset( $this->state_data[ $ns ] ) ? $this->state_data[ $ns ] : array(),
-			'context' => isset( $context[ $ns ] ) ? $context[ $ns ] : array(),
+			'state'   => $this->state_data[ $ns ] ?? array(),
+			'context' => $context[ $ns ] ?? array(),
 		);
 
 		// Checks if the reference path is preceded by a negation operator (!).
@@ -418,9 +418,7 @@ private function data_wp_interactive_processor( WP_Interactivity_API_Directives_
 		 * independently of whether the previous `data-wp-interactive` definition
 		 * contained a valid namespace.
 		 */
-		$namespace_stack[] = isset( $decoded_json['namespace'] )
-			? $decoded_json['namespace']
-			: end( $namespace_stack );
+		$namespace_stack[] = $decoded_json['namespace'] ?? end( $namespace_stack );
 	}
 
 	/**

From 19e454fcea683c1cd1efa8909c0ae3e0330195aa Mon Sep 17 00:00:00 2001
From: Luis Herranz <luisherranz@gmail.com>
Date: Thu, 1 Feb 2024 10:25:29 +0100
Subject: [PATCH 09/56] Replace array_push with $array[]

---
 .../class-wp-interactivity-api.php                  | 13 +++++--------
 1 file changed, 5 insertions(+), 8 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 93509404b5c5a..c2f7187fd1cff 100644
--- a/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
+++ b/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
@@ -452,12 +452,9 @@ private function data_wp_context_processor( WP_Interactivity_API_Directives_Proc
 		 * previous context with the new one.
 		 */
 		if ( is_string( $namespace_value ) ) {
-			array_push(
-				$context_stack,
-				array_replace_recursive(
-					end( $context_stack ) !== false ? end( $context_stack ) : array(),
-					array( $namespace_value => is_array( $decoded_json ) ? $decoded_json : array() )
-				)
+			$context_stack[] = array_replace_recursive(
+				end( $context_stack ) !== false ? end( $context_stack ) : array(),
+				array( $namespace_value => is_array( $decoded_json ) ? $decoded_json : array() )
 			);
 		} else {
 			/*
@@ -465,7 +462,7 @@ private function data_wp_context_processor( WP_Interactivity_API_Directives_Proc
 			 * It needs to do so because the function pops out the current context
 			 * from the stack whenever it finds a `data-wp-context`'s closing tag.
 			 */
-			array_push( $context_stack, end( $context_stack ) );
+			$context_stack[] = end( $context_stack );
 		}
 	}
 
@@ -635,7 +632,7 @@ private function set_style_property( string $style_attribute_value, string $styl
 		}
 
 		// Add the new/modified property at the end of the list.
-		array_push( $result, $new_style_property );
+		$result[] = $new_style_property;
 
 		return implode( '', $result );
 	}

From 61d896fe5dba0a6a8dfa9bbc902702173d138aaf Mon Sep 17 00:00:00 2001
From: Luis Herranz <luisherranz@gmail.com>
Date: Thu, 1 Feb 2024 10:28:58 +0100
Subject: [PATCH 10/56] Simplify conditional statement

---
 .../interactivity-api/class-wp-interactivity-api.php            | 2 +-
 1 file changed, 1 insertion(+), 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 c2f7187fd1cff..3495c3e643c66 100644
--- a/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
+++ b/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
@@ -577,7 +577,7 @@ private function data_wp_style_processor( WP_Interactivity_API_Directives_Proces
 				 * attribute value is not empty because if it is, it doesn't need to
 				 * update the attribute value.
 				 */
-				if ( $style_property_value || ( ! $style_property_value && $style_attribute_value ) ) {
+				if ( $style_property_value || $style_attribute_value ) {
 					$style_attribute_value = $this->set_style_property( $style_attribute_value, $style_property, $style_property_value );
 					/*
 					 * If the style attribute value is not empty, it sets it. Otherwise,

From 84ea8fddffbddbaab437266253707701aa60dbdd Mon Sep 17 00:00:00 2001
From: Luis Herranz <luisherranz@gmail.com>
Date: Thu, 1 Feb 2024 10:33:10 +0100
Subject: [PATCH 11/56] Replace null with empty array in state/config functions

---
 .../interactivity-api/class-wp-interactivity-api.php          | 4 ++--
 src/wp-includes/interactivity-api/interactivity-api.php       | 4 ++--
 2 files changed, 4 insertions(+), 4 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 3495c3e643c66..47fde31587b7c 100644
--- a/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
+++ b/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
@@ -66,7 +66,7 @@ class WP_Interactivity_API {
 	 * @return array The current state for the specified store namespace. This will be the updated state if a $state
 	 *               argument was provided.
 	 */
-	public function state( string $store_namespace, array $state = null ): array {
+	public function state( string $store_namespace, array $state = array() ): array {
 		if ( ! isset( $this->state_data[ $store_namespace ] ) ) {
 			$this->state_data[ $store_namespace ] = array();
 		}
@@ -94,7 +94,7 @@ public function state( string $store_namespace, array $state = null ): array {
 	 * @return array The configuration for the specified store namespace. This will be the updated configuration if a
 	 *               $config argument was provided.
 	 */
-	public function config( string $store_namespace, array $config = null ): array {
+	public function config( string $store_namespace, array $config = array() ): array {
 		if ( ! isset( $this->config_data[ $store_namespace ] ) ) {
 			$this->config_data[ $store_namespace ] = array();
 		}
diff --git a/src/wp-includes/interactivity-api/interactivity-api.php b/src/wp-includes/interactivity-api/interactivity-api.php
index b7fb5ad4c41d9..348467c936574 100644
--- a/src/wp-includes/interactivity-api/interactivity-api.php
+++ b/src/wp-includes/interactivity-api/interactivity-api.php
@@ -113,7 +113,7 @@ function wp_interactivity_process_directives( $html ) {
  * @return array The state for the specified store namespace. This will be the updated state if a $state argument was
  *               provided.
  */
-function wp_interactivity_state( $store_namespace, $state = null ) {
+function wp_interactivity_state( string $store_namespace, array $state = array() ): array {
 	return wp_interactivity()->state( $store_namespace, $state );
 }
 
@@ -132,6 +132,6 @@ function wp_interactivity_state( $store_namespace, $state = null ) {
  * @return array The configuration for the specified store namespace. This will be the updated configuration if a
  *               $config argument was provided.
  */
-function wp_interactivity_config( $store_namespace, $config = null ) {
+function wp_interactivity_config( string $store_namespace, array $config = array() ): array {
 	return wp_interactivity()->config( $store_namespace, $config );
 }

From 0503eed9f077da07bf92ceac56d225cc40358082 Mon Sep 17 00:00:00 2001
From: Luis Herranz <luisherranz@gmail.com>
Date: Thu, 1 Feb 2024 10:34:31 +0100
Subject: [PATCH 12/56] Add missing PHP 7 types

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

diff --git a/src/wp-includes/interactivity-api/interactivity-api.php b/src/wp-includes/interactivity-api/interactivity-api.php
index 348467c936574..e7bad3a38462a 100644
--- a/src/wp-includes/interactivity-api/interactivity-api.php
+++ b/src/wp-includes/interactivity-api/interactivity-api.php
@@ -20,7 +20,7 @@
  * @param array $parsed_block The parsed block.
  * @return array The same parsed block.
  */
-function wp_interactivity_process_directives_of_interactive_blocks( $parsed_block ) {
+function wp_interactivity_process_directives_of_interactive_blocks( array $parsed_block ): array {
 	static $root_interactive_block = null;
 
 	/*
@@ -94,7 +94,7 @@ function wp_interactivity() {
  * @param string $html The HTML content to process.
  * @return string The processed HTML content. It returns the original content when the HTML contains unbalanced tags.
  */
-function wp_interactivity_process_directives( $html ) {
+function wp_interactivity_process_directives( string $html ): string {
 	return wp_interactivity()->process_directives( $html );
 }
 

From 36e8adbf8c2d99e419db7859214019dcf0e55031 Mon Sep 17 00:00:00 2001
From: Luis Herranz <luisherranz@gmail.com>
Date: Thu, 1 Feb 2024 10:37:13 +0100
Subject: [PATCH 13/56] Remove default args passed to filter

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

diff --git a/src/wp-includes/interactivity-api/interactivity-api.php b/src/wp-includes/interactivity-api/interactivity-api.php
index e7bad3a38462a..eadd40eee1f22 100644
--- a/src/wp-includes/interactivity-api/interactivity-api.php
+++ b/src/wp-includes/interactivity-api/interactivity-api.php
@@ -62,7 +62,7 @@ function wp_interactivity_process_directives_of_interactive_blocks( array $parse
 
 	return $parsed_block;
 }
-add_filter( 'render_block_data', 'wp_interactivity_process_directives_of_interactive_blocks', 10, 1 );
+add_filter( 'render_block_data', 'wp_interactivity_process_directives_of_interactive_blocks' );
 
 /**
  * Retrieves the main WP_Interactivity_API instance.

From 2fef289bd9b0382d728880b95450749775a44f78 Mon Sep 17 00:00:00 2001
From: Luis Herranz <luisherranz@gmail.com>
Date: Thu, 1 Feb 2024 10:49:45 +0100
Subject: [PATCH 14/56] Add missing tests comments

---
 .../interactivity-api/interactivity-api.php   | 75 +++++++++++++++++++
 1 file changed, 75 insertions(+)

diff --git a/tests/phpunit/tests/interactivity-api/interactivity-api.php b/tests/phpunit/tests/interactivity-api/interactivity-api.php
index 9c86ca74aa018..5e6a8ce07fe68 100644
--- a/tests/phpunit/tests/interactivity-api/interactivity-api.php
+++ b/tests/phpunit/tests/interactivity-api/interactivity-api.php
@@ -52,12 +52,20 @@ class="interactive/block-' . $attributes['block'] . '"
 		);
 	}
 
+	/**
+	 * Tear down.
+	 */
 	public function tear_down() {
 		unregister_block_type( 'test/interactive-block' );
 		unregister_block_type( 'test/non-interactive-block' );
 		parent::tear_down();
 	}
 
+	/**
+	 * Tests processing of a single interactive block.
+	 *
+	 * @covers ::wp_interactivity_process_directives_of_interactive_blocks
+	 */
 	public function test_processs_directives_of_single_interactive_block() {
 		$post_content    = '<!-- wp:test/interactive-block { "block": 1 } /-->';
 		$rendered_blocks = do_blocks( $post_content );
@@ -66,11 +74,18 @@ public function test_processs_directives_of_single_interactive_block() {
 		$this->assertEquals( '1', $p->get_attribute( 'value' ) );
 	}
 
+	/**
+	 * Tests processing of multiple interactive blocks in parallel along with a
+	 * non-interactive block.
+	 *
+	 * @covers ::wp_interactivity_process_directives_of_interactive_blocks
+	 */
 	public function test_processs_directives_of_multiple_interactive_blocks_in_paralell() {
 		$post_content    = '
 			<!-- wp:test/interactive-block { "block": 1 } /-->
 			<!-- wp:test/interactive-block { "block": 2 } /-->
 			<!-- wp:test/non-interactive-block { "block": 3, "hasDirective": true } /-->
+			<!-- wp:test/interactive-block { "block": 4 } /-->
 		';
 		$rendered_blocks = do_blocks( $post_content );
 		$p               = new WP_HTML_Tag_Processor( $rendered_blocks );
@@ -80,8 +95,15 @@ public function test_processs_directives_of_multiple_interactive_blocks_in_paral
 		$this->assertEquals( '2', $p->get_attribute( 'value' ) );
 		$p->next_tag( array( 'class_name' => 'non-interactive/block-3' ) );
 		$this->assertNull( $p->get_attribute( 'value' ) );
+		$p->next_tag( array( 'class_name' => 'interactive/block-4' ) );
+		$this->assertEquals( '4', $p->get_attribute( 'value' ) );
 	}
 
+	/**
+	 * Tests processing of an interactive block inside a non-interactive block.
+	 *
+	 * @covers ::wp_interactivity_process_directives_of_interactive_blocks
+	 */
 	public function test_processs_directives_of_interactive_block_inside_non_interactive_block() {
 		$post_content    = '
 			<!-- wp:test/non-interactive-block { "block": 1 } -->
@@ -94,6 +116,12 @@ public function test_processs_directives_of_interactive_block_inside_non_interac
 		$this->assertEquals( '2', $p->get_attribute( 'value' ) );
 	}
 
+	/**
+	 * Tests processing of multiple interactive blocks nested inside a
+	 * non-interactive block.
+	 *
+	 * @covers ::wp_interactivity_process_directives_of_interactive_blocks
+	 */
 	public function test_processs_directives_of_multple_interactive_blocks_inside_non_interactive_block() {
 		$post_content    = '
 			<!-- wp:test/non-interactive-block { "block": 1 } -->
@@ -109,6 +137,12 @@ public function test_processs_directives_of_multple_interactive_blocks_inside_no
 		$this->assertEquals( '3', $p->get_attribute( 'value' ) );
 	}
 
+	/**
+	 * Tests processing of a single interactive block directive nested inside
+	 * multiple non-interactive blocks.
+	 *
+	 * @covers ::wp_interactivity_process_directives_of_interactive_blocks
+	 */
 	public function test_processs_directives_of_interactive_block_inside_multple_non_interactive_block() {
 		$post_content    = '
 			<!-- wp:test/non-interactive-block { "block": 1 } -->
@@ -126,6 +160,12 @@ public function test_processs_directives_of_interactive_block_inside_multple_non
 		$this->assertEquals( '4', $p->get_attribute( 'value' ) );
 	}
 
+	/**
+	 * Tests processing of directives for an interactive block containing a
+	 * non-interactive block without directives.
+	 *
+	 * @covers ::wp_interactivity_process_directives_of_interactive_blocks
+	 */
 	public function test_processs_directives_of_interactive_block_containing_non_interactive_block_without_directives() {
 		$post_content    = '
 			<!-- wp:test/interactive-block { "block": 1 } -->
@@ -140,6 +180,12 @@ public function test_processs_directives_of_interactive_block_containing_non_int
 		$this->assertNull( $p->get_attribute( 'value' ) );
 	}
 
+	/**
+	 * Tests processing of directives for an interactive block containing a
+	 * non-interactive block with directives.
+	 *
+	 * @covers ::wp_interactivity_process_directives_of_interactive_blocks
+	 */
 	public function test_processs_directives_of_interactive_block_containing_non_interactive_block_with_directives() {
 		$post_content    = '
 			<!-- wp:test/interactive-block { "block": 1 } -->
@@ -154,6 +200,13 @@ public function test_processs_directives_of_interactive_block_containing_non_int
 		$this->assertEquals( '1', $p->get_attribute( 'value' ) );
 	}
 
+	/**
+	 * Tests processing of directives for an interactive block containing nested
+	 * interactive and non-interactive blocks, checking proper propagation of
+	 * context.
+	 *
+	 * @covers ::wp_interactivity_process_directives_of_interactive_blocks
+	 */
 	public function test_processs_directives_of_interactive_block_containing_nested_interactive_and_non_interactive_blocks() {
 		$post_content    = '
 			<!-- wp:test/interactive-block { "block": 1 } -->
@@ -175,14 +228,36 @@ public function test_processs_directives_of_interactive_block_containing_nested_
 		$this->assertEquals( '1', $p->get_attribute( 'value' ) );
 	}
 
+	/**
+	 * Counter for the number of times the test directive processor is called.
+	 *
+	 * @var int
+	 */
 	private $data_wp_test_processor_count = 0;
 
+	/**
+	 * Test directive processor callback.
+	 *
+	 * Increments the $data_wp_test_processor_count every time a tag that is not a
+	 * tag closer is processed.
+	 *
+	 * @param WP_HTML_Tag_Processor $p Instance of the processor handling the current HTML tag.
+	 */
 	public function data_wp_test_processor( $p ) {
 		if ( ! $p->is_tag_closer() ) {
 			$this->data_wp_test_processor_count = $this->data_wp_test_processor_count + 1;
 		}
 	}
 
+	/**
+	 * Tests that directives are only processed once for the root interactive
+	 * blocks.
+	 *
+	 * This ensures that nested blocks do not trigger additional processing of the
+	 * same directives, leading to incorrect behavior or performance issues.
+	 *
+	 * @covers ::wp_interactivity_process_directives_of_interactive_blocks
+	 */
 	public function test_process_directives_only_process_the_root_interactive_blocks() {
 		$class                = new ReflectionClass( 'WP_Interactivity_API' );
 		$directive_processors = $class->getProperty( 'directive_processors' );

From 4100309b78482a4d7756eb876cad413d37c132c0 Mon Sep 17 00:00:00 2001
From: Luis Herranz <luisherranz@gmail.com>
Date: Thu, 1 Feb 2024 11:04:24 +0100
Subject: [PATCH 15/56] Add @ticket to all the tests

---
 .../interactivity-api/interactivity-api.php   | 20 +++++++
 .../wpInteractivityAPI-wp-bind.php            | 44 ++++++++++++++
 .../wpInteractivityAPI-wp-class.php           | 36 ++++++++++++
 .../wpInteractivityAPI-wp-context.php         | 46 +++++++++++++++
 .../wpInteractivityAPI-wp-interactive.php     | 18 ++++++
 .../wpInteractivityAPI-wp-style.php           | 42 ++++++++++++++
 .../wpInteractivityAPI-wp-text.php            | 30 ++++++++++
 .../interactivity-api/wpInteractivityAPI.php  | 58 ++++++++++++++++++-
 .../wpInteractivityAPIDirectivesProcessor.php | 38 ++++++++++++
 9 files changed, 330 insertions(+), 2 deletions(-)

diff --git a/tests/phpunit/tests/interactivity-api/interactivity-api.php b/tests/phpunit/tests/interactivity-api/interactivity-api.php
index 5e6a8ce07fe68..b6d3f52f47896 100644
--- a/tests/phpunit/tests/interactivity-api/interactivity-api.php
+++ b/tests/phpunit/tests/interactivity-api/interactivity-api.php
@@ -6,6 +6,8 @@
  * @package WordPress
  * @subpackage Interactivity API
  *
+ * @since 6.5.0
+ *
  * @group interactivity-api
  */
 class Tests_Interactivity_API_Functions extends WP_UnitTestCase {
@@ -64,6 +66,8 @@ public function tear_down() {
 	/**
 	 * Tests processing of a single interactive block.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::wp_interactivity_process_directives_of_interactive_blocks
 	 */
 	public function test_processs_directives_of_single_interactive_block() {
@@ -78,6 +82,8 @@ public function test_processs_directives_of_single_interactive_block() {
 	 * Tests processing of multiple interactive blocks in parallel along with a
 	 * non-interactive block.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::wp_interactivity_process_directives_of_interactive_blocks
 	 */
 	public function test_processs_directives_of_multiple_interactive_blocks_in_paralell() {
@@ -102,6 +108,8 @@ public function test_processs_directives_of_multiple_interactive_blocks_in_paral
 	/**
 	 * Tests processing of an interactive block inside a non-interactive block.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::wp_interactivity_process_directives_of_interactive_blocks
 	 */
 	public function test_processs_directives_of_interactive_block_inside_non_interactive_block() {
@@ -120,6 +128,8 @@ public function test_processs_directives_of_interactive_block_inside_non_interac
 	 * Tests processing of multiple interactive blocks nested inside a
 	 * non-interactive block.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::wp_interactivity_process_directives_of_interactive_blocks
 	 */
 	public function test_processs_directives_of_multple_interactive_blocks_inside_non_interactive_block() {
@@ -141,6 +151,8 @@ public function test_processs_directives_of_multple_interactive_blocks_inside_no
 	 * Tests processing of a single interactive block directive nested inside
 	 * multiple non-interactive blocks.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::wp_interactivity_process_directives_of_interactive_blocks
 	 */
 	public function test_processs_directives_of_interactive_block_inside_multple_non_interactive_block() {
@@ -164,6 +176,8 @@ public function test_processs_directives_of_interactive_block_inside_multple_non
 	 * Tests processing of directives for an interactive block containing a
 	 * non-interactive block without directives.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::wp_interactivity_process_directives_of_interactive_blocks
 	 */
 	public function test_processs_directives_of_interactive_block_containing_non_interactive_block_without_directives() {
@@ -184,6 +198,8 @@ public function test_processs_directives_of_interactive_block_containing_non_int
 	 * Tests processing of directives for an interactive block containing a
 	 * non-interactive block with directives.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::wp_interactivity_process_directives_of_interactive_blocks
 	 */
 	public function test_processs_directives_of_interactive_block_containing_non_interactive_block_with_directives() {
@@ -205,6 +221,8 @@ public function test_processs_directives_of_interactive_block_containing_non_int
 	 * interactive and non-interactive blocks, checking proper propagation of
 	 * context.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::wp_interactivity_process_directives_of_interactive_blocks
 	 */
 	public function test_processs_directives_of_interactive_block_containing_nested_interactive_and_non_interactive_blocks() {
@@ -256,6 +274,8 @@ public function data_wp_test_processor( $p ) {
 	 * This ensures that nested blocks do not trigger additional processing of the
 	 * same directives, leading to incorrect behavior or performance issues.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::wp_interactivity_process_directives_of_interactive_blocks
 	 */
 	public function test_process_directives_only_process_the_root_interactive_blocks() {
diff --git a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-bind.php b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-bind.php
index 7b82d728f0382..2c530e4faf817 100644
--- a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-bind.php
+++ b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-bind.php
@@ -6,6 +6,8 @@
  * @package WordPress
  * @subpackage Interactivity API
  *
+ * @since 6.5.0
+ *
  * @group interactivity-api
  */
 class Tests_WP_Interactivity_API_WP_Bind extends WP_UnitTestCase {
@@ -51,6 +53,8 @@ private function process_directives( $html ) {
 	/**
 	 * Tests setting an attribute via `data-wp-bind`.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_wp_bind_sets_attribute() {
@@ -62,6 +66,8 @@ public function test_wp_bind_sets_attribute() {
 	/**
 	 * Tests replacing an existing attribute via `data-wp-bind`.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_wp_bind_replaces_attribute() {
@@ -73,6 +79,8 @@ public function test_wp_bind_replaces_attribute() {
 	/**
 	 * Tests setting a numerical value as an attribute via `data-wp-bind`.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_wp_bind_sets_number_value() {
@@ -84,6 +92,8 @@ public function test_wp_bind_sets_number_value() {
 	/**
 	 * Tests that true strings are set properly as attribute values.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_wp_bind_sets_true_string() {
@@ -96,6 +106,8 @@ public function test_wp_bind_sets_true_string() {
 	/**
 	 * Tests that false strings are set properly as attribute values.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_wp_bind_sets_false_string() {
@@ -108,6 +120,8 @@ public function test_wp_bind_sets_false_string() {
 	/**
 	 * Tests that `data-wp-bind` ignores directives with no suffix.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_wp_bind_ignores_empty_bound_attribute() {
@@ -120,6 +134,8 @@ public function test_wp_bind_ignores_empty_bound_attribute() {
 	 * Tests that `data-wp-bind` does nothing when referencing non-existent
 	 * references.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_wp_bind_doesnt_do_anything_on_non_existent_references() {
@@ -131,6 +147,8 @@ public function test_wp_bind_doesnt_do_anything_on_non_existent_references() {
 	/**
 	 * Tests that `data-wp-bind` ignores directives with empty values.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_wp_bind_ignores_empty_value() {
@@ -142,6 +160,8 @@ public function test_wp_bind_ignores_empty_value() {
 	/**
 	 * Tests that `data-wp-bind` ignores directives without values.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_wp_bind_ignores_without_value() {
@@ -154,6 +174,8 @@ public function test_wp_bind_ignores_without_value() {
 	 * Tests that `data-wp-bind` works with multiple instances of the same
 	 * directive on a tag.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_wp_bind_works_with_multiple_same_directives() {
@@ -166,6 +188,8 @@ public function test_wp_bind_works_with_multiple_same_directives() {
 	 * Tests that `data-wp-bind` works with multiple instances of different
 	 * directives on a tag.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_wp_bind_works_with_multiple_different_directives() {
@@ -178,6 +202,8 @@ public function test_wp_bind_works_with_multiple_different_directives() {
 	/**
 	 * Tests adding boolean attributes to a tag using `data-wp-bind`.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_wp_bind_adds_boolean_attribute_if_true() {
@@ -191,6 +217,8 @@ public function test_wp_bind_adds_boolean_attribute_if_true() {
 	 * Tests replacing a pre-existing boolean attribute on a tag using
 	 * `data-wp-bind`.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_wp_bind_replaces_existing_attribute_if_true() {
@@ -204,6 +232,8 @@ public function test_wp_bind_replaces_existing_attribute_if_true() {
 	 * Tests that boolean attributes are not added when bound to false or null
 	 * values.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_wp_bind_doesnt_add_boolean_attribute_if_false_or_null() {
@@ -222,6 +252,8 @@ public function test_wp_bind_doesnt_add_boolean_attribute_if_false_or_null() {
 	 * Tests removing boolean attributes from a tag using `data-wp-bind` and a
 	 * false or null value.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_wp_bind_removes_boolean_attribute_if_false_or_null() {
@@ -238,6 +270,8 @@ public function test_wp_bind_removes_boolean_attribute_if_false_or_null() {
 	 * Tests adding values to aria or data attributes when the condition evaluates
 	 * to true.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_wp_bind_adds_value_if_true_in_aria_or_data_attributes() {
@@ -256,6 +290,8 @@ public function test_wp_bind_adds_value_if_true_in_aria_or_data_attributes() {
 	 * Tests replacing values in aria or data attributes when the condition
 	 * evaluates to true.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_wp_bind_replaces_value_if_true_in_aria_or_data_attributes() {
@@ -276,6 +312,8 @@ public function test_wp_bind_replaces_value_if_true_in_aria_or_data_attributes()
 	 * Tests adding the value 'false' to aria or data attributes when the
 	 * condition evaluates to false.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_wp_bind_adds_value_if_false_in_aria_or_data_attributes() {
@@ -294,6 +332,8 @@ public function test_wp_bind_adds_value_if_false_in_aria_or_data_attributes() {
 	 * Tests replacing values in aria or data attributes when the condition
 	 * evaluates to false.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_wp_bind_replaces_value_if_false_in_aria_or_data_attributes() {
@@ -311,6 +351,8 @@ public function test_wp_bind_replaces_value_if_false_in_aria_or_data_attributes(
 	/**
 	 * Tests removing values from aria or data attributes when the value is null.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_wp_bind_removes_value_if_null_in_aria_or_data_attributes() {
@@ -326,6 +368,8 @@ public function test_wp_bind_removes_value_if_null_in_aria_or_data_attributes()
 	/**
 	 * Tests handling of bindings within nested tags.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_wp_bind_handles_nested_bindings() {
diff --git a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-class.php b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-class.php
index 7484d7ea50ccc..54c9ee5af5e42 100644
--- a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-class.php
+++ b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-class.php
@@ -6,6 +6,8 @@
  * @package WordPress
  * @subpackage Interactivity API
  *
+ * @since 6.5.0
+ *
  * @group interactivity-api
  */
 class Tests_WP_Interactivity_API_WP_Class extends WP_UnitTestCase {
@@ -47,6 +49,8 @@ private function process_directives( $html ) {
 	/**
 	 * Tests that `data-wp-class` adds a class when the condition is true.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_wp_class_sets_class_name() {
@@ -59,6 +63,8 @@ public function test_wp_class_sets_class_name() {
 	 * Tests that `data-wp-class` can add multiple classes based on true
 	 * conditions.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_wp_class_sets_multiple_class_names() {
@@ -75,6 +81,8 @@ public function test_wp_class_sets_multiple_class_names() {
 	 * Tests handling of adding one and not adding another class based on
 	 * different boolean values.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_wp_class_handles_multiple_class_names_with_different_values() {
@@ -99,6 +107,8 @@ class="other-class"
 	/**
 	 * Tests that `data-wp-class` adds new classes alongside existing ones.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_wp_class_sets_class_name_when_class_attribute_exists() {
@@ -110,6 +120,8 @@ public function test_wp_class_sets_class_name_when_class_attribute_exists() {
 	/**
 	 * Tests that no class is added when the associated state is false.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_wp_class_doesnt_add_class_attribute_on_false() {
@@ -122,6 +134,8 @@ public function test_wp_class_doesnt_add_class_attribute_on_false() {
 	 * Tests that existing class names are preserved when the directive condition
 	 * is false.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_wp_class_doesnt_add_class_name_on_false() {
@@ -134,6 +148,8 @@ public function test_wp_class_doesnt_add_class_name_on_false() {
 	 * Tests that existing class names remain intact when they should be re-added
 	 * as per their directive.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_wp_class_keeps_class_name_when_class_name_exists() {
@@ -146,6 +162,8 @@ public function test_wp_class_keeps_class_name_when_class_name_exists() {
 	 * Tests preservation of existing class names, even when one is repeated in a
 	 * directive that evaluates to true.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_wp_class_keeps_class_name_when_class_name_exists_and_is_not_the_only_one() {
@@ -158,6 +176,8 @@ public function test_wp_class_keeps_class_name_when_class_name_exists_and_is_not
 	 * Tests that a class attribute with only one class name is removed when the
 	 * directive evaluates to false.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_wp_class_removes_class_attribute_when_class_name_exists_and_is_the_only_one() {
@@ -170,6 +190,8 @@ public function test_wp_class_removes_class_attribute_when_class_name_exists_and
 	 * Tests that one of several class names is removed when its directive
 	 * evaluates to false.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_wp_class_removes_class_name_when_class_name_exists_and_is_not_the_only_one() {
@@ -182,6 +204,8 @@ public function test_wp_class_removes_class_name_when_class_name_exists_and_is_n
 	 * Tests that an empty class attribute is not removed even if a directive
 	 * evaluates to false.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_wp_class_doesnt_remove_empty_class_attribute() {
@@ -194,6 +218,8 @@ public function test_wp_class_doesnt_remove_empty_class_attribute() {
 	 * Tests that the class attribute remains unchanged if the data-wp-class
 	 * suffix is empty.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_wp_class_doesnt_change_class_attribute_with_empty_directive_suffix() {
@@ -206,6 +232,8 @@ public function test_wp_class_doesnt_change_class_attribute_with_empty_directive
 	 * Tests that the class attribute is not altered if the value of the
 	 * `data-wp-class` directive is empty.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_wp_class_doesnt_change_class_attribute_with_empty_value() {
@@ -218,6 +246,8 @@ public function test_wp_class_doesnt_change_class_attribute_with_empty_value() {
 	 * Tests that an existing class attribute is not affected by a `data-wp-class`
 	 * directive without a value.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_wp_class_doesnt_change_class_attribute_without_value() {
@@ -230,6 +260,8 @@ public function test_wp_class_doesnt_change_class_attribute_without_value() {
 	 * Tests that multiple directives for the same class yield the correct result
 	 * when the condition is true.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_wp_class_works_with_multiple_directives() {
@@ -242,6 +274,8 @@ public function test_wp_class_works_with_multiple_directives() {
 	 * Tests setting class names based on truthy values other than just true
 	 * booleans.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_wp_class_sets_class_name_on_truthy_values() {
@@ -265,6 +299,8 @@ public function test_wp_class_sets_class_name_on_truthy_values() {
 	 * Tests that class attributes aren't set for falsy values other than just
 	 * false booleans.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_wp_class_sets_class_name_on_falsy_values() {
diff --git a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-context.php b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-context.php
index 0e0ef3c35f016..b56d38d05ec9b 100644
--- a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-context.php
+++ b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-context.php
@@ -6,6 +6,8 @@
  * @package WordPress
  * @subpackage Interactivity API
  *
+ * @since 6.5.0
+ *
  * @group interactivity-api
  */
 class Tests_WP_Interactivity_API_WP_Context extends WP_UnitTestCase {
@@ -41,6 +43,8 @@ private function process_directives( $html ) {
 	 * Tests that the `data-wp-context` directive can set a context in a custom
 	 * namespace.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_wp_context_directive_sets_a_context_in_a_custom_namespace() {
@@ -57,6 +61,8 @@ public function test_wp_context_directive_sets_a_context_in_a_custom_namespace()
 	 * Tests that the `data-wp-context` directive can set a context in the same
 	 * tag.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_wp_context_directive_can_set_a_context_in_the_same_tag() {
@@ -77,6 +83,8 @@ class="test"
 	 * Tests that the `data-wp-context` directive merges context in the same
 	 * custom namespace.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_wp_context_directive_merges_context_in_the_same_custom_namespace() {
@@ -98,6 +106,8 @@ public function test_wp_context_directive_merges_context_in_the_same_custom_name
 	 * Tests that the `data-wp-context` directive overwrites context in the same
 	 * custom namespace.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_wp_context_directive_overwrites_context_in_the_same_custom_namespace() {
@@ -116,6 +126,8 @@ public function test_wp_context_directive_overwrites_context_in_the_same_custom_
 	 * Tests that the `data-wp-context` directive replaces the old context after a
 	 * closing tag in the same custom namespace.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_wp_context_directive_replaces_old_context_after_closing_tag_in_the_same_custom_namespace() {
@@ -137,6 +149,8 @@ public function test_wp_context_directive_replaces_old_context_after_closing_tag
 	 * Tests that the `data-wp-context` directive merges context in different
 	 * custom namespaces.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_wp_context_directive_merges_context_in_different_custom_namespaces() {
@@ -158,6 +172,8 @@ public function test_wp_context_directive_merges_context_in_different_custom_nam
 	 * Tests that the `data-wp-context` directive doesn't throw on malformed
 	 * context objects.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_wp_context_directive_doesnt_throw_on_malformed_context_objects() {
@@ -174,6 +190,8 @@ public function test_wp_context_directive_doesnt_throw_on_malformed_context_obje
 	 * Tests that the `data-wp-context` directive doesn't overwrite context on
 	 * malformed context objects.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_wp_context_directive_doesnt_overwrite_context_on_malformed_context_objects() {
@@ -195,6 +213,8 @@ public function test_wp_context_directive_doesnt_overwrite_context_on_malformed_
 	 * Tests that the `data-wp-context` directive doesn't throw on an empty
 	 * context object.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_wp_context_directive_doesnt_throw_on_empty_context() {
@@ -211,6 +231,8 @@ public function test_wp_context_directive_doesnt_throw_on_empty_context() {
 	 * Tests that the `data-wp-context` directive doesn't overwrite the context on
 	 * empty context directive.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_wp_context_directive_doesnt_overwrite_context_on_empty_context() {
@@ -232,6 +254,8 @@ public function test_wp_context_directive_doesnt_overwrite_context_on_empty_cont
 	 * Tests that the `data-wp-context` directive doesn't throw on context without
 	 * value.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_wp_context_directive_doesnt_throw_on_context_without_value() {
@@ -248,6 +272,8 @@ public function test_wp_context_directive_doesnt_throw_on_context_without_value(
 	 * Tests that the `data-wp-context` directive doesn't overwrite context on
 	 * context without value.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_wp_context_directive_doesnt_overwrite_context_on_context_without_value() {
@@ -268,6 +294,8 @@ public function test_wp_context_directive_doesnt_overwrite_context_on_context_wi
 	/**
 	 * Tests that the `data-wp-context` directive works with multiple directives.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_wp_context_works_with_multiple_directives() {
@@ -284,6 +312,8 @@ public function test_wp_context_works_with_multiple_directives() {
 	 * Tests that the `data-wp-context` directive doesn't work without any
 	 * namespace.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_wp_context_directive_doesnt_work_without_any_namespace() {
@@ -299,6 +329,8 @@ public function test_wp_context_directive_doesnt_work_without_any_namespace() {
 	/**
 	 * Tests that the `data-wp-context` directive works with a default namespace.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_wp_context_directive_works_with_default_namespace() {
@@ -317,6 +349,8 @@ public function test_wp_context_directive_works_with_default_namespace() {
 	/**
 	 * Tests that the `data-wp-context` directive overrides a default namespace.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_wp_context_directive_overrides_default_namespace() {
@@ -338,6 +372,8 @@ public function test_wp_context_directive_overrides_default_namespace() {
 	 * Tests that the `data-wp-context` directive overrides the default namespace
 	 * with the same namespace.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_wp_context_directive_overrides_default_namespace_with_same_namespace() {
@@ -357,6 +393,8 @@ public function test_wp_context_directive_overrides_default_namespace_with_same_
 	 * Tests that the `data-wp-context` directive works with nested default
 	 * namespaces.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_wp_context_directive_works_with_nested_default_namespaces() {
@@ -388,6 +426,8 @@ public function test_wp_context_directive_works_with_nested_default_namespaces()
 	 * Tests that the `data-wp-context` directive works with a default namespace
 	 * in the same tag.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_wp_context_directive_works_with_default_namespace_in_the_same_tag() {
@@ -409,6 +449,8 @@ class="test"
 	 * Tests that the `data-wp-context` directive merges the context in the same
 	 * default namespace.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_wp_context_directive_merges_context_in_the_same_default_namespace() {
@@ -433,6 +475,8 @@ public function test_wp_context_directive_merges_context_in_the_same_default_nam
 	 * Tests that the `data-wp-context` directive overwrites context in the same
 	 * default namespace.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_wp_context_directive_overwrites_context_in_the_same_default_namespace() {
@@ -454,6 +498,8 @@ public function test_wp_context_directive_overwrites_context_in_the_same_default
 	 * Tests that the `data-wp-context` directive replaces the old context after
 	 * the closing tag in the same default namespace.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_wp_context_directive_replaces_old_context_after_closing_tag_in_the_same_default_namespace() {
diff --git a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-interactive.php b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-interactive.php
index d821c4504a513..45afb26382aa1 100644
--- a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-interactive.php
+++ b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-interactive.php
@@ -6,6 +6,8 @@
  * @package WordPress
  * @subpackage Interactivity API
  *
+ * @since 6.5.0
+ *
  * @group interactivity-api
  */
 class Tests_WP_Interactivity_API_WP_Interactive extends WP_UnitTestCase {
@@ -43,6 +45,8 @@ private function process_directives( $html ) {
 	 * Tests that a default namespace is applied when using the
 	 * `data-wp-interactive` directive.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_wp_interactive_sets_a_default_namespace() {
@@ -59,6 +63,8 @@ public function test_wp_interactive_sets_a_default_namespace() {
 	 * Tests that the most recent `data-wp-interactive` directive replaces the
 	 * previous default namespace.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_wp_interactive_replaces_the_previous_default_namespace() {
@@ -80,6 +86,8 @@ public function test_wp_interactive_replaces_the_previous_default_namespace() {
 	 * Tests that a `data-wp-interactive` directive without a namespace does not
 	 * replace the previously established default namespace.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_wp_interactive_without_namespace_doesnt_replace_the_previous_default_namespace() {
@@ -101,6 +109,8 @@ public function test_wp_interactive_without_namespace_doesnt_replace_the_previou
 	 * Tests that an empty value for `data-wp-interactive` does not replace the
 	 * previously established default namespace.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_wp_interactive_with_empty_value_doesnt_replace_the_previous_default_namespace() {
@@ -122,6 +132,8 @@ public function test_wp_interactive_with_empty_value_doesnt_replace_the_previous
 	 * Tests that a `data-wp-interactive` directive with no assigned value does
 	 * not replace the previously established default namespace.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_wp_interactive_without_value_doesnt_replace_the_previous_default_namespace() {
@@ -142,6 +154,8 @@ public function test_wp_interactive_without_value_doesnt_replace_the_previous_de
 	/**
 	 * Tests that multiple `data-wp-interactive` directives work correctly.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_wp_interactive_works_with_multiple_directives() {
@@ -158,6 +172,8 @@ public function test_wp_interactive_works_with_multiple_directives() {
 	 * Tests that a custom namespace can override the default one provided by a
 	 * `data-wp-interactive` directive.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_wp_interactive_namespace_can_be_override_by_custom_one() {
@@ -174,6 +190,8 @@ public function test_wp_interactive_namespace_can_be_override_by_custom_one() {
 	 * Tests that the `data-wp-interactive` setting is reset appropriately after a
 	 * closing HTML tag.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_wp_interactive_set_is_unset_on_closing_tag() {
diff --git a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-style.php b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-style.php
index ce224787d8753..b3b64f160d85b 100644
--- a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-style.php
+++ b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-style.php
@@ -6,6 +6,8 @@
  * @package WordPress
  * @subpackage Interactivity API
  *
+ * @since 6.5.0
+ *
  * @group interactivity-api
  */
 class Tests_WP_Interactivity_API_WP_Style extends WP_UnitTestCase {
@@ -50,6 +52,8 @@ private function set_style_property( $style_attribute_value, $style_property_nam
 	/**
 	 * Tests that `set_style_property` correctly sets style properties.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::set_style_property
 	 */
 	public function test_set_style_property_sets_properties() {
@@ -102,6 +106,8 @@ public function test_set_style_property_sets_properties() {
 	 * Tests that `set_style_property` works correctly with falsy values, removing
 	 * or ignoring them as appropriate.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::set_style_property
 	 */
 	public function test_set_style_property_with_falsy_values() {
@@ -155,6 +161,8 @@ private function process_directives( $html ) {
 	 * Tests that the `data-wp-style` directive sets a style attribute with
 	 * correct property and value.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_wp_style_sets_style_attribute() {
@@ -167,6 +175,8 @@ public function test_wp_style_sets_style_attribute() {
 	 * Tests that the `data-wp-style` directive applies multiple style properties
 	 * correctly.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_wp_style_sets_multiple_style_properties() {
@@ -183,6 +193,8 @@ public function test_wp_style_sets_multiple_style_properties() {
 	 * Tests that the `data-wp-style` directive correctly handles different style
 	 * property values.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_wp_style_sets_multiple_style_properties_with_different_values() {
@@ -208,6 +220,8 @@ public function test_wp_style_sets_multiple_style_properties_with_different_valu
 	 * Tests that the `data-wp-style` directive sets a new style property when
 	 * another already exists.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_wp_style_sets_style_property_when_style_attribute_exists() {
@@ -220,6 +234,8 @@ public function test_wp_style_sets_style_property_when_style_attribute_exists()
 	 * Tests that the `data-wp-style` directive overwrites an existing style
 	 * property with a new value.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_wp_style_overwrites_style_property_when_style_property_exists() {
@@ -232,6 +248,8 @@ public function test_wp_style_overwrites_style_property_when_style_property_exis
 	 * Tests that the `data-wp-style` directive doesn't add a style property when
 	 * the directive value is false.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_wp_style_doesnt_add_style_attribute_on_false() {
@@ -244,6 +262,8 @@ public function test_wp_style_doesnt_add_style_attribute_on_false() {
 	 * Tests that the `data-wp-style` directive doesn't modify existing style
 	 * properties when directive value is false.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_wp_style_doesnt_add_style_property_on_false() {
@@ -256,6 +276,8 @@ public function test_wp_style_doesnt_add_style_property_on_false() {
 	 * Tests that the `data-wp-style` directive keeps an existing style property
 	 * with a matching value.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_wp_style_keeps_style_property_when_style_property_exists() {
@@ -268,6 +290,8 @@ public function test_wp_style_keeps_style_property_when_style_property_exists()
 	 * Tests that the `data-wp-style` directive maintains style properties even
 	 * when they aren't the only ones present.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_wp_style_keeps_style_property_when_style_property_exists_and_is_not_the_only_one() {
@@ -280,6 +304,8 @@ public function test_wp_style_keeps_style_property_when_style_property_exists_an
 	 * Tests that the `data-wp-style` directive removes the style attribute when
 	 * it contains only one property which is being removed.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_wp_style_removes_style_attribute_when_style_property_exists_and_is_the_only_one() {
@@ -292,6 +318,8 @@ public function test_wp_style_removes_style_attribute_when_style_property_exists
 	 * Tests that the `data-wp-style` directive removes a style property when it's
 	 * not the only one present and the directive value is false.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_wp_style_removes_style_property_when_style_property_exists_and_is_not_the_only_one() {
@@ -304,6 +332,8 @@ public function test_wp_style_removes_style_property_when_style_property_exists_
 	 * Tests that the `data-wp-style` directive does not remove an empty style
 	 * attribute.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_wp_style_doesnt_remove_empty_style_attribute() {
@@ -316,6 +346,8 @@ public function test_wp_style_doesnt_remove_empty_style_attribute() {
 	 * Tests that the `data-wp-style` directive does not change the style
 	 * attribute when the directive suffix is empty.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_wp_style_doesnt_change_style_attribute_with_empty_directive_suffix() {
@@ -328,6 +360,8 @@ public function test_wp_style_doesnt_change_style_attribute_with_empty_directive
 	 * Tests that the `data-wp-style` directive does not change the style
 	 * attribute when the value of the directive is empty.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_wp_style_doesnt_change_style_attribute_with_empty_value() {
@@ -340,6 +374,8 @@ public function test_wp_style_doesnt_change_style_attribute_with_empty_value() {
 	 * Tests that the `data-wp-style` directive doesn't apply changes if no value
 	 * is provided for the style property.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_wp_style_doesnt_change_style_attribute_without_value() {
@@ -352,6 +388,8 @@ public function test_wp_style_doesnt_change_style_attribute_without_value() {
 	 * Tests that the `data-wp-style` directive functions correctly with multiple
 	 * identical directives.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_wp_style_works_with_multiple_directives() {
@@ -364,6 +402,8 @@ public function test_wp_style_works_with_multiple_directives() {
 	 * Tests that the `data-wp-style` directive doesn't apply any changes when the
 	 * state value is true.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_wp_style_doesnt_do_anything_on_true_values() {
@@ -377,6 +417,8 @@ public function test_wp_style_doesnt_do_anything_on_true_values() {
 	 * Tests that the `data-wp-style` directive doesn't add a style property for
 	 * various falsy values in the state.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_wp_style_doesnt_add_style_property_on_falsy_values() {
diff --git a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-text.php b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-text.php
index f5b570a197a29..b33ad7c82761f 100644
--- a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-text.php
+++ b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-text.php
@@ -6,6 +6,8 @@
  * @package WordPress
  * @subpackage Interactivity API
  *
+ * @since 6.5.0
+ *
  * @group interactivity-api
  */
 class Tests_WP_Interactivity_API_WP_Text extends WP_UnitTestCase {
@@ -27,6 +29,10 @@ public function set_up() {
 
 	/**
 	 * Tests that the `data-wp-text` directive sets inner text content.
+	 *
+	 * @ticket 60356
+	 *
+	 * @covers ::process_directives
 	 */
 	public function test_wp_text_sets_inner_content() {
 		$html     = '<div data-wp-text="myPlugin::state.text">Text</div>';
@@ -36,6 +42,10 @@ public function test_wp_text_sets_inner_content() {
 
 	/**
 	 * Tests that the `data-wp-text` directive works with numerical values.
+	 *
+	 * @ticket 60356
+	 *
+	 * @covers ::process_directives
 	 */
 	public function test_wp_text_sets_inner_content_numbers() {
 		$this->interactivity->state( 'myPlugin', array( 'number' => 100 ) );
@@ -47,6 +57,10 @@ public function test_wp_text_sets_inner_content_numbers() {
 	/**
 	 * Tests that the `data-wp-text` directive removes inner text content when the
 	 * state is not a string or number.
+	 *
+	 * @ticket 60356
+	 *
+	 * @covers ::process_directives
 	 */
 	public function test_wp_text_removes_inner_content_on_types_that_are_not_strings_or_numbers() {
 		$this->interactivity->state(
@@ -83,6 +97,10 @@ public function test_wp_text_removes_inner_content_on_types_that_are_not_strings
 	/**
 	 * Tests that the `data-wp-text` directive overwrites entire inner content,
 	 * including nested tags.
+	 *
+	 * @ticket 60356
+	 *
+	 * @covers ::process_directives
 	 */
 	public function test_wp_text_sets_inner_content_with_nested_tags() {
 		$html     = '<div data-wp-text="myPlugin::state.text"><div><div>Text</div><div>Another text</div></div></div>';
@@ -93,6 +111,10 @@ public function test_wp_text_sets_inner_content_with_nested_tags() {
 	/**
 	 * Tests that the `data-wp-text` directive works even with unbalanced tags
 	 * when they are different tags (div -> unbalanced span).
+	 *
+	 * @ticket 60356
+	 *
+	 * @covers ::process_directives
 	 */
 	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>';
@@ -103,6 +125,10 @@ public function test_wp_text_sets_inner_content_even_with_unbalanced_but_differe
 	/**
 	 * Tests that the `data-wp-text` fails to overwrite inner content if there are
 	 * unbalanced when they are the same tags (div -> unbalanced div).
+	 *
+	 * @ticket 60356
+	 *
+	 * @covers ::process_directives
 	 */
 	public function test_wp_text_fails_with_unbalanced_and_same_tags_inside_content() {
 		$html     = '<div data-wp-text="myPlugin::state.text">Text<div></div>';
@@ -113,6 +139,10 @@ public function test_wp_text_fails_with_unbalanced_and_same_tags_inside_content(
 	/**
 	 * Tests that the `data-wp-text` directive cannot set inner HTML content and
 	 * it will be encoded as text.
+	 *
+	 * @ticket 60356
+	 *
+	 * @covers ::process_directives
 	 */
 	public function test_wp_text_cant_set_inner_html_in_the_content() {
 		$this->interactivity->state( 'myPlugin', array( 'text' => '<span>Updated</span>' ) );
diff --git a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI.php b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI.php
index 719f9592563c3..cd8f3bdef302d 100644
--- a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI.php
+++ b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI.php
@@ -5,6 +5,8 @@
  * @package WordPress
  * @subpackage Interactivity API
  *
+ * @since 6.5.0
+ *
  * @group interactivity-api
  *
  * @coversDefaultClass WP_Interactivity_API
@@ -29,6 +31,8 @@ public function set_up() {
 	 * Tests that the state and config methods return an empty array at the
 	 * beginning.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::state
 	 * @covers ::config
 	 */
@@ -41,6 +45,8 @@ public function test_state_and_config_should_be_empty() {
 	 * Tests that the state and config methods can change the state and
 	 * configuration.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::state
 	 * @covers ::config
 	 */
@@ -59,6 +65,8 @@ public function test_state_and_config_can_be_changed() {
 	/**
 	 * Tests that different initial states and configurations can be merged.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::state
 	 * @covers ::config
 	 */
@@ -97,6 +105,8 @@ public function test_state_and_config_can_be_merged() {
 	 * Tests that existing keys in the initial state and configuration can be
 	 * overwritten.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::state
 	 * @covers ::config
 	 */
@@ -120,6 +130,8 @@ public function test_state_and_config_existing_props_can_be_overwritten() {
 	 * Tests that existing indexed arrays in the initial state and configuration
 	 * are replaced, not merged.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::state
 	 * @covers ::config
 	 */
@@ -155,6 +167,10 @@ private function print_client_interactivity_data() {
 	 * Tests that the initial state and config are correctly printed on the
 	 * client-side.
 	 *
+	 * @ticket 60356
+	 *
+	 * @covers ::state
+	 * @covers ::config
 	 * @covers ::print_client_interactivity_data
 	 */
 	public function test_state_and_config_is_correctly_printed() {
@@ -183,6 +199,8 @@ public function test_state_and_config_is_correctly_printed() {
 	 * Tests that the wp-interactivity-data script is not printed if both state
 	 * and config are empty.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::print_client_interactivity_data
 	 */
 	public function test_state_and_config_dont_print_when_empty() {
@@ -193,6 +211,9 @@ public function test_state_and_config_dont_print_when_empty() {
 	/**
 	 * Tests that the config is not printed if it's empty.
 	 *
+	 * @ticket 60356
+	 *
+	 * @covers ::state
 	 * @covers ::print_client_interactivity_data
 	 */
 	public function test_config_not_printed_when_empty() {
@@ -204,6 +225,9 @@ public function test_config_not_printed_when_empty() {
 	/**
 	 * Tests that the state is not printed if it's empty.
 	 *
+	 * @ticket 60356
+	 *
+	 * @covers ::config
 	 * @covers ::print_client_interactivity_data
 	 */
 	public function test_state_not_printed_when_empty() {
@@ -218,6 +242,10 @@ public function test_state_not_printed_when_empty() {
 	 * Tests that special characters in the initial state and configuration are
 	 * properly escaped.
 	 *
+	 * @ticket 60356
+	 *
+	 * @covers ::state
+	 * @covers ::config
 	 * @covers ::print_client_interactivity_data
 	 */
 	public function test_state_and_config_escape_special_characters() {
@@ -236,6 +264,8 @@ public function test_state_and_config_escape_special_characters() {
 	/**
 	 * Tests extracting directive values from different string formats.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::extract_directive_value
 	 */
 	public function test_extract_directive_value() {
@@ -297,6 +327,8 @@ public function test_extract_directive_value() {
 	/**
 	 * Tests extracting directive values with empty or invalid input.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::extract_directive_value
 	 */
 	public function test_extract_directive_value_empty_values() {
@@ -329,6 +361,8 @@ public function test_extract_directive_value_empty_values() {
 	/**
 	 * Tests extracting directive values from invalid JSON strings.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::extract_directive_value
 	 */
 	public function test_extract_directive_value_invalid_json() {
@@ -348,6 +382,8 @@ public function test_extract_directive_value_invalid_json() {
 	 * Tests the ability to extract prefix and suffix from a directive attribute
 	 * name.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::extract_prefix_and_suffix
 	 */
 	public function test_extract_prefix_and_suffix() {
@@ -368,6 +404,8 @@ public function test_extract_prefix_and_suffix() {
 	 * Tests that the `process_directives` method doesn't change the HTML if it
 	 * doesn't contain directives.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_process_directives_do_nothing_without_directives() {
@@ -384,6 +422,8 @@ public function test_process_directives_do_nothing_without_directives() {
 	 * Tests that the `process_directives` method changes the HTML if it contains
 	 * directives.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_process_directives_changes_html_with_balanced_tags() {
@@ -398,6 +438,8 @@ public function test_process_directives_changes_html_with_balanced_tags() {
 	/**
 	 * Tests how `process_directives` handles HTML with unknown directives.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_process_directives_doesnt_fail_with_unknown_directives() {
@@ -409,6 +451,8 @@ public function test_process_directives_doesnt_fail_with_unknown_directives() {
 	/**
 	 * Tests that directives are processed in the correct order.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_process_directives_process_the_directives_in_the_correct_order() {
@@ -435,6 +479,8 @@ public function test_process_directives_process_the_directives_in_the_correct_or
 	 * Tests that the `process_directives` returns the same HTML if it contains
 	 * unbalanced tags.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::process_directives
 	 */
 	public function test_process_directives_doesnt_change_html_if_contains_unbalanced_tags() {
@@ -488,6 +534,8 @@ private function evaluate( $directive_value ) {
 	/**
 	 * Tests that the `evaluate` method operates correctly for valid expressions.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::evaluate
 	 */
 	public function test_evaluate_value() {
@@ -505,8 +553,10 @@ public function test_evaluate_value() {
 	}
 
 	/**
-	 * Tests that the `evaluate` method operates correctly when used with negation
-	 * (!).
+	 * Tests that the `evaluate` method operates correctly when used with the
+	 * negation operator (!).
+	 *
+	 * @ticket 60356
 	 *
 	 * @covers ::evaluate
 	 */
@@ -527,6 +577,8 @@ public function test_evaluate_value_negation() {
 	/**
 	 * Tests the `evaluate` method with non-existent paths.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::evaluate
 	 */
 	public function test_evaluate_non_existent_path() {
@@ -552,6 +604,8 @@ public function test_evaluate_non_existent_path() {
 	/**
 	 * Tests the `evaluate` method for retrieving nested values.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::evaluate
 	 */
 	public function test_evaluate_nested_value() {
diff --git a/tests/phpunit/tests/interactivity-api/wpInteractivityAPIDirectivesProcessor.php b/tests/phpunit/tests/interactivity-api/wpInteractivityAPIDirectivesProcessor.php
index aa1ee999fd58f..7fd8b8e00f18c 100644
--- a/tests/phpunit/tests/interactivity-api/wpInteractivityAPIDirectivesProcessor.php
+++ b/tests/phpunit/tests/interactivity-api/wpInteractivityAPIDirectivesProcessor.php
@@ -5,6 +5,8 @@
  * @package WordPress
  * @subpackage Interactivity API
  *
+ * @since 6.5.0
+ *
  * @group interactivity-api
  *
  * @coversDefaultClass WP_Interactivity_API_Directives_Processor
@@ -13,6 +15,8 @@ class Tests_WP_Interactivity_API_Directives_Processor extends WP_UnitTestCase {
 	/**
 	 * Tests the `get_content_between_balanced_tags` method on standard tags.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::get_content_between_balanced_tags
 	 */
 	public function test_get_content_between_balanced_tags_standard_tags() {
@@ -32,6 +36,8 @@ public function test_get_content_between_balanced_tags_standard_tags() {
 	/**
 	 * Tests the `get_content_between_balanced_tags` method on an empty tag.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::get_content_between_balanced_tags
 	 */
 	public function test_get_content_between_balanced_tags_empty_tag() {
@@ -45,6 +51,8 @@ public function test_get_content_between_balanced_tags_empty_tag() {
 	 * Tests the `get_content_between_balanced_tags` method with a self-closing
 	 * tag.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::get_content_between_balanced_tags
 	 */
 	public function test_get_content_between_balanced_tags_self_closing_tag() {
@@ -57,6 +65,8 @@ public function test_get_content_between_balanced_tags_self_closing_tag() {
 	/**
 	 * Tests the `get_content_between_balanced_tags` method with nested tags.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::get_content_between_balanced_tags
 	 */
 	public function test_get_content_between_balanced_tags_nested_tags() {
@@ -75,6 +85,8 @@ public function test_get_content_between_balanced_tags_nested_tags() {
 	 * Tests the `get_content_between_balanced_tags` method when no tags are
 	 * present.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::get_content_between_balanced_tags
 	 */
 	public function test_get_content_between_balanced_tags_no_tags() {
@@ -87,6 +99,8 @@ public function test_get_content_between_balanced_tags_no_tags() {
 	/**
 	 * Tests the `get_content_between_balanced_tags` method with unbalanced tags.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::get_content_between_balanced_tags
 	 */
 	public function test_get_content_between_balanced_tags_with_unbalanced_tags() {
@@ -116,6 +130,8 @@ public function test_get_content_between_balanced_tags_with_unbalanced_tags() {
 	 * Tests the `get_content_between_balanced_tags` method when called on a
 	 * closing tag.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::get_content_between_balanced_tags
 	 */
 	public function test_get_content_between_balanced_tags_on_closing_tag() {
@@ -129,6 +145,8 @@ public function test_get_content_between_balanced_tags_on_closing_tag() {
 	/**
 	 * Tests the `set_content_between_balanced_tags` method on standard tags.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::set_content_between_balanced_tags
 	 */
 	public function test_set_content_between_balanced_tags_standard_tags() {
@@ -155,6 +173,8 @@ public function test_set_content_between_balanced_tags_standard_tags() {
 	 * Tests the `set_content_between_balanced_tags` method when called on a
 	 * closing tag.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::set_content_between_balanced_tags
 	 */
 	public function test_set_content_between_balanced_tags_on_closing_tag() {
@@ -171,6 +191,8 @@ public function test_set_content_between_balanced_tags_on_closing_tag() {
 	 * Tests the `set_content_between_balanced_tags` method on multiple calls to
 	 * the same tag.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::set_content_between_balanced_tags
 	 */
 	public function test_set_content_between_balanced_tags_multiple_calls_in_same_tag() {
@@ -189,6 +211,8 @@ public function test_set_content_between_balanced_tags_multiple_calls_in_same_ta
 	 * Tests the `set_content_between_balanced_tags` method on combinations with
 	 * set_attribute calls.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::set_content_between_balanced_tags
 	 */
 	public function test_set_content_between_balanced_tags_with_set_attribute() {
@@ -213,6 +237,8 @@ public function test_set_content_between_balanced_tags_with_set_attribute() {
 	 * Tests the `set_content_between_balanced_tags` method where the existing
 	 * content includes tags.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::set_content_between_balanced_tags
 	 */
 	public function test_set_content_between_balanced_tags_with_existing_tags() {
@@ -228,6 +254,8 @@ public function test_set_content_between_balanced_tags_with_existing_tags() {
 	 * Tests the `set_content_between_balanced_tags` method where the new content
 	 * includes tags.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::set_content_between_balanced_tags
 	 */
 	public function test_set_content_between_balanced_tags_with_new_tags() {
@@ -242,6 +270,8 @@ public function test_set_content_between_balanced_tags_with_new_tags() {
 	/**
 	 * Tests the `set_content_between_balanced_tags` method with an empty string.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::set_content_between_balanced_tags
 	 */
 	public function test_set_content_between_balanced_tags_empty() {
@@ -263,6 +293,8 @@ public function test_set_content_between_balanced_tags_empty() {
 	/**
 	 * Tests the `set_content_between_balanced_tags` method on self-closing tags.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::set_content_between_balanced_tags
 	 */
 	public function test_set_content_between_balanced_tags_self_closing_tag() {
@@ -277,6 +309,8 @@ public function test_set_content_between_balanced_tags_self_closing_tag() {
 	/**
 	 * Tests the `set_content_between_balanced_tags` method on a non-existent tag.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::set_content_between_balanced_tags
 	 */
 	public function test_set_content_between_balanced_tags_non_existent_tag() {
@@ -291,6 +325,8 @@ public function test_set_content_between_balanced_tags_non_existent_tag() {
 	/**
 	 * Tests the `set_content_between_balanced_tags` method with unbalanced tags.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::set_content_between_balanced_tags
 	 */
 	public function test_set_content_between_balanced_tags_with_unbalanced_tags() {
@@ -329,6 +365,8 @@ public function test_set_content_between_balanced_tags_with_unbalanced_tags() {
 	/**
 	 * Tests the is_void method.
 	 *
+	 * @ticket 60356
+	 *
 	 * @covers ::is_void
 	 */
 	public function test_is_void_element() {

From 69c6f78bd2a26246d0980497931042b43f8cad85 Mon Sep 17 00:00:00 2001
From: Luis Herranz <luisherranz@gmail.com>
Date: Thu, 1 Feb 2024 11:16:56 +0100
Subject: [PATCH 16/56] Switch from static to global and move hooks/modules to
 settings

---
 .../interactivity-api/interactivity-api.php     | 17 ++++++++---------
 src/wp-settings.php                             |  2 ++
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/wp-includes/interactivity-api/interactivity-api.php b/src/wp-includes/interactivity-api/interactivity-api.php
index eadd40eee1f22..dbb7fe192c404 100644
--- a/src/wp-includes/interactivity-api/interactivity-api.php
+++ b/src/wp-includes/interactivity-api/interactivity-api.php
@@ -68,21 +68,20 @@ function wp_interactivity_process_directives_of_interactive_blocks( array $parse
  * Retrieves the main WP_Interactivity_API instance.
  *
  * It provides access to the WP_Interactivity_API instance, creating one if it
- * doesn't exist yet. It also registers the hooks and necessary script
- * modules.
+ * doesn't exist yet.
+ *
+ * @global WP_Interactivity_API $wp_interactivity
  *
  * @since 6.5.0
  *
  * @return WP_Interactivity_API The main WP_Interactivity_API instance.
  */
-function wp_interactivity() {
-	static $instance = null;
-	if ( is_null( $instance ) ) {
-		$instance = new WP_Interactivity_API();
-		$instance->add_hooks();
-		$instance->register_script_modules();
+function wp_interactivity(): WP_Interactivity_API {
+	global $wp_interactivity;
+	if ( ! ( $wp_interactivity instanceof WP_Interactivity_API ) ) {
+		$wp_interactivity = new WP_Interactivity_API();
 	}
-	return $instance;
+	return $wp_interactivity;
 }
 
 /**
diff --git a/src/wp-settings.php b/src/wp-settings.php
index 60e8e480e3e60..be1a2d2a2873f 100644
--- a/src/wp-settings.php
+++ b/src/wp-settings.php
@@ -381,6 +381,8 @@
 require ABSPATH . WPINC . '/interactivity-api/interactivity-api.php';
 
 wp_script_modules()->add_hooks();
+wp_interactivity()->add_hooks();
+wp_interactivity()->register_script_modules();
 
 $GLOBALS['wp_embed'] = new WP_Embed();
 

From 5462b18b5868e49ac860aee6c8006e810401178b Mon Sep 17 00:00:00 2001
From: Luis Herranz <luisherranz@gmail.com>
Date: Thu, 1 Feb 2024 12:34:50 +0100
Subject: [PATCH 17/56] Bail out if it finds an SVG or MathML tag

---
 .../class-wp-interactivity-api.php            |  7 ++-
 .../interactivity-api/wpInteractivityAPI.php  | 48 +++++++++++++++++++
 2 files changed, 54 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 47fde31587b7c..eaabe2d02abda 100644
--- a/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
+++ b/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
@@ -191,6 +191,11 @@ public function process_directives( string $html ): string {
 		while ( $p->next_tag( array( 'tag_closers' => 'visit' ) ) && false === $unbalanced ) {
 			$tag_name = $p->get_tag();
 
+			if ( 'SVG' === $tag_name || 'MATH' === $tag_name ) {
+				$unbalanced = true;
+				break;
+			}
+
 			if ( $p->is_tag_closer() ) {
 				list( $opening_tag_name, $directives_prefixes ) = end( $tag_stack );
 
@@ -202,7 +207,7 @@ public function process_directives( string $html ): string {
 					 * stops processing it.
 					 */
 					$unbalanced = true;
-					continue;
+					break;
 				} else {
 					// Remove the last tag from the stack.
 					array_pop( $tag_stack );
diff --git a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI.php b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI.php
index cd8f3bdef302d..e61f0809fdfc1 100644
--- a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI.php
+++ b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI.php
@@ -507,6 +507,54 @@ public function test_process_directives_doesnt_change_html_if_contains_unbalance
 		}
 	}
 
+	/**
+	 * Tests that the `process_directives` returns the same HTML if it finds an
+	 * SVG tag.
+	 *
+	 * @ticket 60356
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_process_directives_doesnt_change_html_if_contains_svgs() {
+		$this->interactivity->state( 'myPlugin', array( 'id' => 'some-id' ) );
+		$html           = '
+			<div data-wp-bind--id="myPlugin::state.id">
+				<svg height="100" width="100">
+					<circle cx="50" cy="50" r="40" stroke="black" stroke-width="3" fill="red" />
+				</svg> 
+			</div>
+		';
+		$processed_html = $this->interactivity->process_directives( $html );
+		$p              = new WP_HTML_Tag_Processor( $processed_html );
+		$p->next_tag();
+		$this->assertNull( $p->get_attribute( 'id' ) );
+	}
+
+	/**
+	 * Tests that the `process_directives` returns the same HTML if it finds an
+	 * MathML tag.
+	 *
+	 * @ticket 60356
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_process_directives_doesnt_change_html_if_contains_math() {
+		$this->interactivity->state( 'myPlugin', array( 'id' => 'some-id' ) );
+		$html           = '
+			<div data-wp-bind--id="myPlugin::state.id">
+				<math>
+					<mi>x</mi>
+					<mo>=</mo>
+					<mi>1</mi>
+				</math>
+			</div>
+		';
+		$processed_html = $this->interactivity->process_directives( $html );
+		$p              = new WP_HTML_Tag_Processor( $processed_html );
+		$p->next_tag();
+		$this->assertNull( $p->get_attribute( 'id' ) );
+	}
+
 	/**
 	 * Invokes the private `evaluate` method of WP_Interactivity_API class.
 	 *

From 6dc2d42600e903e9527aacea4c83fb42bbeb1768 Mon Sep 17 00:00:00 2001
From: Luis Herranz <luisherranz@gmail.com>
Date: Fri, 2 Feb 2024 12:13:12 +0100
Subject: [PATCH 18/56] Check for tags that don't visit their closer tag

---
 ...interactivity-api-directives-processor.php | 34 +++++++++++++++----
 .../class-wp-interactivity-api.php            |  6 ++--
 .../wpInteractivityAPIDirectivesProcessor.php | 32 ++++++++++-------
 3 files changed, 50 insertions(+), 22 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 bf2d30964a931..c2d44077ef3e8 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
@@ -16,6 +16,24 @@
  * @access private
  */
 class WP_Interactivity_API_Directives_Processor extends WP_HTML_Tag_Processor {
+	/**
+	 * List of thags whose closer tag is not visited by the WP_HTML_Tag_Processor.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @var string[]
+	 */
+	const TAGS_THAT_DONT_VISIT_CLOSER_TAG = array(
+		'SCRIPT',
+		'IFRAME',
+		'NOEMBED',
+		'NOFRAMES',
+		'STYLE',
+		'TEXTAREA',
+		'TITLE',
+		'XMP',
+	);
+
 	/**
 	 * Returns the content between two balanced tags.
 	 *
@@ -101,9 +119,10 @@ private function get_balanced_tag_bookmarks() {
 	 * Finds the matching closing tag for an opening tag.
 	 *
 	 * When called while the processor is on an open tag, it traverses the HTML
-	 * until it finds the matching closing tag, respecting any in-between content,
+	 * until it finds the matching closer tag, respecting any in-between content,
 	 * including nested tags of the same name. Returns false when called on a
-	 * closing or void tag, or if no matching closing tag was found.
+	 * closer tag, a tag that doesn't have a closer tag (void), a tag that
+	 * doesn't visit the closer tag, or if no matching closing tag was found.
 	 *
 	 * @since 6.5.0
 	 *
@@ -113,7 +132,7 @@ private function next_balanced_closer(): bool {
 		$depth    = 0;
 		$tag_name = $this->get_tag();
 
-		if ( $this->is_void() ) {
+		if ( ! $this->has_and_visits_its_closer_tag() ) {
 			return false;
 		}
 
@@ -139,16 +158,17 @@ private function next_balanced_closer(): bool {
 	}
 
 	/**
-	 * Checks whether the current tag is void.
+	 * Checks whether the current tag has and visits a closer tag.
 	 *
 	 * @since 6.5.0
 	 *
 	 * @access private
 	 *
-	 * @return bool Whether the current tag is void or not.
+	 * @return bool Whether the current tag has a closer tag.
 	 */
-	public function is_void(): bool {
+	public function has_and_visits_its_closer_tag(): bool {
 		$tag_name = $this->get_tag();
-		return WP_HTML_Processor::is_void( null !== $tag_name ? $tag_name : '' );
+		return ! WP_HTML_Processor::is_void( null !== $tag_name ? $tag_name : '' ) &&
+			! in_array( $tag_name, self::TAGS_THAT_DONT_VISIT_CLOSER_TAG, true );
 	}
 }
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 eaabe2d02abda..a3c7882cad8f6 100644
--- a/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
+++ b/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
@@ -236,10 +236,10 @@ public function process_directives( string $html ): string {
 				}
 
 				/*
-				 * If this is not a void element, it adds it to the tag stack so it can
-				 * process its closing tag and check for unbalanced tags.
+				 * If this tag will visit its closer tag, it adds it to the tag stack
+				 * so it can process its closing tag and check for unbalanced tags.
 				 */
-				if ( ! $p->is_void() ) {
+				if ( $p->has_and_visits_its_closer_tag() ) {
 					$tag_stack[] = array( $tag_name, $directives_prefixes );
 				}
 			}
diff --git a/tests/phpunit/tests/interactivity-api/wpInteractivityAPIDirectivesProcessor.php b/tests/phpunit/tests/interactivity-api/wpInteractivityAPIDirectivesProcessor.php
index 7fd8b8e00f18c..103b052fb40b6 100644
--- a/tests/phpunit/tests/interactivity-api/wpInteractivityAPIDirectivesProcessor.php
+++ b/tests/phpunit/tests/interactivity-api/wpInteractivityAPIDirectivesProcessor.php
@@ -363,45 +363,53 @@ public function test_set_content_between_balanced_tags_with_unbalanced_tags() {
 	}
 
 	/**
-	 * Tests the is_void method.
+	 * Tests the `has_and_visits_its_closer_tag` method.
 	 *
 	 * @ticket 60356
 	 *
-	 * @covers ::is_void
+	 * @covers ::has_and_visits_its_closer_tag
 	 */
-	public function test_is_void_element() {
-		$void_elements = array( 'area', 'base', 'br', 'col', 'embed', 'hr', 'img', 'input', 'link', 'meta', 'source', 'track', 'wbr' );
-		foreach ( $void_elements as $tag_name ) {
+	public function test_has_and_visits_its_closer_tag() {
+		$void_tags = array( 'area', 'base', 'br', 'col', 'embed', 'hr', 'img', 'input', 'link', 'meta', 'source', 'track', 'wbr' );
+		foreach ( $void_tags as $tag_name ) {
 			$content = "<{$tag_name} id={$tag_name}>";
 			$p       = new WP_Interactivity_API_Directives_Processor( $content );
 			$p->next_tag();
-			$this->assertTrue( $p->is_void() );
+			$this->assertFalse( $p->has_and_visits_its_closer_tag() );
 		}
 
-		$non_void_elements = array( 'div', 'span', 'p', 'script', 'style' );
-		foreach ( $non_void_elements as $tag_name ) {
+		$tags_that_dont_visit_closing_tag = array( 'script', 'iframe', 'textarea', 'iframe', 'style' );
+		foreach ( $tags_that_dont_visit_closing_tag as $tag_name ) {
 			$content = "<{$tag_name} id={$tag_name}>Some content</{$tag_name}>";
 			$p       = new WP_Interactivity_API_Directives_Processor( $content );
 			$p->next_tag();
-			$this->assertFalse( $p->is_void() );
+			$this->assertFalse( $p->has_and_visits_its_closer_tag() );
+		}
+
+		$tags_that_visit_closing_tag = array( 'div', 'span', 'p', 'h1', 'main' );
+		foreach ( $tags_that_visit_closing_tag as $tag_name ) {
+			$content = "<{$tag_name} id={$tag_name}>Some content</{$tag_name}>";
+			$p       = new WP_Interactivity_API_Directives_Processor( $content );
+			$p->next_tag();
+			$this->assertTrue( $p->has_and_visits_its_closer_tag() );
 		}
 
 		// Test an upercase tag.
 		$content = '<IMG src="example.jpg">';
 		$p       = new WP_Interactivity_API_Directives_Processor( $content );
 		$p->next_tag();
-		$this->assertTrue( $p->is_void() );
+		$this->assertFalse( $p->has_and_visits_its_closer_tag() );
 
 		// Test an empty string.
 		$content = '';
 		$p       = new WP_Interactivity_API_Directives_Processor( $content );
 		$p->next_tag();
-		$this->assertFalse( $p->is_void() );
+		$this->assertTrue( $p->has_and_visits_its_closer_tag() );
 
 		// Test on text nodes.
 		$content = 'This is just some text';
 		$p       = new WP_Interactivity_API_Directives_Processor( $content );
 		$p->next_tag();
-		$this->assertFalse( $p->is_void() );
+		$this->assertTrue( $p->has_and_visits_its_closer_tag() );
 	}
 }

From e9cb1fe2579c345fd4ea71eea92da17b4853f607 Mon Sep 17 00:00:00 2001
From: Luis Herranz <luisherranz@gmail.com>
Date: Fri, 2 Feb 2024 12:15:21 +0100
Subject: [PATCH 19/56] Use non-min script module versions

Co-authored-by: Weston Ruter <westonruter@google.com>
---
 .../interactivity-api/class-wp-interactivity-api.php        | 6 ++++--
 1 file 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 a3c7882cad8f6..b76323607e7fd 100644
--- a/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
+++ b/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
@@ -148,14 +148,16 @@ public function print_client_interactivity_data() {
 	 * @since 6.5.0
 	 */
 	public function register_script_modules() {
+		$suffix = wp_scripts_get_suffix();
+
 		wp_register_script_module(
 			'@wordpress/interactivity',
-			includes_url( 'js/dist/interactivity.min.js' )
+			includes_url( "js/dist/interactivity{$suffix}.js" )
 		);
 
 		wp_register_script_module(
 			'@wordpress/interactivity-router',
-			includes_url( 'js/dist/interactivity-router.min.js' ),
+			includes_url( "js/dist/interactivity-router{$suffix}.js" ),
 			array( '@wordpress/interactivity' )
 		);
 	}

From 05349708e8a4b5c428837c4bca8ad586d0ac92bd Mon Sep 17 00:00:00 2001
From: Luis Herranz <luisherranz@gmail.com>
Date: Fri, 2 Feb 2024 12:23:07 +0100
Subject: [PATCH 20/56] Add missing PHP 7 types

Co-authored-by: Weston Ruter <westonruter@google.com>
---
 src/wp-includes/interactivity-api/interactivity-api.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wp-includes/interactivity-api/interactivity-api.php b/src/wp-includes/interactivity-api/interactivity-api.php
index dbb7fe192c404..14d4b8d1e2b16 100644
--- a/src/wp-includes/interactivity-api/interactivity-api.php
+++ b/src/wp-includes/interactivity-api/interactivity-api.php
@@ -39,7 +39,7 @@ function wp_interactivity_process_directives_of_interactive_blocks( array $parse
 			 * Adds a filter to process the root interactive block once it has
 			 * finished rendering.
 			 */
-			$process_interactive_blocks = static function ( $content, $parsed_block ) use ( &$root_interactive_block, &$process_interactive_blocks ) {
+			$process_interactive_blocks = static function ( string $content, array $parsed_block ) use ( &$root_interactive_block, &$process_interactive_blocks ): string {
 				// Checks whether the current block is the root interactive block.
 				list($root_block_name, $root_block_md5) = $root_interactive_block;
 				if ( $root_block_name === $parsed_block['blockName'] && md5( serialize( $parsed_block ) ) === $root_block_md5 ) {

From 553e8a4db9ae12626cdf9a3a6a472d16c7de881d Mon Sep 17 00:00:00 2001
From: Luis Herranz <luisherranz@gmail.com>
Date: Fri, 2 Feb 2024 12:28:19 +0100
Subject: [PATCH 21/56] Remove md5 in favor of array comparison

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

diff --git a/src/wp-includes/interactivity-api/interactivity-api.php b/src/wp-includes/interactivity-api/interactivity-api.php
index 14d4b8d1e2b16..d5551cbb35fdf 100644
--- a/src/wp-includes/interactivity-api/interactivity-api.php
+++ b/src/wp-includes/interactivity-api/interactivity-api.php
@@ -33,7 +33,7 @@ function wp_interactivity_process_directives_of_interactive_blocks( array $parse
 
 		if ( isset( $block_name ) && isset( $block_type->supports['interactivity'] ) && $block_type->supports['interactivity'] ) {
 			// Annotates the root interactive block for processing.
-			$root_interactive_block = array( $block_name, md5( serialize( $parsed_block ) ) );
+			$root_interactive_block = array( $block_name, $parsed_block );
 
 			/*
 			 * Adds a filter to process the root interactive block once it has
@@ -41,8 +41,8 @@ function wp_interactivity_process_directives_of_interactive_blocks( array $parse
 			 */
 			$process_interactive_blocks = static function ( string $content, array $parsed_block ) use ( &$root_interactive_block, &$process_interactive_blocks ): string {
 				// Checks whether the current block is the root interactive block.
-				list($root_block_name, $root_block_md5) = $root_interactive_block;
-				if ( $root_block_name === $parsed_block['blockName'] && md5( serialize( $parsed_block ) ) === $root_block_md5 ) {
+				list($root_block_name, $root_parsed_block) = $root_interactive_block;
+				if ( $root_block_name === $parsed_block['blockName'] && $parsed_block === $root_parsed_block ) {
 					// The root interactive blocks has finished rendering, process it.
 					$content = wp_interactivity_process_directives( $content );
 					// Removes the filter and reset the root interactive block.

From ada6fe57128fbab7f3895f6285ef68996b7411a4 Mon Sep 17 00:00:00 2001
From: Luis Herranz <luisherranz@gmail.com>
Date: Sat, 3 Feb 2024 10:56:17 +0100
Subject: [PATCH 22/56] Use a hook to register the script modules so they can
 be overwritten in Gutenberg

---
 src/wp-includes/interactivity-api/class-wp-interactivity-api.php | 1 +
 src/wp-settings.php                                              | 1 -
 2 files changed, 1 insertion(+), 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 b76323607e7fd..91a046ab439e4 100644
--- a/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
+++ b/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
@@ -168,6 +168,7 @@ public function register_script_modules() {
 	 * @since 6.5.0
 	 */
 	public function add_hooks() {
+		add_action( 'wp_enqueue_scripts', array( $this, 'register_script_modules' ) );
 		add_action( 'wp_footer', array( $this, 'print_client_interactivity_data' ) );
 	}
 
diff --git a/src/wp-settings.php b/src/wp-settings.php
index 497d86889b99c..4f9f884bc39c1 100644
--- a/src/wp-settings.php
+++ b/src/wp-settings.php
@@ -384,7 +384,6 @@
 
 wp_script_modules()->add_hooks();
 wp_interactivity()->add_hooks();
-wp_interactivity()->register_script_modules();
 
 $GLOBALS['wp_embed'] = new WP_Embed();
 

From ee6e780a3720d65f88db60f187847ca36aa79255 Mon Sep 17 00:00:00 2001
From: Luis Herranz <luisherranz@gmail.com>
Date: Sun, 4 Feb 2024 16:17:38 +0100
Subject: [PATCH 23/56] Omit curly brackets on string variable

---
 .../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 91a046ab439e4..97db9a32cd436 100644
--- a/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
+++ b/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
@@ -152,12 +152,12 @@ public function register_script_modules() {
 
 		wp_register_script_module(
 			'@wordpress/interactivity',
-			includes_url( "js/dist/interactivity{$suffix}.js" )
+			includes_url( "js/dist/interactivity$suffix.js" )
 		);
 
 		wp_register_script_module(
 			'@wordpress/interactivity-router',
-			includes_url( "js/dist/interactivity-router{$suffix}.js" ),
+			includes_url( "js/dist/interactivity-router$suffix.js" ),
 			array( '@wordpress/interactivity' )
 		);
 	}

From 1c735211a3d914e6ca3e488753c4583d0e5f4e82 Mon Sep 17 00:00:00 2001
From: Luis Herranz <luisherranz@gmail.com>
Date: Sun, 4 Feb 2024 16:21:24 +0100
Subject: [PATCH 24/56] Make classes final

---
 .../class-wp-interactivity-api-directives-processor.php         | 2 +-
 .../interactivity-api/class-wp-interactivity-api.php            | 2 +-
 2 files changed, 2 insertions(+), 2 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 c2d44077ef3e8..cca04fecf7b4f 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
@@ -15,7 +15,7 @@
  *
  * @access private
  */
-class WP_Interactivity_API_Directives_Processor extends WP_HTML_Tag_Processor {
+final class WP_Interactivity_API_Directives_Processor extends WP_HTML_Tag_Processor {
 	/**
 	 * List of thags whose closer tag is not visited by the WP_HTML_Tag_Processor.
 	 *
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 97db9a32cd436..c73028b42c2c0 100644
--- a/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
+++ b/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
@@ -12,7 +12,7 @@
  *
  * @since 6.5.0
  */
-class WP_Interactivity_API {
+final class WP_Interactivity_API {
 	/**
 	 * Holds the mapping of directive attribute names to their processor methods.
 	 *

From 35ae36be7f7b9c79bc489e475234d0a625cc92bc Mon Sep 17 00:00:00 2001
From: Luis Herranz <luisherranz@gmail.com>
Date: Sun, 4 Feb 2024 16:23:14 +0100
Subject: [PATCH 25/56] Fix typos

---
 .../class-wp-interactivity-api-directives-processor.php     | 2 +-
 .../interactivity-api/class-wp-interactivity-api.php        | 6 +++---
 2 files changed, 4 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 cca04fecf7b4f..5ee5bc8278637 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
@@ -17,7 +17,7 @@
  */
 final class WP_Interactivity_API_Directives_Processor extends WP_HTML_Tag_Processor {
 	/**
-	 * List of thags whose closer tag is not visited by the WP_HTML_Tag_Processor.
+	 * List of tags whose closer tag is not visited by the WP_HTML_Tag_Processor.
 	 *
 	 * @since 6.5.0
 	 *
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 c73028b42c2c0..e75a1e223fb62 100644
--- a/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
+++ b/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
@@ -398,7 +398,7 @@ private function extract_directive_value( $directive_value, $default_namespace =
 	 * Processes the `data-wp-interactive` directive.
 	 *
 	 * It adds the default store namespace defined in the directive value to the
-	 * stack so it's available for the nested interactivity elements.
+	 * stack so that it's available for the nested interactivity elements.
 	 *
 	 * @since 6.5.0
 	 *
@@ -432,8 +432,8 @@ private function data_wp_interactive_processor( WP_Interactivity_API_Directives_
 	/**
 	 * Processes the `data-wp-context` directive.
 	 *
-	 * It adds the context defined in the directive value to the stack so it's
-	 * available for the nested interactivity elements.
+	 * It adds the context defined in the directive value to the stack so that
+	 * it's available for the nested interactivity elements.
 	 *
 	 * @since 6.5.0
 	 *

From a81d25113a2eee81659cc8355a467c350a155387 Mon Sep 17 00:00:00 2001
From: Luis Herranz <luisherranz@gmail.com>
Date: Sun, 4 Feb 2024 16:35:31 +0100
Subject: [PATCH 26/56] Add @uses to process_directives DocBlock

---
 .../interactivity-api/class-wp-interactivity-api.php       | 7 +++++++
 1 file changed, 7 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 e75a1e223fb62..e87731e533efb 100644
--- a/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
+++ b/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
@@ -178,6 +178,13 @@ public function add_hooks() {
 	 *
 	 * @since 6.5.0
 	 *
+	 * @uses WP_Interactivity_API::data_wp_interactive_processor()
+	 * @uses WP_Interactivity_API::data_wp_context_processor()
+	 * @uses WP_Interactivity_API::data_wp_bind_processor()
+	 * @uses WP_Interactivity_API::data_wp_class_processor()
+	 * @uses WP_Interactivity_API::data_wp_style_processor()
+	 * @uses WP_Interactivity_API::data_wp_text_processor()
+	 *
 	 * @param string $html The HTML content to process.
 	 * @return string The processed HTML content. It returns the original content when the HTML contains unbalanced tags.
 	 */

From 97d4c98f28ba9e90f2e6bdb4844b31f0ae670183 Mon Sep 17 00:00:00 2001
From: Luis Herranz <luisherranz@gmail.com>
Date: Sun, 4 Feb 2024 16:36:38 +0100
Subject: [PATCH 27/56] Don't return the result of array_pop

---
 .../interactivity-api/class-wp-interactivity-api.php        | 6 ++++--
 1 file 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 e87731e533efb..2d301bb3b9977 100644
--- a/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
+++ b/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
@@ -416,7 +416,8 @@ private function extract_directive_value( $directive_value, $default_namespace =
 	private function data_wp_interactive_processor( WP_Interactivity_API_Directives_Processor $p, array &$context_stack, array &$namespace_stack ) {
 		// In closing tags, it removes the last namespace from the stack.
 		if ( $p->is_tag_closer() ) {
-			return array_pop( $namespace_stack );
+			array_pop( $namespace_stack );
+			return;
 		}
 
 		// Tries to decode the `data-wp-interactive` attribute value.
@@ -451,7 +452,8 @@ private function data_wp_interactive_processor( WP_Interactivity_API_Directives_
 	private function data_wp_context_processor( WP_Interactivity_API_Directives_Processor $p, array &$context_stack, array &$namespace_stack ) {
 		// In closing tags, it removes the last context from the stack.
 		if ( $p->is_tag_closer() ) {
-			return array_pop( $context_stack );
+			array_pop( $context_stack );
+			return;
 		}
 
 		$attribute_value = $p->get_attribute( 'data-wp-context' );

From 56a4d48e7791b39ef8c73985e043b59fe7d21b0d Mon Sep 17 00:00:00 2001
From: Luis Herranz <luisherranz@gmail.com>
Date: Sun, 4 Feb 2024 16:46:03 +0100
Subject: [PATCH 28/56] Don't return true on `has_and_visits_its_closer_tag` on
 null tag names

---
 .../class-wp-interactivity-api-directives-processor.php     | 6 ++++--
 .../wpInteractivityAPIDirectivesProcessor.php               | 4 ++--
 2 files changed, 6 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 5ee5bc8278637..ccfccc073a264 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
@@ -168,7 +168,9 @@ private function next_balanced_closer(): bool {
 	 */
 	public function has_and_visits_its_closer_tag(): bool {
 		$tag_name = $this->get_tag();
-		return ! WP_HTML_Processor::is_void( null !== $tag_name ? $tag_name : '' ) &&
-			! in_array( $tag_name, self::TAGS_THAT_DONT_VISIT_CLOSER_TAG, true );
+		return null !== $tag_name && (
+			! WP_HTML_Processor::is_void( $tag_name ) &&
+			! in_array( $tag_name, self::TAGS_THAT_DONT_VISIT_CLOSER_TAG, true )
+		);
 	}
 }
diff --git a/tests/phpunit/tests/interactivity-api/wpInteractivityAPIDirectivesProcessor.php b/tests/phpunit/tests/interactivity-api/wpInteractivityAPIDirectivesProcessor.php
index 103b052fb40b6..f5d6ac63dc07e 100644
--- a/tests/phpunit/tests/interactivity-api/wpInteractivityAPIDirectivesProcessor.php
+++ b/tests/phpunit/tests/interactivity-api/wpInteractivityAPIDirectivesProcessor.php
@@ -404,12 +404,12 @@ public function test_has_and_visits_its_closer_tag() {
 		$content = '';
 		$p       = new WP_Interactivity_API_Directives_Processor( $content );
 		$p->next_tag();
-		$this->assertTrue( $p->has_and_visits_its_closer_tag() );
+		$this->assertFalse( $p->has_and_visits_its_closer_tag() );
 
 		// Test on text nodes.
 		$content = 'This is just some text';
 		$p       = new WP_Interactivity_API_Directives_Processor( $content );
 		$p->next_tag();
-		$this->assertTrue( $p->has_and_visits_its_closer_tag() );
+		$this->assertFalse( $p->has_and_visits_its_closer_tag() );
 	}
 }

From d19252ba2cbd3a91b3550115f35df8910e97d40a Mon Sep 17 00:00:00 2001
From: Luis Herranz <luisherranz@gmail.com>
Date: Mon, 5 Feb 2024 09:31:48 +0100
Subject: [PATCH 29/56] Remove unnecessary file

---
 src/wp-settings.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/wp-settings.php b/src/wp-settings.php
index 2f1b109de0217..282219f7e105a 100644
--- a/src/wp-settings.php
+++ b/src/wp-settings.php
@@ -381,7 +381,6 @@
 require ABSPATH . WPINC . '/interactivity-api/class-wp-interactivity-api.php';
 require ABSPATH . WPINC . '/interactivity-api/class-wp-interactivity-api-directives-processor.php';
 require ABSPATH . WPINC . '/interactivity-api/interactivity-api.php';
-require ABSPATH . WPINC . '/interactivity-api.php';
 require ABSPATH . WPINC . '/block-bindings/sources/post-meta.php';
 require ABSPATH . WPINC . '/block-bindings/sources/pattern.php';
 

From 49d5ebcf29f38ca9f98b3dd8651b5c63f06ccd73 Mon Sep 17 00:00:00 2001
From: Luis Herranz <luisherranz@gmail.com>
Date: Mon, 5 Feb 2024 09:36:22 +0100
Subject: [PATCH 30/56] Remove more unnecessary files from wp-settings

---
 src/wp-settings.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/wp-settings.php b/src/wp-settings.php
index 282219f7e105a..541f1092a3d31 100644
--- a/src/wp-settings.php
+++ b/src/wp-settings.php
@@ -381,8 +381,6 @@
 require ABSPATH . WPINC . '/interactivity-api/class-wp-interactivity-api.php';
 require ABSPATH . WPINC . '/interactivity-api/class-wp-interactivity-api-directives-processor.php';
 require ABSPATH . WPINC . '/interactivity-api/interactivity-api.php';
-require ABSPATH . WPINC . '/block-bindings/sources/post-meta.php';
-require ABSPATH . WPINC . '/block-bindings/sources/pattern.php';
 
 wp_script_modules()->add_hooks();
 wp_interactivity()->add_hooks();

From 264d0fb7f83bfb92dae1f6c59786c4269cc22648 Mon Sep 17 00:00:00 2001
From: Luis Herranz <luisherranz@gmail.com>
Date: Mon, 5 Feb 2024 11:50:18 +0100
Subject: [PATCH 31/56] Update WP_Interactivity_API_Directives_Processor

---
 ...interactivity-api-directives-processor.php |  66 ++-
 .../wpInteractivityAPIDirectivesProcessor.php | 466 ++++++++++++++++--
 2 files changed, 471 insertions(+), 61 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 ccfccc073a264..658614a9efcfc 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
@@ -20,7 +20,6 @@ final class WP_Interactivity_API_Directives_Processor extends WP_HTML_Tag_Proces
 	 * List of tags whose closer tag is not visited by the WP_HTML_Tag_Processor.
 	 *
 	 * @since 6.5.0
-	 *
 	 * @var string[]
 	 */
 	const TAGS_THAT_DONT_VISIT_CLOSER_TAG = array(
@@ -35,16 +34,26 @@ final class WP_Interactivity_API_Directives_Processor extends WP_HTML_Tag_Proces
 	);
 
 	/**
-	 * Returns the content between two balanced tags.
+	 * Returns the content between two balanced template tags.
+	 *
+	 * It positions the cursor in the closer tag of the balanced template tag,
+	 * if it exists.
 	 *
 	 * @since 6.5.0
 	 *
 	 * @access private
 	 *
-	 * @return string|null The content between the current opening and its matching closing tag or null if it doesn't
-	 *                     find the matching closing tag.
+	 * @return string|null The content between the current opener template tag and its matching closer tag or null if it
+	 *                     doesn't find the matching closing tag or the current tag is not a template opener tag.
 	 */
-	public function get_content_between_balanced_tags() {
+	public function get_content_between_balanced_template_tags() {
+		if ( 'TEMPLATE' !== $this->get_tag() ) {
+			return null;
+		}
+
+		// Flushes any changes.
+		$this->get_updated_html();
+
 		$bookmarks = $this->get_balanced_tag_bookmarks();
 		if ( ! $bookmarks ) {
 			return null;
@@ -54,7 +63,6 @@ public function get_content_between_balanced_tags() {
 		$start = $this->bookmarks[ $start_name ]->start + $this->bookmarks[ $start_name ]->length + 1;
 		$end   = $this->bookmarks[ $end_name ]->start;
 
-		$this->seek( $start_name );
 		$this->release_bookmark( $start_name );
 		$this->release_bookmark( $end_name );
 
@@ -72,6 +80,7 @@ public function get_content_between_balanced_tags() {
 	 * @return bool Whether the content was successfully replaced.
 	 */
 	public function set_content_between_balanced_tags( string $new_content ): bool {
+		// Flushes any changes.
 		$this->get_updated_html();
 
 		$bookmarks = $this->get_balanced_tag_bookmarks();
@@ -92,8 +101,41 @@ public function set_content_between_balanced_tags( string $new_content ): bool {
 	}
 
 	/**
-	 * Returns a pair of bookmarks for the current opening tag and the matching
-	 * closing tag.
+	 * Appends content after the closing tag of a template tag.
+	 *
+	 * It positions the cursor in the closer tag of the balanced template tag,
+	 * if it exists.
+	 *
+	 * @access private
+	 *
+	 * @param string $new_content The string to append after the closing template tag.
+	 * @return bool Whether the content was successfully appended.
+	 */
+	public function append_content_after_template_tag_closer( string $new_content ): bool {
+		if ( empty( $new_content ) || 'TEMPLATE' !== $this->get_tag() || ! $this->is_tag_closer() ) {
+			return false;
+		}
+
+		// Flushes any changes.
+		$this->get_updated_html();
+
+		$bookmark = 'append_content_after_template_tag_closer';
+		$this->set_bookmark( $bookmark );
+		$end = $this->bookmarks[ $bookmark ]->start + $this->bookmarks[ $bookmark ]->length + 1;
+		$this->release_bookmark( $bookmark );
+
+		// Appends the new content.
+		$this->lexical_updates[] = new WP_HTML_Text_Replacement( $end, 0, $new_content );
+
+		return true;
+	}
+
+	/**
+	 * Returns a pair of bookmarks for the current opener tag and the matching
+	 * closer tag.
+	 *
+	 * It positions the cursor in the closer tag of the balanced tag, if it
+	 * exists.
 	 *
 	 * @since 6.5.0
 	 *
@@ -104,7 +146,7 @@ private function get_balanced_tag_bookmarks() {
 		$start_name = 'start_of_balanced_tag_' . ++$i;
 
 		$this->set_bookmark( $start_name );
-		if ( ! $this->next_balanced_closer() ) {
+		if ( ! $this->next_balanced_tag_closer_tag() ) {
 			$this->release_bookmark( $start_name );
 			return null;
 		}
@@ -126,9 +168,11 @@ private function get_balanced_tag_bookmarks() {
 	 *
 	 * @since 6.5.0
 	 *
+	 * @access private
+	 *
 	 * @return bool Whether a matching closing tag was found.
 	 */
-	private function next_balanced_closer(): bool {
+	public function next_balanced_tag_closer_tag(): bool {
 		$depth    = 0;
 		$tag_name = $this->get_tag();
 
@@ -158,7 +202,7 @@ private function next_balanced_closer(): bool {
 	}
 
 	/**
-	 * Checks whether the current tag has and visits a closer tag.
+	 * Checks whether the current tag has and will visit its matching closer tag.
 	 *
 	 * @since 6.5.0
 	 *
diff --git a/tests/phpunit/tests/interactivity-api/wpInteractivityAPIDirectivesProcessor.php b/tests/phpunit/tests/interactivity-api/wpInteractivityAPIDirectivesProcessor.php
index f5d6ac63dc07e..bf2225597c0ae 100644
--- a/tests/phpunit/tests/interactivity-api/wpInteractivityAPIDirectivesProcessor.php
+++ b/tests/phpunit/tests/interactivity-api/wpInteractivityAPIDirectivesProcessor.php
@@ -13,133 +13,160 @@
  */
 class Tests_WP_Interactivity_API_Directives_Processor extends WP_UnitTestCase {
 	/**
-	 * Tests the `get_content_between_balanced_tags` method on standard tags.
+	 * Tests the `get_content_between_balanced_template_tags` method on template
+	 * tags.
 	 *
 	 * @ticket 60356
 	 *
-	 * @covers ::get_content_between_balanced_tags
+	 * @covers ::get_content_between_balanced_template_tags
 	 */
-	public function test_get_content_between_balanced_tags_standard_tags() {
-		$content = '<div>Text</div>';
+	public function test_get_content_between_balanced_template_tags_standard_tags() {
+		$content = '<template>Text</template>';
 		$p       = new WP_Interactivity_API_Directives_Processor( $content );
 		$p->next_tag();
-		$this->assertEquals( 'Text', $p->get_content_between_balanced_tags() );
+		$this->assertEquals( 'Text', $p->get_content_between_balanced_template_tags() );
 
-		$content = '<div>Text</div><div>More text</div>';
+		$content = '<template>Text</template><template>More text</template>';
 		$p       = new WP_Interactivity_API_Directives_Processor( $content );
 		$p->next_tag();
-		$this->assertEquals( 'Text', $p->get_content_between_balanced_tags() );
+		$this->assertEquals( 'Text', $p->get_content_between_balanced_template_tags() );
 		$p->next_tag();
-		$this->assertEquals( 'More text', $p->get_content_between_balanced_tags() );
+		$this->assertEquals( 'More text', $p->get_content_between_balanced_template_tags() );
 	}
 
 	/**
-	 * Tests the `get_content_between_balanced_tags` method on an empty tag.
+	 * Tests the `get_content_between_balanced_template_tags` method on an empty
+	 * tag.
 	 *
 	 * @ticket 60356
 	 *
-	 * @covers ::get_content_between_balanced_tags
+	 * @covers ::get_content_between_balanced_template_tags
 	 */
-	public function test_get_content_between_balanced_tags_empty_tag() {
-		$content = '<div></div>';
+	public function test_get_content_between_balanced_template_tags_empty_tag() {
+		$content = '<template></template>';
 		$p       = new WP_Interactivity_API_Directives_Processor( $content );
 		$p->next_tag();
-		$this->assertEquals( '', $p->get_content_between_balanced_tags() );
+		$this->assertEquals( '', $p->get_content_between_balanced_template_tags() );
 	}
 
 	/**
-	 * Tests the `get_content_between_balanced_tags` method with a self-closing
-	 * tag.
+	 * Tests the `get_content_between_balanced_template_tags` method with
+	 * non-template tags.
 	 *
 	 * @ticket 60356
 	 *
-	 * @covers ::get_content_between_balanced_tags
+	 * @covers ::get_content_between_balanced_template_tags
 	 */
-	public function test_get_content_between_balanced_tags_self_closing_tag() {
+	public function test_get_content_between_balanced_template_tags_self_closing_tag() {
 		$content = '<img src="example.jpg">';
 		$p       = new WP_Interactivity_API_Directives_Processor( $content );
 		$p->next_tag();
-		$this->assertNull( $p->get_content_between_balanced_tags() );
+		$this->assertNull( $p->get_content_between_balanced_template_tags() );
+
+		$content = '<div>Text</div>';
+		$p       = new WP_Interactivity_API_Directives_Processor( $content );
+		$p->next_tag();
+		$this->assertNull( $p->get_content_between_balanced_template_tags() );
 	}
 
 	/**
-	 * Tests the `get_content_between_balanced_tags` method with nested tags.
+	 * Tests the `get_content_between_balanced_template_tags` method with nested
+	 * template tags.
 	 *
 	 * @ticket 60356
 	 *
-	 * @covers ::get_content_between_balanced_tags
+	 * @covers ::get_content_between_balanced_template_tags
 	 */
-	public function test_get_content_between_balanced_tags_nested_tags() {
-		$content = '<div><span>Content</span><strong>More Content</strong></div>';
+	public function test_get_content_between_balanced_template_tags_nested_tags() {
+		$content = '<template><span>Content</span><strong>More Content</strong></template>';
 		$p       = new WP_Interactivity_API_Directives_Processor( $content );
 		$p->next_tag();
-		$this->assertEquals( '<span>Content</span><strong>More Content</strong>', $p->get_content_between_balanced_tags() );
+		$this->assertEquals( '<span>Content</span><strong>More Content</strong>', $p->get_content_between_balanced_template_tags() );
 
-		$content = '<div><div>Content</div><img src="example.jpg"></div>';
+		$content = '<template><template>Content</template><img src="example.jpg"></template>';
 		$p       = new WP_Interactivity_API_Directives_Processor( $content );
 		$p->next_tag();
-		$this->assertEquals( '<div>Content</div><img src="example.jpg">', $p->get_content_between_balanced_tags() );
+		$this->assertEquals( '<template>Content</template><img src="example.jpg">', $p->get_content_between_balanced_template_tags() );
 	}
 
 	/**
-	 * Tests the `get_content_between_balanced_tags` method when no tags are
-	 * present.
+	 * Tests the `get_content_between_balanced_template_tags` method when no tags
+	 * are present.
 	 *
 	 * @ticket 60356
 	 *
-	 * @covers ::get_content_between_balanced_tags
+	 * @covers ::get_content_between_balanced_template_tags
 	 */
-	public function test_get_content_between_balanced_tags_no_tags() {
+	public function test_get_content_between_balanced_template_tags_no_tags() {
 		$content = 'Just a string with no tags.';
 		$p       = new WP_Interactivity_API_Directives_Processor( $content );
 		$p->next_tag();
-		$this->assertNull( $p->get_content_between_balanced_tags() );
+		$this->assertNull( $p->get_content_between_balanced_template_tags() );
 	}
 
 	/**
-	 * Tests the `get_content_between_balanced_tags` method with unbalanced tags.
+	 * Tests the `get_content_between_balanced_template_tags` method with unbalanced tags.
 	 *
 	 * @ticket 60356
 	 *
-	 * @covers ::get_content_between_balanced_tags
+	 * @covers ::get_content_between_balanced_template_tags
 	 */
-	public function test_get_content_between_balanced_tags_with_unbalanced_tags() {
-		$content = '<div>Missing closing div';
+	public function test_get_content_between_balanced_template_tags_with_unbalanced_tags() {
+		$content = '<template>Missing closing template';
 		$p       = new WP_Interactivity_API_Directives_Processor( $content );
 		$p->next_tag();
-		$this->assertNull( $p->get_content_between_balanced_tags() );
+		$this->assertNull( $p->get_content_between_balanced_template_tags() );
 
-		$content = '<div><div>Missing closing div</div>';
+		$content = '<template><template>Missing closing template</template>';
 		$p       = new WP_Interactivity_API_Directives_Processor( $content );
 		$p->next_tag();
-		$this->assertNull( $p->get_content_between_balanced_tags() );
+		$this->assertNull( $p->get_content_between_balanced_template_tags() );
 
-		$content = '<div>Missing closing div</span>';
+		$content = '<template>Missing closing template</span>';
 		$p       = new WP_Interactivity_API_Directives_Processor( $content );
 		$p->next_tag();
-		$this->assertNull( $p->get_content_between_balanced_tags() );
+		$this->assertNull( $p->get_content_between_balanced_template_tags() );
 
 		// It supports unbalanced tags inside the content.
-		$content = '<div>Missing opening span</span></div>';
+		$content = '<template>Missing opening span</span></template>';
 		$p       = new WP_Interactivity_API_Directives_Processor( $content );
 		$p->next_tag();
-		$this->assertEquals( 'Missing opening span</span>', $p->get_content_between_balanced_tags() );
+		$this->assertEquals( 'Missing opening span</span>', $p->get_content_between_balanced_template_tags() );
 	}
 
 	/**
-	 * Tests the `get_content_between_balanced_tags` method when called on a
-	 * closing tag.
+	 * Tests the `get_content_between_balanced_template_tags` method when called
+	 * on a closer tag.
 	 *
 	 * @ticket 60356
 	 *
-	 * @covers ::get_content_between_balanced_tags
+	 * @covers ::get_content_between_balanced_template_tags
 	 */
-	public function test_get_content_between_balanced_tags_on_closing_tag() {
-		$content = '<div>Text</div>';
+	public function test_get_content_between_balanced_template_tags_on_closing_tag() {
+		$content = '<template>Text</template>';
 		$p       = new WP_Interactivity_API_Directives_Processor( $content );
 		$p->next_tag( array( 'tag_closers' => 'visit' ) );
 		$p->next_tag( array( 'tag_closers' => 'visit' ) );
-		$this->assertNull( $p->get_content_between_balanced_tags() );
+		$this->assertNull( $p->get_content_between_balanced_template_tags() );
+	}
+
+	/**
+	 * Tests the `get_content_between_balanced_template_tags` method positions the
+	 * cursor on the closer tag.
+	 *
+	 * @ticket 60356
+	 *
+	 * @covers ::get_content_between_balanced_template_tags
+	 */
+	public function test_get_content_between_balanced_template_tags_positions_cursor_on_closer_tag() {
+		$content = '<template>Text</template><div>More text</div>';
+		$p       = new WP_Interactivity_API_Directives_Processor( $content );
+		$p->next_tag();
+		$p->get_content_between_balanced_template_tags();
+		$this->assertEquals( 'TEMPLATE', $p->get_tag() );
+		$this->assertTrue( $p->is_tag_closer() );
+		$p->next_tag();
+		$this->assertEquals( 'DIV', $p->get_tag() );
 	}
 
 	/**
@@ -337,21 +364,21 @@ public function test_set_content_between_balanced_tags_with_unbalanced_tags() {
 		$p->next_tag();
 		$result = $p->set_content_between_balanced_tags( $new_content );
 		$this->assertFalse( $result );
-		$this->assertEquals( '<div>Missing closing div', $p );
+		$this->assertEquals( $content, $p );
 
 		$content = '<div><div>Missing closing div</div>';
 		$p       = new WP_Interactivity_API_Directives_Processor( $content );
 		$p->next_tag();
 		$result = $p->set_content_between_balanced_tags( $new_content );
 		$this->assertFalse( $result );
-		$this->assertEquals( '<div><div>Missing closing div</div>', $p );
+		$this->assertEquals( $content, $p );
 
 		$content = '<div>Missing closing div</span>';
 		$p       = new WP_Interactivity_API_Directives_Processor( $content );
 		$p->next_tag();
 		$result = $p->set_content_between_balanced_tags( $new_content );
 		$this->assertFalse( $result );
-		$this->assertEquals( '<div>Missing closing div</span>', $p );
+		$this->assertEquals( $content, $p );
 
 		// It supports unbalanced tags inside the content.
 		$content = '<div>Missing opening span</span></div>';
@@ -412,4 +439,343 @@ public function test_has_and_visits_its_closer_tag() {
 		$p->next_tag();
 		$this->assertFalse( $p->has_and_visits_its_closer_tag() );
 	}
+
+	/**
+	 * Tests the `append_content_after_template_tag_closer` method with a simple
+	 * text.
+	 *
+	 * @ticket 60356
+	 *
+	 * @covers ::append_content_after_template_tag_closer
+	 */
+	public function test_append_content_after_template_tag_closer_simple_text() {
+		$content_1 = '<template>Text</template>';
+		$content_2 = 'New text';
+		$p         = new WP_Interactivity_API_Directives_Processor( $content_1 );
+		$p->next_tag( array( 'tag_closers' => 'visit' ) );
+		$p->next_tag( array( 'tag_closers' => 'visit' ) );
+		$result = $p->append_content_after_template_tag_closer( $content_2 );
+		$this->assertTrue( $result );
+		$this->assertEquals( $content_1 . $content_2, $p );
+		$this->assertFalse( $p->next_tag() ); // There are no more tags.
+	}
+
+	/**
+	 * Tests the `append_content_after_template_tag_closer` method with simple
+	 * tags.
+	 *
+	 * @ticket 60356
+	 *
+	 * @covers ::append_content_after_template_tag_closer
+	 */
+	public function test_append_content_after_template_tag_closer_simple_tags() {
+		$content_1 = '<template>Text</template>';
+		$content_2 = '<template class="content-2">New text</template>';
+		$content_3 = '<template class="content-3">More new text</template>';
+		$p         = new WP_Interactivity_API_Directives_Processor( $content_1 );
+		$p->next_tag( array( 'tag_closers' => 'visit' ) );
+		$p->next_tag( array( 'tag_closers' => 'visit' ) );
+		$result = $p->append_content_after_template_tag_closer( $content_2 );
+		$this->assertTrue( $result );
+		$this->assertEquals( $content_1 . $content_2, $p );
+		$p->next_tag( array( 'tag_closers' => 'visit' ) );
+		$this->assertEquals( 'content-2', $p->get_attribute( 'class' ) );
+		$p->next_tag( array( 'tag_closers' => 'visit' ) );
+		$result = $p->append_content_after_template_tag_closer( $content_3 );
+		$this->assertTrue( $result );
+		$p->next_tag( array( 'tag_closers' => 'visit' ) );
+		$this->assertEquals( $content_1 . $content_2 . $content_3, $p );
+		$this->assertEquals( 'content-3', $p->get_attribute( 'class' ) );
+	}
+
+	/**
+	 * Tests the `append_content_after_template_tag_closer` method in the middle
+	 * of two tags.
+	 *
+	 * @ticket 60356
+	 *
+	 * @covers ::append_content_after_template_tag_closer
+	 */
+	public function test_append_content_after_template_tag_closer_in_the_middle_of_tags() {
+		$content_1 = '<template>Text</template>';
+		$content_2 = 'New text';
+		$content_3 = '<template class="content-3">More new text</template>';
+		$content_4 = '<template class="content-4">Even more new text</template>';
+
+		$p = new WP_Interactivity_API_Directives_Processor( $content_1 . $content_3 );
+		$p->next_tag( array( 'tag_closers' => 'visit' ) );
+		$p->next_tag( array( 'tag_closers' => 'visit' ) );
+		$result = $p->append_content_after_template_tag_closer( $content_2 );
+		$this->assertTrue( $result );
+		$this->assertEquals( $content_1 . $content_2 . $content_3, $p );
+		$p->next_tag( array( 'tag_closers' => 'visit' ) );
+		$this->assertEquals( 'content-3', $p->get_attribute( 'class' ) );
+
+		$p = new WP_Interactivity_API_Directives_Processor( $content_1 . $content_3 );
+		$p->next_tag( array( 'tag_closers' => 'visit' ) );
+		$p->next_tag( array( 'tag_closers' => 'visit' ) );
+		$result = $p->append_content_after_template_tag_closer( $content_4 );
+		$this->assertTrue( $result );
+		$this->assertEquals( $content_1 . $content_4 . $content_3, $p );
+		$p->next_tag( array( 'tag_closers' => 'visit' ) );
+		$this->assertEquals( 'content-4', $p->get_attribute( 'class' ) );
+	}
+
+	/**
+	 * Tests the `append_content_after_template_tag_closer` method doesn't modify
+	 * the content when called on an opener tag.
+	 *
+	 * @ticket 60356
+	 *
+	 * @covers ::append_content_after_template_tag_closer
+	 */
+	public function test_append_content_after_template_tag_closer_on_opener_tag() {
+		$content = '<template>Text</template>';
+		$p       = new WP_Interactivity_API_Directives_Processor( $content );
+		$p->next_tag( array( 'tag_closers' => 'visit' ) );
+		$result = $p->append_content_after_template_tag_closer( 'New text' );
+		$this->assertFalse( $result );
+		$this->assertEquals( $content, $p );
+	}
+
+	/**
+	 * Tests the `append_content_after_template_tag_closer` method on multiple
+	 * calls to the same tag.
+	 *
+	 * @ticket 60356
+	 *
+	 * @covers ::append_content_after_template_tag_closer
+	 */
+	public function test_append_content_after_template_tag_closer_multiple_calls_in_same_tag() {
+		$content_1 = '<template class="content-1">Text</template>';
+		$content_2 = '<template class="content-2">New text</template>';
+		$content_3 = '<template class="content-3">More new text</template>';
+		$p         = new WP_Interactivity_API_Directives_Processor( $content_1 );
+		$p->next_tag( array( 'tag_closers' => 'visit' ) );
+		$p->set_bookmark( 'first template' );
+		$p->next_tag( array( 'tag_closers' => 'visit' ) );
+		$result = $p->append_content_after_template_tag_closer( $content_2 );
+		$this->assertTrue( $result );
+		$this->assertEquals( $content_1 . $content_2, $p );
+		$p->next_tag( array( 'tag_closers' => 'visit' ) );
+		$this->assertEquals( 'content-2', $p->get_attribute( 'class' ) );
+		// Rewinds to the first template.
+		$p->seek( 'first template' );
+		$p->release_bookmark( 'first template' );
+		$this->assertEquals( 'content-1', $p->get_attribute( 'class' ) );
+		$p->next_tag( array( 'tag_closers' => 'visit' ) );
+		$result = $p->append_content_after_template_tag_closer( $content_3 );
+		$this->assertEquals( $content_1 . $content_3 . $content_2, $p );
+		$p->next_tag( array( 'tag_closers' => 'visit' ) );
+		$this->assertEquals( 'content-3', $p->get_attribute( 'class' ) );
+	}
+
+	/**
+	 * Tests the `append_content_after_template_tag_closer` method on
+	 * set_attribute calls.
+	 *
+	 * @ticket 60356
+	 *
+	 * @covers ::append_content_after_template_tag_closer
+	 */
+	public function test_append_content_after_template_tag_closer_with_set_attribute() {
+		$content_1 = '<template>Text</template>';
+		$content_2 = '<template>New text</template>';
+
+		$p = new WP_Interactivity_API_Directives_Processor( $content_1 );
+		$p->next_tag( array( 'tag_closers' => 'visit' ) );
+		$p->set_attribute( 'class', 'test' );
+		$p->next_tag( array( 'tag_closers' => 'visit' ) );
+		$result = $p->append_content_after_template_tag_closer( $content_2 );
+		$this->assertTrue( $result );
+		$this->assertEquals( '<template class="test">Text</template>' . $content_2, $p );
+	}
+
+	/**
+	 * Tests the `append_content_after_template_tag_closer` method where the
+	 * existing content includes tags.
+	 *
+	 * @ticket 60356
+	 *
+	 * @covers ::append_content_after_template_tag_closer
+	 */
+	public function test_append_content_after_template_tag_closer_with_existing_tags() {
+		$content_1 = '<template><span>Text</span></template>';
+		$content_2 = '<template class="content-2-template-1"><template class="content-2-template-2">New text</template></template>';
+		$content_3 = '<template><span>More new text</span></template>';
+		$p         = new WP_Interactivity_API_Directives_Processor( $content_1 );
+		$p->next_tag();
+		$p->next_tag(
+			array(
+				'tag_name'    => 'template',
+				'tag_closers' => 'visit',
+			)
+		);
+		$result = $p->append_content_after_template_tag_closer( $content_2 );
+		$this->assertTrue( $result );
+		$this->assertEquals( $content_1 . $content_2, $p );
+		$p->next_tag();
+		$this->assertEquals( 'content-2-template-1', $p->get_attribute( 'class' ) );
+		$p->next_tag();
+		$this->assertEquals( 'content-2-template-2', $p->get_attribute( 'class' ) );
+		$p->next_tag( array( 'tag_closers' => 'visit' ) );
+		$result = $p->append_content_after_template_tag_closer( $content_3 );
+		$this->assertTrue( $result );
+		$this->assertEquals( $content_1 . '<template class="content-2-template-1"><template class="content-2-template-2">New text</template>' . $content_3 . '</template>', $p );
+	}
+
+	/**
+	 * Tests the `append_content_after_template_tag_closer` method fails with an
+	 * empty string.
+	 *
+	 * @ticket 60356
+	 *
+	 * @covers ::append_content_after_template_tag_closer
+	 */
+	public function test_append_content_after_template_tag_closer_empty() {
+		$content = '<template class="content">Text</template>';
+		$p       = new WP_Interactivity_API_Directives_Processor( $content );
+		$p->next_tag( array( 'tag_closers' => 'visit' ) );
+		$p->next_tag( array( 'tag_closers' => 'visit' ) );
+		$result = $p->append_content_after_template_tag_closer( '' );
+		$this->assertFalse( $result );
+		$this->assertEquals( $content, $p );
+		$this->assertEquals( 'TEMPLATE', $p->get_tag() ); // It didn't move.
+		$this->assertTrue( $p->is_tag_closer() ); // It didn't move.
+	}
+
+	/**
+	 * Tests the `append_content_after_template_tag_closer` method on a
+	 * non-existent tag.
+	 *
+	 * @ticket 60356
+	 *
+	 * @covers ::append_content_after_template_tag_closer
+	 */
+	public function test_append_content_after_template_tag_closer_non_existent_tag() {
+		$content_1 = 'Just a string with no tags.';
+		$content_2 = '<div>New text</div>';
+		$p         = new WP_Interactivity_API_Directives_Processor( $content_1 );
+		$p->next_tag();
+		$result = $p->append_content_after_template_tag_closer( $content_2 );
+		$this->assertFalse( $result );
+		$this->assertEquals( $content_1, $p );
+	}
+
+	/**
+	 * Tests the `append_content_after_template_tag_closer` method on non-template
+	 * tags.
+	 *
+	 * @ticket 60356
+	 *
+	 * @covers ::append_content_after_template_tag_closer
+	 */
+	public function test_append_content_after_template_tag_closer_non_template_tags() {
+		$content_1 = '<div>Text</div>';
+		$content_2 = '<div>New text</div>';
+		$p         = new WP_Interactivity_API_Directives_Processor( $content_1 );
+		$p->next_tag( array( 'tag_closers' => 'visit' ) );
+		$p->next_tag( array( 'tag_closers' => 'visit' ) );
+		$result = $p->append_content_after_template_tag_closer( $content_2 );
+		$this->assertFalse( $result );
+		$this->assertEquals( $content_1, $p );
+	}
+
+	/**
+	 * Tests that the `next_balanced_tag_closer_tag` method finds a closing tag
+	 * for a standard tag.
+	 *
+	 * @ticket 60356
+	 *
+	 * @covers ::next_balanced_tag_closer_tag
+	 */
+	public function test_next_balanced_tag_closer_tag_standard_tags() {
+		$content = '<div>Text</div>';
+		$p       = new WP_Interactivity_API_Directives_Processor( $content );
+		$p->next_tag();
+		$this->assertTrue( $p->next_balanced_tag_closer_tag() );
+		$this->assertEquals( 'DIV', $p->get_tag() );
+		$this->assertTrue( $p->is_tag_closer() );
+	}
+
+	/**
+	 * Tests that the `next_balanced_tag_closer_tag` method returns false for a
+	 * self-closing tag.
+	 *
+	 * @ticket 60356
+	 *
+	 * @covers ::next_balanced_tag_closer_tag
+	 */
+	public function test_next_balanced_tag_closer_tag_void_tag() {
+		$content = '<img src="image.jpg" />';
+		$p       = new WP_Interactivity_API_Directives_Processor( $content );
+		$p->next_tag();
+		$this->assertFalse( $p->next_balanced_tag_closer_tag() );
+
+		$content = '<img src="image.jpg" /><div>Text</div>';
+		$p       = new WP_Interactivity_API_Directives_Processor( $content );
+		$p->next_tag();
+		$this->assertFalse( $p->next_balanced_tag_closer_tag() );
+	}
+
+	/**
+	 * Tests that the `next_balanced_tag_closer_tag` method correctly handles
+	 * nested tags.
+	 *
+	 * @ticket 60356
+	 *
+	 * @covers ::next_balanced_tag_closer_tag
+	 */
+	public function test_next_balanced_tag_closer_tag_nested_tags() {
+		$content = '<div><span>Nested content</span></div>';
+		$p       = new WP_Interactivity_API_Directives_Processor( $content );
+		$p->next_tag();
+		$this->assertTrue( $p->next_balanced_tag_closer_tag() );
+		$this->assertEquals( 'DIV', $p->get_tag() );
+		$this->assertTrue( $p->is_tag_closer() );
+
+		$content = '<div><div>Nested content</div></div>';
+		$p       = new WP_Interactivity_API_Directives_Processor( $content );
+		$p->next_tag();
+		$this->assertTrue( $p->next_balanced_tag_closer_tag() );
+		$this->assertEquals( 'DIV', $p->get_tag() );
+		$this->assertTrue( $p->is_tag_closer() );
+		$this->assertFalse( $p->next_tag() ); // No more content.
+	}
+
+	/**
+	 * Tests that the `next_balanced_tag_closer_tag` method returns false when no
+	 * matching closing tag is found.
+	 *
+	 * @ticket 60356
+	 *
+	 * @covers ::next_balanced_tag_closer_tag
+	 */
+	public function test_next_balanced_tag_closer_tag_no_matching_closing_tag() {
+		$content = '<div>No closing tag here';
+		$p       = new WP_Interactivity_API_Directives_Processor( $content );
+		$p->next_tag();
+
+		$content = '<div><div>No closing tag here</div>';
+		$p       = new WP_Interactivity_API_Directives_Processor( $content );
+		$p->next_tag();
+		$this->assertFalse( $p->next_balanced_tag_closer_tag() );
+	}
+
+	/**
+	 * Test that the `next_balanced_tag_closer_tag` method returns false when
+	 * returned on a closing tag.
+	 *
+	 * @ticket 60356
+	 *
+	 * @covers ::next_balanced_tag_closer_tag
+	 */
+	public function test_next_balanced_tag_closer_tag_on_closing_tag() {
+		$content = '<div>Closing tag after this</div>';
+		$p       = new WP_Interactivity_API_Directives_Processor( $content );
+		// Visit opening tag first and then closing tag.
+		$p->next_tag();
+		$p->next_tag( array( 'tag_closers' => 'visit' ) );
+		$this->assertFalse( $p->next_balanced_tag_closer_tag() );
+	}
 }

From 41ccbc12bd716dc287d4df1b00f39524913d6f26 Mon Sep 17 00:00:00 2001
From: Luis Herranz <luisherranz@gmail.com>
Date: Mon, 5 Feb 2024 14:33:31 +0100
Subject: [PATCH 32/56] Update WP_Interactivity_API

---
 .../class-wp-interactivity-api.php            | 324 +++++++++++++++---
 .../interactivity-api/wpInteractivityAPI.php  |  22 ++
 2 files changed, 306 insertions(+), 40 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 2d301bb3b9977..c9c560c413378 100644
--- a/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
+++ b/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
@@ -20,12 +20,19 @@ final class WP_Interactivity_API {
 	 * @var array
 	 */
 	private static $directive_processors = array(
-		'data-wp-interactive' => 'data_wp_interactive_processor',
-		'data-wp-context'     => 'data_wp_context_processor',
-		'data-wp-bind'        => 'data_wp_bind_processor',
-		'data-wp-class'       => 'data_wp_class_processor',
-		'data-wp-style'       => 'data_wp_style_processor',
-		'data-wp-text'        => 'data_wp_text_processor',
+		'data-wp-interactive'   => 'data_wp_interactive_processor',
+		'data-wp-router-region' => 'data_wp_router_region_processor',
+		'data-wp-context'       => 'data_wp_context_processor',
+		'data-wp-bind'          => 'data_wp_bind_processor',
+		'data-wp-class'         => 'data_wp_class_processor',
+		'data-wp-style'         => 'data_wp_style_processor',
+		'data-wp-text'          => 'data_wp_text_processor',
+		/*
+		 * `data-wp-each` needs to be processed in the last place because it moves
+		 * the cursor to the end of the processed items to prevent them to be
+		 * processed twice.
+		 */
+		'data-wp-each'          => 'data_wp_each_processor',
 	);
 
 	/**
@@ -51,6 +58,21 @@ final class WP_Interactivity_API {
 	 */
 	private $config_data = array();
 
+	/**
+	 * Flag that indicates whether the `data-wp-router-region` directive has
+	 * been found in the HTML and processed.
+	 *
+	 * The value is saved in a private property of the WP_Interactivity_API
+	 * instance instead of using a static variable inside the processor
+	 * function, which would hold the same value for all instances
+	 * independently of whether they have processed any
+	 * `data-wp-router-region` directive or not.
+	 *
+	 * @since 6.5.0
+	 * @var bool
+	 */
+	private $has_processed_router_region = false;
+
 	/**
 	 * Gets and/or sets the initial state of an Interactivity API store for a
 	 * given namespace.
@@ -189,16 +211,35 @@ public function add_hooks() {
 	 * @return string The processed HTML content. It returns the original content when the HTML contains unbalanced tags.
 	 */
 	public function process_directives( string $html ): string {
-		$p               = new WP_Interactivity_API_Directives_Processor( $html );
-		$tag_stack       = array();
-		$namespace_stack = array();
 		$context_stack   = array();
-		$unbalanced      = false;
+		$namespace_stack = array();
+		$result          = $this->process_directives_args( $html, $context_stack, $namespace_stack );
+		return null === $result ? $html : $result;
+	}
+
+	/**
+	 * Processes the interactivity directives contained within the HTML content
+	 * and updates the markup accordingly.
+	 *
+	 * It needs the context and namespace stacks to be passed by reference and
+	 * it returns null if the HTML contains unbalanced tags.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @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.
+	 * @param array  $namespace_stack The reference to the array used to manage namespaces during processing.
+	 * @return string|null The processed HTML content. It returns null when the HTML contains unbalanced tags.
+	 */
+	private function process_directives_args( string $html, array &$context_stack, array &$namespace_stack ) {
+		$p          = new WP_Interactivity_API_Directives_Processor( $html );
+		$tag_stack  = array();
+		$unbalanced = false;
 
 		$directive_processor_prefixes          = array_keys( self::$directive_processors );
 		$directive_processor_prefixes_reversed = array_reverse( $directive_processor_prefixes );
 
-		while ( $p->next_tag( array( 'tag_closers' => 'visit' ) ) && false === $unbalanced ) {
+		while ( $p->next_tag( array( 'tag_closers' => 'visit' ) ) ) {
 			$tag_name = $p->get_tag();
 
 			if ( 'SVG' === $tag_name || 'MATH' === $tag_name ) {
@@ -221,37 +262,41 @@ public function process_directives( string $html ): string {
 				} else {
 					// Remove the last tag from the stack.
 					array_pop( $tag_stack );
-
+				}
+			} else {
+				if ( 0 !== count( $p->get_attribute_names_with_prefix( 'data-wp-each-child' ) ) ) {
 					/*
-					 * If the matching opening tag didn't have any directives, it can skip
-					 * the processing.
+					 * If the tag has a `data-wp-each-child` directive, jump to its closer
+					 * tag because those tags have already been processed.
 					 */
-					if ( 0 === count( $directives_prefixes ) ) {
-						continue;
+					$p->next_balanced_tag_closer_tag();
+					continue;
+				} else {
+					$directives_prefixes = array();
+
+					// Checks if there is is a server directive processor registered for each directive.
+					foreach ( $p->get_attribute_names_with_prefix( 'data-wp-' ) as $attribute_name ) {
+						list( $directive_prefix ) = $this->extract_prefix_and_suffix( $attribute_name );
+						if ( array_key_exists( $directive_prefix, self::$directive_processors ) ) {
+							$directives_prefixes[] = $directive_prefix;
+						}
 					}
-				}
-			} else {
-				$directives_prefixes = array();
-
-				foreach ( $p->get_attribute_names_with_prefix( 'data-wp-' ) as $attribute_name ) {
 
 					/*
-					 * Extracts the directive prefix to see if there is a server directive
-					 * processor registered for that directive.
+					 * If this tag will visit its closer tag, it adds it to the tag stack
+					 * so it can process its closing tag and check for unbalanced tags.
 					 */
-					list( $directive_prefix ) = $this->extract_prefix_and_suffix( $attribute_name );
-					if ( array_key_exists( $directive_prefix, self::$directive_processors ) ) {
-						$directives_prefixes[] = $directive_prefix;
+					if ( $p->has_and_visits_its_closer_tag() ) {
+						$tag_stack[] = array( $tag_name, $directives_prefixes );
 					}
 				}
-
-				/*
-				 * If this tag will visit its closer tag, it adds it to the tag stack
-				 * so it can process its closing tag and check for unbalanced tags.
-				 */
-				if ( $p->has_and_visits_its_closer_tag() ) {
-					$tag_stack[] = array( $tag_name, $directives_prefixes );
-				}
+			}
+			/*
+				* If the matching opener tag didn't have any directives, it can skip the
+				* processing.
+				*/
+			if ( 0 === count( $directives_prefixes ) ) {
+				continue;
 			}
 
 			/*
@@ -273,17 +318,17 @@ public function process_directives( string $html ): string {
 					: array( $this, self::$directive_processors[ $directive_prefix ] );
 				call_user_func_array(
 					$func,
-					array( $p, &$context_stack, &$namespace_stack )
+					array( $p, &$context_stack, &$namespace_stack, &$tag_stack )
 				);
 			}
 		}
 
 		/*
-		 * It returns the original content 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.
+		 * 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.
 		 */
-		return $unbalanced || 0 < count( $tag_stack ) ? $html : $p->get_updated_html();
+		return $unbalanced || 0 < count( $tag_stack ) ? null : $p->get_updated_html();
 	}
 
 	/**
@@ -400,6 +445,23 @@ private function extract_directive_value( $directive_value, $default_namespace =
 		return array( $default_namespace, $directive_value );
 	}
 
+	/**
+	 * Transforms a kebab-case string to camelCase.
+	 *
+	 * @param string $str The kebab-case string to transform to camelCase.
+	 * @return string The transformed camelCase string.
+	 */
+	private function kebab_to_camel_case( string $str ): string {
+		return lcfirst(
+			preg_replace_callback(
+				'/(-)([a-z])/',
+				function ( $matches ) {
+					return strtoupper( $matches[2] );
+				},
+				strtolower( preg_replace( '/-+$/', '', $str ) )
+			)
+		);
+	}
 
 	/**
 	 * Processes the `data-wp-interactive` directive.
@@ -527,7 +589,6 @@ private function data_wp_bind_processor( WP_Interactivity_API_Directives_Process
 		}
 	}
 
-
 	/**
 	 * Processes the `data-wp-class` directive.
 	 *
@@ -683,4 +744,187 @@ private function data_wp_text_processor( WP_Interactivity_API_Directives_Process
 			}
 		}
 	}
+
+	/**
+	 * Processes the `data-wp-router-region` directive.
+	 *
+	 * It renders in the footer a set of HTML elements to notify users about
+	 * client-side navigations. More concretely, the elements added are 1) a
+	 * top loading bar to visually inform that a navigation is in progress
+	 * and 2) an `aria-live` region for accessible navigation announcements.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @param WP_Interactivity_API_Directives_Processor $p The directives processor instance.
+	 */
+	private function data_wp_router_region_processor( WP_Interactivity_API_Directives_Processor $p ) {
+		if ( ! $p->is_tag_closer() && ! $this->has_processed_router_region ) {
+			$this->has_processed_router_region = true;
+
+			// Initialize the `core/router` store.
+			$this->state(
+				'core/router',
+				array(
+					'navigation' => array(
+						'message'     => '',
+						'hasStarted'  => false,
+						'hasFinished' => false,
+						'texts'       => array(
+							'loading' => __( 'Loading page, please wait.' ),
+							'loaded'  => __( 'Page Loaded.' ),
+						),
+					),
+				)
+			);
+
+			$callback = static function () {
+				echo <<<HTML
+<style id="wp-interactivity-router_animations">
+	.wp-interactivity-router_loading-bar {
+		position: fixed;
+		top: 0;
+		left: 0;
+		margin: 0;
+		padding: 0;
+		width: 100vw;
+		max-width: 100vw !important;
+		height: 4px;
+		background-color: var(--wp--preset--color--primary, #000);
+		opacity: 0
+	}
+	.wp-interactivity-router_loading-bar.start-animation {
+		animation: wp-interactivity-router_loading-bar-start-animation 30s cubic-bezier(0.03, 0.5, 0, 1) forwards
+	}
+	.wp-interactivity-router_loading-bar.finish-animation {
+		animation: wp-interactivity-router_loading-bar-finish-animation 300ms ease-in
+	}
+
+	@keyframes wp-interactivity-router_loading-bar-start-animation {
+		0% { transform: scaleX(0); transform-origin: 0% 0%; opacity: 1 }
+		100% { transform: scaleX(1); transform-origin: 0% 0%; opacity: 1 }
+	}
+	@keyframes wp-interactivity-router_loading-bar-finish-animation {
+		0% { opacity: 1 }
+		50% { opacity: 1 }
+		100% { opacity: 0 }
+	}
+</style>
+<div
+	class="wp-interactivity-router_loading-bar"
+	data-wp-interactive='{"namespace":"core/router"}'
+	data-wp-class--start-animation="state.navigation.hasStarted"
+	data-wp-class--finish-animation="state.navigation.hasFinished"
+></div>
+<div
+	class="screen-reader-text"
+	aria-live="polite"
+	data-wp-interactive='{"namespace":"core/router"}'
+	data-wp-text="state.navigation.message"
+></div>
+HTML;
+			};
+
+			add_action( 'wp_footer', $callback );
+		}
+	}
+
+	/**
+	 * Processes the `data-wp-each` directive.
+	 *
+	 * This directive gets an array passed as reference and iterates over it
+	 * generating new content for each item based on the inner markup of the
+	 * `template` tag.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @param WP_Interactivity_API_Directives_Processor $p               The directives processor instance.
+	 * @param array                                     $context_stack   The reference to the context stack.
+	 * @param array                                     $namespace_stack The reference to the store namespace stack.
+	 * @param array                                     $tag_stack       The reference to the tag stack.
+	 */
+	private function data_wp_each_processor( WP_Interactivity_API_Directives_Processor $p, array &$context_stack, array &$namespace_stack, array &$tag_stack ) {
+		if ( ! $p->is_tag_closer() && 'TEMPLATE' === $p->get_tag() ) {
+			$attribute_name   = $p->get_attribute_names_with_prefix( 'data-wp-each' )[0];
+			$extracted_suffix = $this->extract_prefix_and_suffix( $attribute_name );
+			$item_name        = isset( $extracted_suffix[1] ) ? $this->kebab_to_camel_case( $extracted_suffix[1] ) : 'item';
+			$attribute_value  = $p->get_attribute( $attribute_name );
+			$result           = $this->evaluate( $attribute_value, end( $namespace_stack ), end( $context_stack ) );
+
+			// Gets the content between the template tags and leaves the cursor in the closer tag.
+			$inner_content = $p->get_content_between_balanced_template_tags();
+
+			// Checks if there is a manual server-side directive processing.
+			$template_end = 'data-wp-each: template end';
+			$p->set_bookmark( $template_end );
+			$p->next_tag();
+			$manual_sdp = $p->get_attribute( 'data-wp-each-child' );
+			$p->seek( $template_end ); // Rewinds to the template closer tag.
+			$p->release_bookmark( $template_end );
+
+			/*
+				* It doesn't process in these situations:
+				* - Manual server-side directive processing.
+				* - Empty or non-array values.
+				* - Associative arrays because those are deserialized as objects in JS.
+				* - Templates that contain top-level texts because those texts can't be
+				*   identified and removed in the client.
+				*/
+			if (
+				$manual_sdp ||
+				empty( $result ) ||
+				! is_array( $result ) ||
+				! array_is_list( $result ) ||
+				! str_starts_with( trim( $inner_content ), '<' ) ||
+				! str_ends_with( trim( $inner_content ), '>' )
+				) {
+				array_pop( $tag_stack );
+				return;
+			}
+
+			// Extracts the namespace from the directive attribute value.
+			$namespace_value         = end( $namespace_stack );
+			list( $namespace_value ) = is_string( $attribute_value ) && ! empty( $attribute_value )
+			? $this->extract_directive_value( $attribute_value, $namespace_value )
+			: array( $namespace_value, null );
+
+			// Processes the inner content for each item of the array.
+			$processed_content = '';
+			foreach ( $result as $item ) {
+				// Creates a new context that includes the current item of the array.
+				array_push(
+					$context_stack,
+					array_replace_recursive(
+						end( $context_stack ) !== false ? end( $context_stack ) : array(),
+						array( $namespace_value => array( $item_name => $item ) )
+					)
+				);
+
+				// Processes the inner content with the new context.
+				$processed_item = $this->process_directives_args( $inner_content, $context_stack, $namespace_stack );
+
+				if ( null === $processed_item ) {
+					// If the HTML is unbalanced, stop processing it.
+					array_pop( $context_stack );
+					return;
+				}
+
+				// Adds the `data-wp-each-child` to each top-level tag.
+				$i = new WP_Interactivity_API_Directives_Processor( $processed_item );
+				while ( $i->next_tag() ) {
+					$i->set_attribute( 'data-wp-each-child', true );
+					$i->next_balanced_tag_closer_tag();
+				}
+				$processed_content .= $i->get_updated_html();
+
+				// Removes the current context from the stack.
+				array_pop( $context_stack );
+			}
+
+			// Appends the processed content after the tag closer of the template.
+			$p->append_content_after_template_tag_closer( $processed_content );
+
+			// Pops the last tag because it skipped the closing tag of the template tag.
+			array_pop( $tag_stack );
+		}
+	}
 }
diff --git a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI.php b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI.php
index e61f0809fdfc1..5e8298a77e449 100644
--- a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI.php
+++ b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI.php
@@ -669,4 +669,26 @@ public function test_evaluate_nested_value() {
 		$result = $this->evaluate( 'otherPlugin::context.nested.key' );
 		$this->assertEquals( 'otherPlugin-context-nested', $result );
 	}
+
+	/**
+	 * Tests the `kebab_to_camel_case` method.
+	 *
+	 * @covers ::kebab_to_camel_case
+	 */
+	public function test_kebab_to_camel_case() {
+		$method = new ReflectionMethod( $this->interactivity, 'kebab_to_camel_case' );
+		$method->setAccessible( true );
+
+		$this->assertSame( '', $method->invoke( $this->interactivity, '' ) );
+		$this->assertSame( 'item', $method->invoke( $this->interactivity, 'item' ) );
+		$this->assertSame( 'myItem', $method->invoke( $this->interactivity, 'my-item' ) );
+		$this->assertSame( 'my_item', $method->invoke( $this->interactivity, 'my_item' ) );
+		$this->assertSame( 'myItem', $method->invoke( $this->interactivity, 'My-iTem' ) );
+		$this->assertSame( 'myItemWithMultipleHyphens', $method->invoke( $this->interactivity, 'my-item-with-multiple-hyphens' ) );
+		$this->assertSame( 'myItemWith-DoubleHyphens', $method->invoke( $this->interactivity, 'my-item-with--double-hyphens' ) );
+		$this->assertSame( 'myItemWith_underScore', $method->invoke( $this->interactivity, 'my-item-with_under-score' ) );
+		$this->assertSame( 'myItem', $method->invoke( $this->interactivity, '-my-item' ) );
+		$this->assertSame( 'myItem', $method->invoke( $this->interactivity, 'my-item-' ) );
+		$this->assertSame( 'myItem', $method->invoke( $this->interactivity, '-my-item-' ) );
+	}
 }

From c848fe25d7060cb5a0c3519ebd68941da7c020c5 Mon Sep 17 00:00:00 2001
From: Luis Herranz <luisherranz@gmail.com>
Date: Mon, 5 Feb 2024 16:15:42 +0100
Subject: [PATCH 33/56] Add tests for the new processors

---
 .../wpInteractivityAPI-wp-each.php            | 681 ++++++++++++++++++
 .../wpInteractivityAPI-wp-router-region.php   | 159 ++++
 2 files changed, 840 insertions(+)
 create mode 100644 tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-each.php
 create mode 100644 tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-router-region.php

diff --git a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-each.php b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-each.php
new file mode 100644
index 0000000000000..eea7f3f9fe8e7
--- /dev/null
+++ b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-each.php
@@ -0,0 +1,681 @@
+<?php
+/**
+ * Unit tests covering the data_wp_each_processor functionality of the
+ * WP_Interactivity_API class.
+ *
+ * @package WordPress
+ * @subpackage Interactivity API
+ *
+ * @group interactivity-api
+ */
+class Tests_WP_Interactivity_API_WP_Each extends WP_UnitTestCase {
+	/**
+	 * Instance of WP_Interactivity_API.
+	 *
+	 * @var WP_Interactivity_API
+	 */
+	protected $interactivity;
+
+	/**
+	 * Set up.
+	 */
+	public function set_up() {
+		parent::set_up();
+		$this->interactivity = new WP_Interactivity_API();
+		$this->interactivity->state( 'myPlugin', array( 'list' => array( 1, 2 ) ) );
+		$this->interactivity->state( 'myPlugin', array( 'after' => 'after-wp-each' ) );
+	}
+
+	/**
+	 * Tests that the `data-wp-each` directive doesn't do anything if it's not on
+	 * a template tag.
+	 *
+	 * @ticket 60356
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_each_doesnt_do_anything_on_non_template_tags() {
+		$original = '
+			<div data-wp-each="myPlugin::state.list">
+				<span data-wp-text="myPlugin::context.item"></span>
+			</div>';
+		$new      = $this->interactivity->process_directives( $original );
+		$this->assertEquals( $original, $new );
+	}
+
+	/**
+	 * Tests that the `data-wp-each` directive doesn't do anything if the array
+	 * is associative instead of indexed.
+	 *
+	 * @ticket 60356
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_each_doesnt_do_anything_on_associative_arrays() {
+		$this->interactivity->state(
+			'myPlugin',
+			array(
+				'assoc' => array(
+					'one' => 1,
+					'two' => 2,
+				),
+			)
+		);
+		$original = '
+			<template data-wp-each="myPlugin::state.assoc">
+				<span data-wp-text="myPlugin::context.item"></span>
+			</template>';
+		$new      = $this->interactivity->process_directives( $original );
+		$this->assertEquals( $original, $new );
+	}
+
+	/**
+	 * Tests that the `data-wp-each` directive works with simple tags.
+	 *
+	 * @ticket 60356
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_each_simple_tags() {
+		$original = '' .
+			'<template data-wp-each="myPlugin::state.list">' .
+				'<span data-wp-text="myPlugin::context.item"></span>' .
+			'</template>' .
+			'<div data-wp-bind--id="myPlugin::state.after">Text</div>';
+		$expected = '' .
+			'<template data-wp-each="myPlugin::state.list">' .
+				'<span data-wp-text="myPlugin::context.item"></span>' .
+			'</template>' .
+			'<span data-wp-each-child data-wp-text="myPlugin::context.item">1</span>' .
+			'<span data-wp-each-child data-wp-text="myPlugin::context.item">2</span>' .
+			'<div id="after-wp-each" data-wp-bind--id="myPlugin::state.after">Text</div>';
+		$new      = $this->interactivity->process_directives( $original );
+		$this->assertEquals( $expected, $new );
+	}
+
+	/**
+	 * Tests that the `data-wp-each` directive doesn't do anything if the array is
+	 * empty.
+	 *
+	 * @ticket 60356
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_each_empty_array() {
+		$this->interactivity->state( 'myPlugin', array( 'empty' => array() ) );
+		$original = '' .
+			'<template data-wp-each="myPlugin::state.empty">' .
+				'<span data-wp-text="myPlugin::context.item"></span>' .
+			'</template>' .
+			'<div data-wp-bind--id="myPlugin::state.after">Text</div>';
+		$expected = '' .
+			'<template data-wp-each="myPlugin::state.empty">' .
+				'<span data-wp-text="myPlugin::context.item"></span>' .
+			'</template>' .
+			'<div id="after-wp-each" data-wp-bind--id="myPlugin::state.after">Text</div>';
+		$new      = $this->interactivity->process_directives( $original );
+		$this->assertEquals( $expected, $new );
+	}
+
+	/**
+	 * Tests that the `data-wp-each` directive merges the item with the previous
+	 * context correctly.
+	 *
+	 * @ticket 60356
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_each_merges_context_correctly() {
+		$original = '' .
+			'<div data-wp-context=\'myPlugin::{ "item": "New text", "id": "some-id", "after": "after-wp-each" }\'>' .
+				'<template data-wp-each="myPlugin::state.list">' .
+					'<span data-wp-bind--id="myPlugin::context.id" data-wp-text="myPlugin::context.item"></span>' .
+				'</template>' .
+				'<div data-wp-bind--id="myPlugin::context.after" data-wp-text="myPlugin::context.item">Text</div>' .
+			'</div>';
+		$expected = '' .
+			'<div data-wp-context=\'myPlugin::{ "item": "New text", "id": "some-id", "after": "after-wp-each" }\'>' .
+				'<template data-wp-each="myPlugin::state.list">' .
+					'<span data-wp-bind--id="myPlugin::context.id" data-wp-text="myPlugin::context.item"></span>' .
+				'</template>' .
+				'<span data-wp-each-child id="some-id" data-wp-bind--id="myPlugin::context.id" data-wp-text="myPlugin::context.item">1</span>' .
+				'<span data-wp-each-child id="some-id" data-wp-bind--id="myPlugin::context.id" data-wp-text="myPlugin::context.item">2</span>' .
+				'<div id="after-wp-each" data-wp-bind--id="myPlugin::context.after" data-wp-text="myPlugin::context.item">New text</div>' .
+			'</div>';
+		$new      = $this->interactivity->process_directives( $original );
+		$this->assertEquals( $expected, $new );
+	}
+
+	/**
+	 * Tests that the `data-wp-each` directive works with arrays from the context.
+	 *
+	 * @ticket 60356
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_each_gets_arrays_from_context() {
+		$original = '' .
+			'<div data-wp-context=\'myPlugin::{ "list": [ 1, 2 ] }\'>' .
+				'<template data-wp-each="myPlugin::context.list">' .
+					'<span data-wp-text="myPlugin::context.item"></span>' .
+				'</template>' .
+				'<div data-wp-bind--id="myPlugin::state.after">Text</div>' .
+			'</div>';
+		$expected = '' .
+			'<div data-wp-context=\'myPlugin::{ "list": [ 1, 2 ] }\'>' .
+				'<template data-wp-each="myPlugin::context.list">' .
+					'<span data-wp-text="myPlugin::context.item"></span>' .
+				'</template>' .
+				'<span data-wp-each-child data-wp-text="myPlugin::context.item">1</span>' .
+				'<span data-wp-each-child data-wp-text="myPlugin::context.item">2</span>' .
+				'<div id="after-wp-each" data-wp-bind--id="myPlugin::state.after">Text</div>' .
+			'</div>';
+		$new      = $this->interactivity->process_directives( $original );
+		$this->assertEquals( $expected, $new );
+	}
+
+	/**
+	 * Tests that the `data-wp-each` directive works with the default namespace.
+	 *
+	 * @ticket 60356
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_each_default_namespace() {
+		$original = '' .
+			'<div data-wp-interactive=\'{ "namespace": "myPlugin" }\'>' .
+				'<template data-wp-each="state.list">' .
+					'<span data-wp-text="context.item"></span>' .
+				'</template>' .
+				'<div data-wp-bind--id="state.after">Text</div>' .
+			'</div>';
+		$expected = '' .
+			'<div data-wp-interactive=\'{ "namespace": "myPlugin" }\'>' .
+				'<template data-wp-each="state.list">' .
+					'<span data-wp-text="context.item"></span>' .
+				'</template>' .
+				'<span data-wp-each-child data-wp-text="context.item">1</span>' .
+				'<span data-wp-each-child data-wp-text="context.item">2</span>' .
+				'<div id="after-wp-each" data-wp-bind--id="state.after">Text</div>' .
+			'</div>';
+		$new      = $this->interactivity->process_directives( $original );
+		$this->assertEquals( $expected, $new );
+	}
+
+	/**
+	 * Tests that the `data-wp-each` directive works with multiple tags per item.
+	 *
+	 * @ticket 60356
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_each_multiple_tags_per_item() {
+		$original = '' .
+			'<template data-wp-each="myPlugin::state.list">' .
+				'<span data-wp-text="myPlugin::context.item"></span>' .
+				'<span data-wp-text="myPlugin::context.item"></span>' .
+			'</template>' .
+			'<div data-wp-bind--id="myPlugin::state.after">Text</div>';
+		$expected = '' .
+			'<template data-wp-each="myPlugin::state.list">' .
+				'<span data-wp-text="myPlugin::context.item"></span>' .
+				'<span data-wp-text="myPlugin::context.item"></span>' .
+			'</template>' .
+			'<span data-wp-each-child data-wp-text="myPlugin::context.item">1</span>' .
+			'<span data-wp-each-child data-wp-text="myPlugin::context.item">1</span>' .
+			'<span data-wp-each-child data-wp-text="myPlugin::context.item">2</span>' .
+			'<span data-wp-each-child data-wp-text="myPlugin::context.item">2</span>' .
+			'<div id="after-wp-each" data-wp-bind--id="myPlugin::state.after">Text</div>';
+		$new      = $this->interactivity->process_directives( $original );
+		$this->assertEquals( $expected, $new );
+	}
+
+	/**
+	 * Tests that the `data-wp-each` directive works with void tags.
+	 *
+	 * @ticket 60356
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_each_void_tags() {
+		$original = '' .
+			'<template data-wp-each="myPlugin::state.list">' .
+				'<img data-wp-bind--id="myPlugin::context.item">' .
+				'<img data-wp-bind--id="myPlugin::context.item">' .
+			'</template>' .
+			'<div data-wp-bind--id="myPlugin::state.after">Text</div>';
+		$expected = '' .
+			'<template data-wp-each="myPlugin::state.list">' .
+				'<img data-wp-bind--id="myPlugin::context.item">' .
+				'<img data-wp-bind--id="myPlugin::context.item">' .
+			'</template>' .
+			'<img data-wp-each-child id="1" data-wp-bind--id="myPlugin::context.item">' .
+			'<img data-wp-each-child id="1" data-wp-bind--id="myPlugin::context.item">' .
+			'<img data-wp-each-child id="2" data-wp-bind--id="myPlugin::context.item">' .
+			'<img data-wp-each-child id="2" data-wp-bind--id="myPlugin::context.item">' .
+			'<div id="after-wp-each" data-wp-bind--id="myPlugin::state.after">Text</div>';
+		$new      = $this->interactivity->process_directives( $original );
+		$this->assertEquals( $expected, $new );
+	}
+
+	/**
+	 * Tests that the `data-wp-each` directive works with combinations of void and
+	 * non-void tags.
+	 *
+	 * @ticket 60356
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_each_void_and_non_void_tags() {
+		$original = '' .
+			'<template data-wp-each="myPlugin::state.list">' .
+				'<img data-wp-bind--id="myPlugin::context.item">' .
+				'<span data-wp-text="myPlugin::context.item"></span>' .
+			'</template>' .
+			'<div data-wp-bind--id="myPlugin::state.after">Text</div>';
+		$expected = '' .
+			'<template data-wp-each="myPlugin::state.list">' .
+				'<img data-wp-bind--id="myPlugin::context.item">' .
+				'<span data-wp-text="myPlugin::context.item"></span>' .
+			'</template>' .
+			'<img data-wp-each-child id="1" data-wp-bind--id="myPlugin::context.item">' .
+			'<span data-wp-each-child data-wp-text="myPlugin::context.item">1</span>' .
+			'<img data-wp-each-child id="2" data-wp-bind--id="myPlugin::context.item">' .
+			'<span data-wp-each-child data-wp-text="myPlugin::context.item">2</span>' .
+			'<div id="after-wp-each" data-wp-bind--id="myPlugin::state.after">Text</div>';
+		$new      = $this->interactivity->process_directives( $original );
+		$this->assertEquals( $expected, $new );
+	}
+
+	/**
+	 * Tests that the `data-wp-each` directive works with nested tags.
+	 *
+	 * @ticket 60356
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_each_nested_tags() {
+		$original = '' .
+			'<template data-wp-each="myPlugin::state.list">' .
+				'<div data-wp-bind--id="myPlugin::context.item">' .
+					'id: <span data-wp-text="myPlugin::context.item"></span>' .
+				'</div>' .
+			'</template>' .
+			'<div data-wp-bind--id="myPlugin::state.after">Text</div>';
+		$expected = '' .
+			'<template data-wp-each="myPlugin::state.list">' .
+				'<div data-wp-bind--id="myPlugin::context.item">' .
+					'id: <span data-wp-text="myPlugin::context.item"></span>' .
+				'</div>' .
+			'</template>' .
+			'<div data-wp-each-child id="1" data-wp-bind--id="myPlugin::context.item">' .
+				'id: <span data-wp-text="myPlugin::context.item">1</span>' .
+			'</div>' .
+			'<div data-wp-each-child id="2" data-wp-bind--id="myPlugin::context.item">' .
+				'id: <span data-wp-text="myPlugin::context.item">2</span>' .
+			'</div>' .
+			'<div id="after-wp-each" data-wp-bind--id="myPlugin::state.after">Text</div>';
+		$new      = $this->interactivity->process_directives( $original );
+		$this->assertEquals( $expected, $new );
+	}
+
+	/**
+	 * Tests that the `data-wp-each` directive works with nested item properties.
+	 *
+	 * @ticket 60356
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_each_nested_item_properties() {
+		$this->interactivity->state(
+			'myPlugin',
+			array(
+				'list' => array(
+					array(
+						'id'   => 1,
+						'name' => 'one',
+					),
+					array(
+						'id'   => 2,
+						'name' => 'two',
+					),
+				),
+			)
+		);
+		$original = '' .
+			'<template data-wp-each="myPlugin::state.list">' .
+				'<span data-wp-text="myPlugin::context.item.id"></span>' .
+				'<span data-wp-text="myPlugin::context.item.name"></span>' .
+			'</template>' .
+			'<div data-wp-bind--id="myPlugin::state.after">Text</div>';
+		$expected = '' .
+			'<template data-wp-each="myPlugin::state.list">' .
+				'<span data-wp-text="myPlugin::context.item.id"></span>' .
+				'<span data-wp-text="myPlugin::context.item.name"></span>' .
+			'</template>' .
+			'<span data-wp-each-child data-wp-text="myPlugin::context.item.id">1</span>' .
+			'<span data-wp-each-child data-wp-text="myPlugin::context.item.name">one</span>' .
+			'<span data-wp-each-child data-wp-text="myPlugin::context.item.id">2</span>' .
+			'<span data-wp-each-child data-wp-text="myPlugin::context.item.name">two</span>' .
+			'<div id="after-wp-each" data-wp-bind--id="myPlugin::state.after">Text</div>';
+		$new      = $this->interactivity->process_directives( $original );
+		$this->assertEquals( $expected, $new );
+	}
+
+	/**
+	 * Tests that the `data-wp-each` directive works with different item names.
+	 *
+	 * @ticket 60356
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_each_different_item_names() {
+		$original = '' .
+			'<template data-wp-each--myitem="myPlugin::state.list">' .
+				'<span data-wp-text="myPlugin::context.myitem"></span>' .
+			'</template>' .
+			'<div data-wp-bind--id="myPlugin::state.after">Text</div>';
+		$expected = '' .
+			'<template data-wp-each--myitem="myPlugin::state.list">' .
+				'<span data-wp-text="myPlugin::context.myitem"></span>' .
+			'</template>' .
+			'<span data-wp-each-child data-wp-text="myPlugin::context.myitem">1</span>' .
+			'<span data-wp-each-child data-wp-text="myPlugin::context.myitem">2</span>' .
+			'<div id="after-wp-each" data-wp-bind--id="myPlugin::state.after">Text</div>';
+		$new      = $this->interactivity->process_directives( $original );
+		$this->assertEquals( $expected, $new );
+	}
+
+	/**
+	 * Tests that the `data-wp-each` directive transforms kebab-case into
+	 * camelCase.
+	 *
+	 * @ticket 60356
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_each_different_item_names_transforms_camelcase() {
+		$original = '' .
+			'<template data-wp-each--my-item="myPlugin::state.list">' .
+				'<span data-wp-text="myPlugin::context.myItem"></span>' .
+			'</template>' .
+			'<div data-wp-bind--id="myPlugin::state.after">Text</div>';
+		$expected = '' .
+			'<template data-wp-each--my-item="myPlugin::state.list">' .
+				'<span data-wp-text="myPlugin::context.myItem"></span>' .
+			'</template>' .
+			'<span data-wp-each-child data-wp-text="myPlugin::context.myItem">1</span>' .
+			'<span data-wp-each-child data-wp-text="myPlugin::context.myItem">2</span>' .
+			'<div id="after-wp-each" data-wp-bind--id="myPlugin::state.after">Text</div>';
+		$new      = $this->interactivity->process_directives( $original );
+		$this->assertEquals( $expected, $new );
+	}
+
+	/**
+	 * Tests that the `data-wp-each` directive doesn't work with top-level texts.
+	 *
+	 * @ticket 60356
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_each_doesnt_work_with_top_level_text() {
+		$original = '' .
+			'<template data-wp-each="myPlugin::state.list">' .
+				'id: <span data-wp-text="myPlugin::context.item"></span>' .
+			'</template>';
+		$new      = $this->interactivity->process_directives( $original );
+		$this->assertEquals( $original, $new );
+
+		$original = '' .
+			'<template data-wp-each="myPlugin::state.list">' .
+				'<span data-wp-text="myPlugin::context.item"></span>!' .
+			'</template>';
+		$new      = $this->interactivity->process_directives( $original );
+		$this->assertEquals( $original, $new );
+
+		// But it should work fine with spaces and linebreaks.
+		$original = '
+			<template data-wp-each="myPlugin::state.list">
+				<span class="test" data-wp-bind--id="myPlugin::context.item"></span>
+			</template>';
+		$new      = $this->interactivity->process_directives( $original );
+		$p        = new WP_HTML_Tag_Processor( $new );
+		$p->next_tag( array( 'class_name' => 'test' ) );
+		$p->next_tag( array( 'class_name' => 'test' ) );
+		$this->assertEquals( '1', $p->get_attribute( 'id' ) );
+		$p->next_tag( array( 'class_name' => 'test' ) );
+		$this->assertEquals( '2', $p->get_attribute( 'id' ) );
+	}
+
+	/**
+	 * Tests that the `data-wp-each` directive works with nested template tags.
+	 *
+	 * @ticket 60356
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_each_nested_template_tags() {
+		$this->interactivity->state( 'myPlugin', array( 'list2' => array( 3, 4 ) ) );
+		$original = '' .
+			'<template data-wp-each--item1="myPlugin::state.list">' .
+				'<span data-wp-text="myPlugin::context.item1"></span>' .
+				'<template data-wp-each--item2="myPlugin::state.list2">' .
+					'<span data-wp-text="myPlugin::context.item2"></span>' .
+				'</template>' .
+			'</template>' .
+			'<div data-wp-bind--id="myPlugin::state.after">Text</div>';
+		$expected = '' .
+			'<template data-wp-each--item1="myPlugin::state.list">' .
+				'<span data-wp-text="myPlugin::context.item1"></span>' .
+				'<template data-wp-each--item2="myPlugin::state.list2">' .
+					'<span data-wp-text="myPlugin::context.item2"></span>' .
+				'</template>' .
+			'</template>' .
+			'<span data-wp-each-child data-wp-text="myPlugin::context.item1">1</span>' .
+			'<template data-wp-each-child data-wp-each--item2="myPlugin::state.list2">' .
+				'<span data-wp-text="myPlugin::context.item2"></span>' .
+			'</template>' .
+			'<span data-wp-each-child data-wp-text="myPlugin::context.item2">3</span>' .
+			'<span data-wp-each-child data-wp-text="myPlugin::context.item2">4</span>' .
+			'<span data-wp-each-child data-wp-text="myPlugin::context.item1">2</span>' .
+			'<template data-wp-each-child data-wp-each--item2="myPlugin::state.list2">' .
+				'<span data-wp-text="myPlugin::context.item2"></span>' .
+			'</template>' .
+			'<span data-wp-each-child data-wp-text="myPlugin::context.item2">3</span>' .
+			'<span data-wp-each-child data-wp-text="myPlugin::context.item2">4</span>' .
+			'<div id="after-wp-each" data-wp-bind--id="myPlugin::state.after">Text</div>';
+		$new      = $this->interactivity->process_directives( $original );
+		$this->assertEquals( $expected, $new );
+	}
+
+	/**
+	 * Tests that the `data-wp-each` directive works with directly nested template
+	 * tags.
+	 *
+	 * @ticket 60356
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_each_directly_nested_template_tags() {
+		$this->interactivity->state( 'myPlugin', array( 'list2' => array( 3, 4 ) ) );
+		$original = '' .
+			'<template data-wp-each--item1="myPlugin::state.list">' .
+				'<template data-wp-each--item2="myPlugin::state.list2">' .
+					'<span data-wp-text="myPlugin::context.item1"></span>' .
+					'<span data-wp-text="myPlugin::context.item2"></span>' .
+				'</template>' .
+			'</template>' .
+			'<div data-wp-bind--id="myPlugin::state.after">Text</div>';
+		$expected = '' .
+			'<template data-wp-each--item1="myPlugin::state.list">' .
+				'<template data-wp-each--item2="myPlugin::state.list2">' .
+					'<span data-wp-text="myPlugin::context.item1"></span>' .
+					'<span data-wp-text="myPlugin::context.item2"></span>' .
+				'</template>' .
+			'</template>' .
+			'<template data-wp-each-child data-wp-each--item2="myPlugin::state.list2">' .
+				'<span data-wp-text="myPlugin::context.item1"></span>' .
+				'<span data-wp-text="myPlugin::context.item2"></span>' .
+			'</template>' .
+			'<span data-wp-each-child data-wp-text="myPlugin::context.item1">1</span>' .
+			'<span data-wp-each-child data-wp-text="myPlugin::context.item2">3</span>' .
+			'<span data-wp-each-child data-wp-text="myPlugin::context.item1">1</span>' .
+			'<span data-wp-each-child data-wp-text="myPlugin::context.item2">4</span>' .
+			'<template data-wp-each-child data-wp-each--item2="myPlugin::state.list2">' .
+				'<span data-wp-text="myPlugin::context.item1"></span>' .
+				'<span data-wp-text="myPlugin::context.item2"></span>' .
+			'</template>' .
+			'<span data-wp-each-child data-wp-text="myPlugin::context.item1">2</span>' .
+			'<span data-wp-each-child data-wp-text="myPlugin::context.item2">3</span>' .
+			'<span data-wp-each-child data-wp-text="myPlugin::context.item1">2</span>' .
+			'<span data-wp-each-child data-wp-text="myPlugin::context.item2">4</span>' .
+			'<div id="after-wp-each" data-wp-bind--id="myPlugin::state.after">Text</div>';
+		$new      = $this->interactivity->process_directives( $original );
+		$this->assertEquals( $expected, $new );
+	}
+
+	/**
+	 * Tests that the `data-wp-each` directive works with nestded template tags
+	 * that use a previous item as a list.
+	 *
+	 * @ticket 60356
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_each_nested_template_tags_using_previous_item_as_list() {
+		$this->interactivity->state( 'myPlugin', array( 'list2' => array( array( 1, 2 ), array( 3, 4 ) ) ) );
+		$original = '' .
+			'<template data-wp-each--list="myPlugin::state.list2">' .
+				'<template data-wp-each--number="myPlugin::context.list">' .
+					'<span data-wp-text="myPlugin::context.number"></span>' .
+				'</template>' .
+			'</template>' .
+			'<div data-wp-bind--id="myPlugin::state.after">Text</div>';
+		$expected = '' .
+			'<template data-wp-each--list="myPlugin::state.list2">' .
+				'<template data-wp-each--number="myPlugin::context.list">' .
+					'<span data-wp-text="myPlugin::context.number"></span>' .
+				'</template>' .
+			'</template>' .
+			'<template data-wp-each-child data-wp-each--number="myPlugin::context.list">' .
+				'<span data-wp-text="myPlugin::context.number"></span>' .
+			'</template>' .
+			'<span data-wp-each-child data-wp-text="myPlugin::context.number">1</span>' .
+			'<span data-wp-each-child data-wp-text="myPlugin::context.number">2</span>' .
+			'<template data-wp-each-child data-wp-each--number="myPlugin::context.list">' .
+				'<span data-wp-text="myPlugin::context.number"></span>' .
+			'</template>' .
+			'<span data-wp-each-child data-wp-text="myPlugin::context.number">3</span>' .
+			'<span data-wp-each-child data-wp-text="myPlugin::context.number">4</span>' .
+			'<div id="after-wp-each" data-wp-bind--id="myPlugin::state.after">Text</div>';
+		$new      = $this->interactivity->process_directives( $original );
+		$this->assertEquals( $expected, $new );
+	}
+
+	/**
+	 * Tests that the `data-wp-each` directive doesn't process unbalanced tags.
+	 *
+	 * @ticket 60356
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_each_unbalanced_tags() {
+		$original = '' .
+			'<template data-wp-each="myPlugin::state.list">' .
+				'<span data-wp-text="myPlugin::context.item">' .
+			'</template>' .
+			'<div data-wp-bind--id="myPlugin::state.after">Text</div>';
+		$new      = $this->interactivity->process_directives( $original );
+		$this->assertEquals( $original, $new );
+	}
+
+	/**
+	 * Tests that the `data-wp-each` directive doesn't process unbalanced tags in
+	 * nested templates.
+	 *
+	 * @ticket 60356
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_each_unbalanced_tags_in_nested_template_tags() {
+		$this->interactivity->state( 'myPlugin', array( 'list2' => array( 3, 4 ) ) );
+		$original = '' .
+			'<template data-wp-each--item1="myPlugin::state.list">' .
+				'<span data-wp-text="myPlugin::context.item1"></span>' .
+				'<template data-wp-each--item2="myPlugin::state.list2">' .
+					'<span data-wp-text="myPlugin::context.item2">' .
+				'</template>' .
+			'</template>' .
+			'<div data-wp-bind--id="myPlugin::state.after">Text</div>';
+		$new      = $this->interactivity->process_directives( $original );
+		$this->assertEquals( $original, $new );
+	}
+
+	/**
+	 * Tests that the `data-wp-each` directive doesn't process if it doesn't get
+	 * an array.
+	 *
+	 * @ticket 60356
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_each_doesnt_process_if_not_array() {
+		$original = '' .
+			'<template data-wp-each="myPlugin::state.list">' .
+				'<span data-wp-text="myPlugin::context.item"></span>' .
+			'</template>' .
+			'<div data-wp-bind--id="myPlugin::state.after">Text</div>';
+		$expected = '' .
+			'<template data-wp-each="myPlugin::state.list">' .
+				'<span data-wp-text="myPlugin::context.item"></span>' .
+			'</template>' .
+			'<div id="after-wp-each" data-wp-bind--id="myPlugin::state.after">Text</div>';
+
+		$this->interactivity->state( 'myPlugin', array( 'list' => null ) );
+		$new = $this->interactivity->process_directives( $original );
+		$this->assertEquals( $expected, $new );
+
+		$this->interactivity->state( 'myPlugin', array( 'list' => 'Text' ) );
+		$new = $this->interactivity->process_directives( $original );
+		$this->assertEquals( $expected, $new );
+
+		$this->interactivity->state( 'myPlugin', array( 'list' => 100 ) );
+		$new = $this->interactivity->process_directives( $original );
+		$this->assertEquals( $expected, $new );
+
+		$this->interactivity->state( 'myPlugin', array( 'list' => false ) );
+		$new = $this->interactivity->process_directives( $original );
+		$this->assertEquals( $expected, $new );
+
+		$this->interactivity->state( 'myPlugin', array( 'list' => true ) );
+		$new = $this->interactivity->process_directives( $original );
+		$this->assertEquals( $expected, $new );
+	}
+
+	/**
+	 * Tests that the `data-wp-each` directive doesn't process anything if it
+	 * detects manual server-side processing.
+	 *
+	 * @ticket 60356
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_each_doesnt_process_with_manual_server_directive_processing() {
+		$original = '' .
+			'<template data-wp-each="myPlugin::state.list">' .
+				'<span data-wp-text="myPlugin::context.item"></span>' .
+			'</template>' .
+			'<span data-wp-each-child data-wp-text="myPlugin::context.item">1</span>' .
+			'<span data-wp-each-child data-wp-text="myPlugin::context.item">2</span>' .
+			'<div data-wp-bind--id="myPlugin::state.after">Text</div>';
+		$expected = '' .
+			'<template data-wp-each="myPlugin::state.list">' .
+				'<span data-wp-text="myPlugin::context.item"></span>' .
+			'</template>' .
+			'<span data-wp-each-child data-wp-text="myPlugin::context.item">1</span>' .
+			'<span data-wp-each-child data-wp-text="myPlugin::context.item">2</span>' .
+			'<div id="after-wp-each" data-wp-bind--id="myPlugin::state.after">Text</div>';
+		$new      = $this->interactivity->process_directives( $original );
+		$this->assertEquals( $expected, $new );
+	}
+}
diff --git a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-router-region.php b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-router-region.php
new file mode 100644
index 0000000000000..9387f6e0f209a
--- /dev/null
+++ b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-router-region.php
@@ -0,0 +1,159 @@
+<?php
+/**
+ * Unit tests covering the `data_wp_router_region` processor functionality of
+ * the WP_Interactivity_API class.
+ *
+ * @package WordPress
+ * @subpackage Interactivity API
+ *
+ * @group interactivity-api
+ */
+class Tests_WP_Interactivity_API_WP_Router_Region extends WP_UnitTestCase {
+	/**
+	 * Instance of WP_Interactivity_API.
+	 *
+	 * @var WP_Interactivity_API
+	 */
+	protected $interactivity;
+
+	/**
+	 * Original WP_Hook instance associated to `wp_footer`.
+	 *
+	 * @var WP_Hook
+	 */
+	protected $original_wp_footer;
+
+	/**
+	 * Set up.
+	 */
+	public function set_up() {
+		parent::set_up();
+		$this->interactivity = new WP_Interactivity_API();
+
+		// Removes all hooks set for `wp_footer`.
+		global $wp_filter;
+		$this->original_wp_footer = $wp_filter['wp_footer'];
+		$wp_filter['wp_footer']   = new WP_Hook();
+	}
+
+	/**
+	 * Tear down.
+	 */
+	public function tear_down() {
+		// Restores all previous hooks set for `wp_footer`.
+		global $wp_filter;
+		$wp_filter['wp_footer'] = $this->original_wp_footer;
+
+		parent::tear_down();
+	}
+
+	/**
+	 * Executes the hooks associated to `wp_footer`.
+	 */
+	protected function render_wp_footer() {
+		ob_start();
+		do_action( 'wp_footer' );
+		return ob_get_clean();
+	}
+
+	/**
+	 * Tests that no elements are added if the `data-wp-router-region` is
+	 * missing.
+	 *
+	 * @ticket 60356
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_router_region_missing() {
+		$html     = '<div>Nothing here</div>';
+		$new_html = $this->interactivity->process_directives( $html );
+		$footer   = $this->render_wp_footer();
+		$this->assertEquals( $html, $new_html );
+		$this->assertEquals( '', $footer );
+	}
+
+	/**
+	 * Tests that the `data-wp-router-region` directive adds a loading bar and a
+	 * region for screen reader announcements in the footer.
+	 *
+	 * @ticket 60356
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_router_region_adds_loading_bar_aria_live_region() {
+		$html     = '<div data-wp-router-region="region A">Interactive region</div>';
+		$new_html = $this->interactivity->process_directives( $html );
+		$footer   = $this->render_wp_footer();
+
+		$this->assertEquals( $html, $new_html );
+
+		$query = array( 'tag_name' => 'style' );
+
+		$p = new WP_HTML_Tag_Processor( $footer );
+		$this->assertTrue( $p->next_tag( $query ) );
+		$this->assertEquals( 'wp-interactivity-router_animations', $p->get_attribute( 'id' ) );
+		$this->assertFalse( $p->next_tag( $query ) );
+
+		$query = array(
+			'tag_name'   => 'div',
+			'class_name' => 'wp-interactivity-router_loading-bar',
+		);
+
+		$p = new WP_HTML_Tag_Processor( $footer );
+		$this->assertTrue( $p->next_tag( $query ) );
+		$this->assertFalse( $p->next_tag( $query ) );
+
+		$query = array(
+			'tag_name'   => 'div',
+			'class_name' => 'screen-reader-text',
+		);
+
+		$p = new WP_HTML_Tag_Processor( $footer );
+		$this->assertTrue( $p->next_tag( $query ) );
+		$this->assertFalse( $p->next_tag( $query ) );
+	}
+
+	/**
+	 * Tests that the `data-wp-router-region` directive only adds the elements
+	 * once, independently of the number of directives processed.
+	 *
+	 * @ticket 60356
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_router_region_adds_loading_bar_aria_live_region_only_once() {
+		$html     = '
+			<div data-wp-router-region="region A">Interactive region</div>
+			<div data-wp-router-region="region B">Another interactive region</div>
+		';
+		$new_html = $this->interactivity->process_directives( $html );
+		$footer   = $this->render_wp_footer();
+
+		$this->assertEquals( $html, $new_html );
+
+		$query = array( 'tag_name' => 'style' );
+
+		$p = new WP_HTML_Tag_Processor( $footer );
+		$this->assertTrue( $p->next_tag( $query ) );
+		$this->assertEquals( 'wp-interactivity-router_animations', $p->get_attribute( 'id' ) );
+		$this->assertFalse( $p->next_tag( $query ) );
+
+		$query = array(
+			'tag_name'   => 'div',
+			'class_name' => 'wp-interactivity-router_loading-bar',
+		);
+
+		$p = new WP_HTML_Tag_Processor( $footer );
+		$this->assertTrue( $p->next_tag( $query ) );
+		$this->assertFalse( $p->next_tag( $query ) );
+
+		$query = array(
+			'tag_name'   => 'div',
+			'class_name' => 'screen-reader-text',
+		);
+
+		$p = new WP_HTML_Tag_Processor( $footer );
+		$this->assertTrue( $p->next_tag( $query ) );
+		$this->assertFalse( $p->next_tag( $query ) );
+	}
+}

From 6345e2494793cad4294b792fc6ddc54a2bdeb94d Mon Sep 17 00:00:00 2001
From: Luis Herranz <luisherranz@gmail.com>
Date: Mon, 5 Feb 2024 18:51:44 +0100
Subject: [PATCH 34/56] Support data-wp-interactive="myPlugin"

---
 .../class-wp-interactivity-api.php            | 14 ++++++---
 .../wpInteractivityAPI-wp-interactive.php     | 29 +++++++++++++++----
 2 files changed, 34 insertions(+), 9 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 c9c560c413378..c72e9cebbe984 100644
--- a/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
+++ b/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
@@ -484,9 +484,6 @@ private function data_wp_interactive_processor( WP_Interactivity_API_Directives_
 
 		// Tries to decode the `data-wp-interactive` attribute value.
 		$attribute_value = $p->get_attribute( 'data-wp-interactive' );
-		$decoded_json    = is_string( $attribute_value ) && ! empty( $attribute_value )
-			? json_decode( $attribute_value, true )
-			: null;
 
 		/*
 		 * Pushes the newly defined namespace or the current one if the
@@ -496,7 +493,16 @@ private function data_wp_interactive_processor( WP_Interactivity_API_Directives_
 		 * independently of whether the previous `data-wp-interactive` definition
 		 * contained a valid namespace.
 		 */
-		$namespace_stack[] = $decoded_json['namespace'] ?? end( $namespace_stack );
+		if ( is_string( $attribute_value ) && ! empty( $attribute_value ) ) {
+			$decoded_json = json_decode( $attribute_value, true );
+			if ( is_array( $decoded_json ) ) {
+				$namespace_stack[] = $decoded_json['namespace'] ?? end( $namespace_stack );
+			} else {
+				$namespace_stack[] = $attribute_value;
+			}
+		} else {
+			$namespace_stack[] = end( $namespace_stack );
+		}
 	}
 
 	/**
diff --git a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-interactive.php b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-interactive.php
index 45afb26382aa1..fa30571e7dae9 100644
--- a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-interactive.php
+++ b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-interactive.php
@@ -43,13 +43,13 @@ private function process_directives( $html ) {
 
 	/**
 	 * Tests that a default namespace is applied when using the
-	 * `data-wp-interactive` directive.
+	 * `data-wp-interactive` directive with a json object.
 	 *
 	 * @ticket 60356
 	 *
 	 * @covers ::process_directives
 	 */
-	public function test_wp_interactive_sets_a_default_namespace() {
+	public function test_wp_interactive_sets_a_default_namespace_with_object() {
 		$html    = '
 					<div data-wp-interactive=\'{ "namespace": "myPlugin" }\'>
 							<div class="test" data-wp-bind--id="state.id">Text</div>
@@ -59,6 +59,24 @@ public function test_wp_interactive_sets_a_default_namespace() {
 		$this->assertEquals( 'some-id', $p->get_attribute( 'id' ) );
 	}
 
+	/**
+	 * Tests that a default namespace is applied when using the
+	 * `data-wp-interactive` directive with a string.
+	 *
+	 * @ticket 60356
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_interactive_sets_a_default_namespace_with_string() {
+		$html    = '
+					<div data-wp-interactive="myPlugin">
+							<div class="test" data-wp-bind--id="state.id">Text</div>
+					</div>
+			';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'some-id', $p->get_attribute( 'id' ) );
+	}
+
 	/**
 	 * Tests that the most recent `data-wp-interactive` directive replaces the
 	 * previous default namespace.
@@ -83,14 +101,15 @@ public function test_wp_interactive_replaces_the_previous_default_namespace() {
 	}
 
 	/**
-	 * Tests that a `data-wp-interactive` directive without a namespace does not
-	 * replace the previously established default namespace.
+	 * Tests that a `data-wp-interactive` directive with a json object that
+	 * doesn't have a namespace property does not replace the previously
+	 * established default namespace.
 	 *
 	 * @ticket 60356
 	 *
 	 * @covers ::process_directives
 	 */
-	public function test_wp_interactive_without_namespace_doesnt_replace_the_previous_default_namespace() {
+	public function test_wp_interactive_json_without_namespace_doesnt_replace_the_previous_default_namespace() {
 		$html    = '
 					<div data-wp-interactive=\'{ "namespace": "myPlugin" }\'>
 							<div data-wp-interactive=\'{}\'>

From 3b12a115ff7d31490d0d5ab03e30e36a748f0d1d Mon Sep 17 00:00:00 2001
From: Luis Herranz <luisherranz@gmail.com>
Date: Mon, 5 Feb 2024 21:53:12 +0100
Subject: [PATCH 35/56] Add support for data_wp_context

---
 .../interactivity-api/interactivity-api.php   | 26 +++++++
 .../interactivity-api/interactivity-api.php   | 78 +++++++++++++++++++
 2 files changed, 104 insertions(+)

diff --git a/src/wp-includes/interactivity-api/interactivity-api.php b/src/wp-includes/interactivity-api/interactivity-api.php
index d5551cbb35fdf..ad85d27a7d37f 100644
--- a/src/wp-includes/interactivity-api/interactivity-api.php
+++ b/src/wp-includes/interactivity-api/interactivity-api.php
@@ -134,3 +134,29 @@ function wp_interactivity_state( string $store_namespace, array $state = array()
 function wp_interactivity_config( string $store_namespace, array $config = array() ): array {
 	return wp_interactivity()->config( $store_namespace, $config );
 }
+
+/**
+ * Generates a `data-wp-context` directive attribute by encoding a context
+ * array.
+ *
+ * This helper function simplifies the creation of `data-wp-context` directives
+ * by providing a way to pass an array of data, which encodes into a JSON string
+ * safe for direct use as a HTML attribute value.
+ *
+ * Example:
+ *
+ *     <div <?php echo data_wp_context( array( 'isOpen' => true, 'count' => 0 ) ); ?>>
+ *
+ * @since 6.5.0
+ *
+ * @param array  $context         The array of context data to encode.
+ * @param string $store_namespace Optional. The unique store namespace identifier.
+ * @return string A complete `data-wp-context` directive with a JSON encoded value representing the context array and
+ *                the store namespace if specified.
+ */
+function data_wp_context( array $context, string $store_namespace = '' ): string {
+	return 'data-wp-context=\'' .
+		( $store_namespace ? $store_namespace . '::' : '' ) .
+		( empty( $context ) ? '{}' : wp_json_encode( $context, JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_QUOT | JSON_HEX_AMP ) ) .
+		'\'';
+}
diff --git a/tests/phpunit/tests/interactivity-api/interactivity-api.php b/tests/phpunit/tests/interactivity-api/interactivity-api.php
index b6d3f52f47896..cb6b8decf29b9 100644
--- a/tests/phpunit/tests/interactivity-api/interactivity-api.php
+++ b/tests/phpunit/tests/interactivity-api/interactivity-api.php
@@ -311,4 +311,82 @@ public function test_process_directives_only_process_the_root_interactive_blocks
 		unregister_block_type( 'test/custom-directive-block' );
 		$directive_processors->setValue( null, $old_directive_processors );
 	}
+
+	/**
+	 * Tests that data_wp_context function correctly converts different array
+	 * structures to a JSON string.
+	 *
+	 * @ticket 60356
+	 *
+	 * @covers ::data_wp_context
+	 */
+	public function test_data_wp_context_with_different_arrays() {
+		$this->assertEquals( 'data-wp-context=\'{}\'', data_wp_context( array() ) );
+		$this->assertEquals(
+			'data-wp-context=\'{"a":1,"b":"2","c":true}\'',
+			data_wp_context(
+				array(
+					'a' => 1,
+					'b' => '2',
+					'c' => true,
+				)
+			)
+		);
+		$this->assertEquals(
+			'data-wp-context=\'{"a":[1,2]}\'',
+			data_wp_context( array( 'a' => array( 1, 2 ) ) )
+		);
+		$this->assertEquals(
+			'data-wp-context=\'[1,2]\'',
+			data_wp_context( array( 1, 2 ) )
+		);
+	}
+
+	/**
+	 * Tests that data_wp_context function correctly converts different array
+	 * structures to a JSON string and adds a namespace.
+	 *
+	 * @ticket 60356
+	 *
+	 * @covers ::data_wp_context
+	 */
+	public function test_data_wp_context_with_different_arrays_and_a_namespace() {
+		$this->assertEquals( 'data-wp-context=\'myPlugin::{}\'', data_wp_context( array(), 'myPlugin' ) );
+		$this->assertEquals(
+			'data-wp-context=\'myPlugin::{"a":1,"b":"2","c":true}\'',
+			data_wp_context(
+				array(
+					'a' => 1,
+					'b' => '2',
+					'c' => true,
+				),
+				'myPlugin'
+			)
+		);
+		$this->assertEquals(
+			'data-wp-context=\'myPlugin::{"a":[1,2]}\'',
+			data_wp_context( array( 'a' => array( 1, 2 ) ), 'myPlugin' )
+		);
+		$this->assertEquals(
+			'data-wp-context=\'myPlugin::[1,2]\'',
+			data_wp_context( array( 1, 2 ), 'myPlugin' )
+		);
+	}
+
+	/**
+	 * Tests that data_wp_context function correctly applies the JSON encoding
+	 * flags. This ensures that characters like `<`, `>`, `'`, or `&` are
+	 * properly escaped in the JSON-encoded string to prevent potential XSS
+	 * attacks.
+	 *
+	 * @ticket 60356
+	 *
+	 * @covers ::data_wp_context
+	 */
+	public function test_data_wp_context_with_json_flags() {
+		$this->assertEquals( 'data-wp-context=\'{"tag":"\u003Cfoo\u003E"}\'', data_wp_context( array( 'tag' => '<foo>' ) ) );
+		$this->assertEquals( 'data-wp-context=\'{"apos":"\u0027bar\u0027"}\'', data_wp_context( array( 'apos' => "'bar'" ) ) );
+		$this->assertEquals( 'data-wp-context=\'{"quot":"\u0022baz\u0022"}\'', data_wp_context( array( 'quot' => '"baz"' ) ) );
+		$this->assertEquals( 'data-wp-context=\'{"amp":"T\u0026T"}\'', data_wp_context( array( 'amp' => 'T&T' ) ) );
+	}
 }

From 4618663b3575d0d074fdbaf512c29c05ed600e6e Mon Sep 17 00:00:00 2001
From: Luis Herranz <luisherranz@gmail.com>
Date: Tue, 6 Feb 2024 10:06:51 +0100
Subject: [PATCH 36/56] Rename $start/$end to more descriptive names and add
 get_after_opener_tag_and_before_closer_tag_positions function

---
 ...interactivity-api-directives-processor.php | 92 ++++++++++++-------
 1 file changed, 58 insertions(+), 34 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 658614a9efcfc..24201e82fdd0a 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
@@ -51,22 +51,13 @@ public function get_content_between_balanced_template_tags() {
 			return null;
 		}
 
-		// Flushes any changes.
-		$this->get_updated_html();
-
-		$bookmarks = $this->get_balanced_tag_bookmarks();
-		if ( ! $bookmarks ) {
+		$positions = $this->get_after_opener_tag_and_before_closer_tag_positions();
+		if ( ! $positions ) {
 			return null;
 		}
-		list( $start_name, $end_name ) = $bookmarks;
+		list( $after_opener_tag, $before_closer_tag ) = $positions;
 
-		$start = $this->bookmarks[ $start_name ]->start + $this->bookmarks[ $start_name ]->length + 1;
-		$end   = $this->bookmarks[ $end_name ]->start;
-
-		$this->release_bookmark( $start_name );
-		$this->release_bookmark( $end_name );
-
-		return substr( $this->html, $start, $end - $start );
+		return substr( $this->html, $after_opener_tag, $before_closer_tag - $after_opener_tag );
 	}
 
 	/**
@@ -80,23 +71,18 @@ public function get_content_between_balanced_template_tags() {
 	 * @return bool Whether the content was successfully replaced.
 	 */
 	public function set_content_between_balanced_tags( string $new_content ): bool {
-		// Flushes any changes.
-		$this->get_updated_html();
-
-		$bookmarks = $this->get_balanced_tag_bookmarks();
-		if ( ! $bookmarks ) {
+		$positions = $this->get_after_opener_tag_and_before_closer_tag_positions( true );
+		if ( ! $positions ) {
 			return false;
 		}
-		list( $start_name, $end_name ) = $bookmarks;
-
-		$start = $this->bookmarks[ $start_name ]->start + $this->bookmarks[ $start_name ]->length + 1;
-		$end   = $this->bookmarks[ $end_name ]->start;
+		list( $after_opener_tag, $before_closer_tag ) = $positions;
 
-		$this->seek( $start_name );
-		$this->release_bookmark( $start_name );
-		$this->release_bookmark( $end_name );
+		$this->lexical_updates[] = new WP_HTML_Text_Replacement(
+			$after_opener_tag,
+			$before_closer_tag - $after_opener_tag,
+			esc_html( $new_content )
+		);
 
-		$this->lexical_updates[] = new WP_HTML_Text_Replacement( $start, $end - $start, esc_html( $new_content ) );
 		return true;
 	}
 
@@ -121,15 +107,52 @@ public function append_content_after_template_tag_closer( string $new_content ):
 
 		$bookmark = 'append_content_after_template_tag_closer';
 		$this->set_bookmark( $bookmark );
-		$end = $this->bookmarks[ $bookmark ]->start + $this->bookmarks[ $bookmark ]->length + 1;
+		$after_closing_tag = $this->bookmarks[ $bookmark ]->start + $this->bookmarks[ $bookmark ]->length + 1;
 		$this->release_bookmark( $bookmark );
 
 		// Appends the new content.
-		$this->lexical_updates[] = new WP_HTML_Text_Replacement( $end, 0, $new_content );
+		$this->lexical_updates[] = new WP_HTML_Text_Replacement( $after_closing_tag, 0, $new_content );
 
 		return true;
 	}
 
+	/**
+	 * Gets the positions right after the opener tag and right before the closer
+	 * tag in a balanced tag.
+	 *
+	 * By default, it positions the cursor in the closer tag of the balanced tag.
+	 * If $rewind is true, it seeks back to the opener tag.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @access private
+	 *
+	 * @param bool $rewind Optional. Whether to seek back to the opener tag after finding the positions. Defaults to false.
+	 * @return array|null Start and end byte position, or null when no balanced tag bookmarks.
+	 */
+	private function get_after_opener_tag_and_before_closer_tag_positions( bool $rewind = false ) {
+		// Flushes any changes.
+		$this->get_updated_html();
+
+		$bookmarks = $this->get_balanced_tag_bookmarks();
+		if ( ! $bookmarks ) {
+			return null;
+		}
+		list( $opener_tag, $closer_tag ) = $bookmarks;
+
+		$after_opener_tag  = $this->bookmarks[ $opener_tag ]->start + $this->bookmarks[ $opener_tag ]->length + 1;
+		$before_closer_tag = $this->bookmarks[ $closer_tag ]->start;
+
+		if ( $rewind ) {
+			$this->seek( $opener_tag );
+		}
+
+		$this->release_bookmark( $opener_tag );
+		$this->release_bookmark( $closer_tag );
+
+		return array( $after_opener_tag, $before_closer_tag );
+	}
+
 	/**
 	 * Returns a pair of bookmarks for the current opener tag and the matching
 	 * closer tag.
@@ -143,18 +166,18 @@ public function append_content_after_template_tag_closer( string $new_content ):
 	 */
 	private function get_balanced_tag_bookmarks() {
 		static $i   = 0;
-		$start_name = 'start_of_balanced_tag_' . ++$i;
+		$opener_tag = 'opener_tag_of_balanced_tag_' . ++$i;
 
-		$this->set_bookmark( $start_name );
+		$this->set_bookmark( $opener_tag );
 		if ( ! $this->next_balanced_tag_closer_tag() ) {
-			$this->release_bookmark( $start_name );
+			$this->release_bookmark( $opener_tag );
 			return null;
 		}
 
-		$end_name = 'end_of_balanced_tag_' . ++$i;
-		$this->set_bookmark( $end_name );
+		$closer_tag = 'closer_tag_of_balanced_tag_' . ++$i;
+		$this->set_bookmark( $closer_tag );
 
-		return array( $start_name, $end_name );
+		return array( $opener_tag, $closer_tag );
 	}
 
 	/**
@@ -212,6 +235,7 @@ public function next_balanced_tag_closer_tag(): bool {
 	 */
 	public function has_and_visits_its_closer_tag(): bool {
 		$tag_name = $this->get_tag();
+
 		return null !== $tag_name && (
 			! WP_HTML_Processor::is_void( $tag_name ) &&
 			! in_array( $tag_name, self::TAGS_THAT_DONT_VISIT_CLOSER_TAG, true )

From ff61c7cdb1e4c31f58e3140eafbb37ae1f3c7b56 Mon Sep 17 00:00:00 2001
From: Luis Herranz <luisherranz@gmail.com>
Date: Tue, 6 Feb 2024 10:43:44 +0100
Subject: [PATCH 37/56] Fix some texts

---
 .../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 c72e9cebbe984..959ad278f4055 100644
--- a/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
+++ b/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
@@ -274,7 +274,7 @@ private function process_directives_args( string $html, array &$context_stack, a
 				} else {
 					$directives_prefixes = array();
 
-					// Checks if there is is a server directive processor registered for each directive.
+					// Checks if there is a server directive processor registered for each directive.
 					foreach ( $p->get_attribute_names_with_prefix( 'data-wp-' ) as $attribute_name ) {
 						list( $directive_prefix ) = $this->extract_prefix_and_suffix( $attribute_name );
 						if ( array_key_exists( $directive_prefix, self::$directive_processors ) ) {
@@ -681,8 +681,8 @@ private function data_wp_style_processor( WP_Interactivity_API_Directives_Proces
 	 * Sets an individual style property in the `style` attribute of an HTML
 	 * element, updating or removing the property when necessary.
 	 *
-	 * If a property is modified, it is added at the end of the list to make sure
-	 * that it overrides the previous ones.
+	 * If a property is modified, the old one is removed and the new one is added
+	 * at the end of the list.
 	 *
 	 * @since 6.5.0
 	 *

From 71cda6ee49ceb2925c4a8546ae371125d0180a3e Mon Sep 17 00:00:00 2001
From: Luis Herranz <luisherranz@gmail.com>
Date: Tue, 6 Feb 2024 10:44:12 +0100
Subject: [PATCH 38/56] Replace preg_replace with rtrim

---
 .../interactivity-api/class-wp-interactivity-api.php            | 2 +-
 1 file changed, 1 insertion(+), 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 959ad278f4055..6517ceb13e262 100644
--- a/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
+++ b/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
@@ -458,7 +458,7 @@ private function kebab_to_camel_case( string $str ): string {
 				function ( $matches ) {
 					return strtoupper( $matches[2] );
 				},
-				strtolower( preg_replace( '/-+$/', '', $str ) )
+				strtolower( rtrim( $str, '-' ) )
 			)
 		);
 	}

From 4dbb4fe61c210ebfa09d04c2eb5c8d2313a431d0 Mon Sep 17 00:00:00 2001
From: Luis Herranz <luisherranz@gmail.com>
Date: Tue, 6 Feb 2024 10:49:25 +0100
Subject: [PATCH 39/56] Rename set_style_property to merge_style_property

---
 .../class-wp-interactivity-api.php            | 16 ++---
 .../wpInteractivityAPI-wp-style.php           | 58 +++++++++----------
 2 files changed, 37 insertions(+), 37 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 6517ceb13e262..a0123a77e54be 100644
--- a/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
+++ b/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
@@ -662,7 +662,7 @@ private function data_wp_style_processor( WP_Interactivity_API_Directives_Proces
 				 * update the attribute value.
 				 */
 				if ( $style_property_value || $style_attribute_value ) {
-					$style_attribute_value = $this->set_style_property( $style_attribute_value, $style_property, $style_property_value );
+					$style_attribute_value = $this->merge_style_property( $style_attribute_value, $style_property, $style_property_value );
 					/*
 					 * If the style attribute value is not empty, it sets it. Otherwise,
 					 * it removes it.
@@ -678,7 +678,7 @@ private function data_wp_style_processor( WP_Interactivity_API_Directives_Proces
 	}
 
 	/**
-	 * Sets an individual style property in the `style` attribute of an HTML
+	 * Merges an individual style property in the `style` attribute of an HTML
 	 * element, updating or removing the property when necessary.
 	 *
 	 * If a property is modified, the old one is removed and the new one is added
@@ -688,9 +688,9 @@ private function data_wp_style_processor( WP_Interactivity_API_Directives_Proces
 	 *
 	 * Example:
 	 *
-	 *     set_style_property( 'color:green;', 'color', 'red' )      => 'color:red;'
-	 *     set_style_property( 'background:green;', 'color', 'red' ) => 'background:green;color:red;'
-	 *     set_style_property( 'color:green;', 'color', null )       => ''
+	 *     merge_style_property( 'color:green;', 'color', 'red' )      => 'color:red;'
+	 *     merge_style_property( 'background:green;', 'color', 'red' ) => 'background:green;color:red;'
+	 *     merge_style_property( 'color:green;', 'color', null )       => ''
 	 *
 	 * @param string            $style_attribute_value The current style attribute value.
 	 * @param string            $style_property_name   The style property name to set.
@@ -698,13 +698,13 @@ private function data_wp_style_processor( WP_Interactivity_API_Directives_Proces
 	 *                                                 empty string, it removes the style property.
 	 * @return string The new style attribute value after the specified property has been added, updated or removed.
 	 */
-	private function set_style_property( string $style_attribute_value, string $style_property_name, $style_property_value ): string {
+	private function merge_style_property( string $style_attribute_value, string $style_property_name, $style_property_value ): string {
 		$style_assignments    = explode( ';', $style_attribute_value );
 		$result               = array();
 		$style_property_value = ! empty( $style_property_value ) ? rtrim( trim( $style_property_value ), ';' ) : null;
 		$new_style_property   = $style_property_value ? $style_property_name . ':' . $style_property_value . ';' : '';
 
-		// Generate an array with all the properties but the modified one.
+		// Generates an array with all the properties but the modified one.
 		foreach ( $style_assignments as $style_assignment ) {
 			if ( empty( trim( $style_assignment ) ) ) {
 				continue;
@@ -715,7 +715,7 @@ private function set_style_property( string $style_attribute_value, string $styl
 			}
 		}
 
-		// Add the new/modified property at the end of the list.
+		// Adds the new/modified property at the end of the list.
 		$result[] = $new_style_property;
 
 		return implode( '', $result );
diff --git a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-style.php b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-style.php
index b3b64f160d85b..46fa541fb79cc 100644
--- a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-style.php
+++ b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-style.php
@@ -34,7 +34,7 @@ public function set_up() {
 	}
 
 	/**
-	 * Invokes the private `set_style_property` method of WP_Interactivity_API
+	 * Invokes the private `merge_style_property` method of WP_Interactivity_API
 	 * class.
 	 *
 	 * @param string            $style_attribute_value The current style attribute value.
@@ -43,104 +43,104 @@ public function set_up() {
 	 *                                                 empty string, it removes the style property.
 	 * @return string The new style attribute value after the specified property has been added, updated or removed.
 	 */
-	private function set_style_property( $style_attribute_value, $style_property_name, $style_property_value ) {
-		$evaluate = new ReflectionMethod( $this->interactivity, 'set_style_property' );
+	private function merge_style_property( $style_attribute_value, $style_property_name, $style_property_value ) {
+		$evaluate = new ReflectionMethod( $this->interactivity, 'merge_style_property' );
 		$evaluate->setAccessible( true );
 		return $evaluate->invokeArgs( $this->interactivity, array( $style_attribute_value, $style_property_name, $style_property_value ) );
 	}
 
 	/**
-	 * Tests that `set_style_property` correctly sets style properties.
+	 * Tests that `merge_style_property` correctly sets style properties.
 	 *
 	 * @ticket 60356
 	 *
-	 * @covers ::set_style_property
+	 * @covers ::merge_style_property
 	 */
-	public function test_set_style_property_sets_properties() {
+	public function test_merge_style_property_sets_properties() {
 		// Adds property on empty style attribute.
-		$result = $this->set_style_property( '', 'color', 'green' );
+		$result = $this->merge_style_property( '', 'color', 'green' );
 		$this->assertEquals( 'color:green;', $result );
 
 		// Changes style property when there is an existing property.
-		$result = $this->set_style_property( 'color:red;', 'color', 'green' );
+		$result = $this->merge_style_property( 'color:red;', 'color', 'green' );
 		$this->assertEquals( 'color:green;', $result );
 
 		// Adds a new property when the existing one does not match.
-		$result = $this->set_style_property( 'color:red;', 'background', 'blue' );
+		$result = $this->merge_style_property( 'color:red;', 'background', 'blue' );
 		$this->assertEquals( 'color:red;background:blue;', $result );
 
 		// Handles multiple existing properties.
-		$result = $this->set_style_property( 'color:red;margin:5px;', 'color', 'green' );
+		$result = $this->merge_style_property( 'color:red;margin:5px;', 'color', 'green' );
 		$this->assertEquals( 'margin:5px;color:green;', $result );
 
 		// Adds a new property when multiple existing properties do not match.
-		$result = $this->set_style_property( 'color:red;margin:5px;', 'padding', '10px' );
+		$result = $this->merge_style_property( 'color:red;margin:5px;', 'padding', '10px' );
 		$this->assertEquals( 'color:red;margin:5px;padding:10px;', $result );
 
 		// Removes whitespaces in all properties.
-		$result = $this->set_style_property( ' color : red; margin : 5px; ', 'padding', ' 10px ' );
+		$result = $this->merge_style_property( ' color : red; margin : 5px; ', 'padding', ' 10px ' );
 		$this->assertEquals( 'color:red;margin:5px;padding:10px;', $result );
 
 		// Updates a property when it's not the first one in the value.
-		$result = $this->set_style_property( 'color:red;margin:5px;', 'margin', '15px' );
+		$result = $this->merge_style_property( 'color:red;margin:5px;', 'margin', '15px' );
 		$this->assertEquals( 'color:red;margin:15px;', $result );
 
 		// Adds missing trailing semicolon.
-		$result = $this->set_style_property( 'color:red;margin:5px', 'padding', '10px' );
+		$result = $this->merge_style_property( 'color:red;margin:5px', 'padding', '10px' );
 		$this->assertEquals( 'color:red;margin:5px;padding:10px;', $result );
 
 		// Doesn't add double semicolons.
-		$result = $this->set_style_property( 'color:red;margin:5px;', 'padding', '10px;' );
+		$result = $this->merge_style_property( 'color:red;margin:5px;', 'padding', '10px;' );
 		$this->assertEquals( 'color:red;margin:5px;padding:10px;', $result );
 
 		// Handles empty properties in the input.
-		$result = $this->set_style_property( 'color:red;;margin:5px;;', 'padding', '10px' );
+		$result = $this->merge_style_property( 'color:red;;margin:5px;;', 'padding', '10px' );
 		$this->assertEquals( 'color:red;margin:5px;padding:10px;', $result );
 
 		// Moves the modified property to the end.
-		$result = $this->set_style_property( 'border-style: dashed; border: 3px solid red;', 'border-style', 'inset' );
+		$result = $this->merge_style_property( 'border-style: dashed; border: 3px solid red;', 'border-style', 'inset' );
 		$this->assertEquals( 'border:3px solid red;border-style:inset;', $result );
 	}
 
 	/**
-	 * Tests that `set_style_property` works correctly with falsy values, removing
-	 * or ignoring them as appropriate.
+	 * Tests that `merge_style_property` works correctly with falsy values,
+	 * removing or ignoring them as appropriate.
 	 *
 	 * @ticket 60356
 	 *
-	 * @covers ::set_style_property
+	 * @covers ::merge_style_property
 	 */
-	public function test_set_style_property_with_falsy_values() {
+	public function test_merge_style_property_with_falsy_values() {
 		// Removes a property with an empty string.
-		$result = $this->set_style_property( 'color:red;margin:5px;', 'color', '' );
+		$result = $this->merge_style_property( 'color:red;margin:5px;', 'color', '' );
 		$this->assertEquals( 'margin:5px;', $result );
 
 		// Removes a property with null.
-		$result = $this->set_style_property( 'color:red;margin:5px;', 'color', null );
+		$result = $this->merge_style_property( 'color:red;margin:5px;', 'color', null );
 		$this->assertEquals( 'margin:5px;', $result );
 
 		// Removes a property with false.
-		$result = $this->set_style_property( 'color:red;margin:5px;', 'color', false );
+		$result = $this->merge_style_property( 'color:red;margin:5px;', 'color', false );
 		$this->assertEquals( 'margin:5px;', $result );
 
 		// Removes a property with 0.
-		$result = $this->set_style_property( 'color:red;margin:5px;', 'color', 0 );
+		$result = $this->merge_style_property( 'color:red;margin:5px;', 'color', 0 );
 		$this->assertEquals( 'margin:5px;', $result );
 
 		// It doesn't add a new property with an empty string.
-		$result = $this->set_style_property( 'color:red;', 'padding', '' );
+		$result = $this->merge_style_property( 'color:red;', 'padding', '' );
 		$this->assertEquals( 'color:red;', $result );
 
 		// It doesn't add a new property with null.
-		$result = $this->set_style_property( 'color:red;', 'padding', null );
+		$result = $this->merge_style_property( 'color:red;', 'padding', null );
 		$this->assertEquals( 'color:red;', $result );
 
 		// It doesn't add a new property with false.
-		$result = $this->set_style_property( 'color:red;', 'padding', false );
+		$result = $this->merge_style_property( 'color:red;', 'padding', false );
 		$this->assertEquals( 'color:red;', $result );
 
 		// It doesn't add a new property with 0.
-		$result = $this->set_style_property( 'color:red;', 'padding', 0 );
+		$result = $this->merge_style_property( 'color:red;', 'padding', 0 );
 		$this->assertEquals( 'color:red;', $result );
 	}
 

From 330472cfaa3759bf3632a26d96e5283df657f6ec Mon Sep 17 00:00:00 2001
From: Luis Herranz <luisherranz@gmail.com>
Date: Tue, 6 Feb 2024 10:51:45 +0100
Subject: [PATCH 40/56] Add json extension requirement to composer

---
 composer.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/composer.json b/composer.json
index 3aa7efe420ec0..632ebd9f63136 100644
--- a/composer.json
+++ b/composer.json
@@ -10,6 +10,7 @@
 		"issues": "https://core.trac.wordpress.org/"
 	},
 	"require": {
+		"ext-json": "*",
 		"php": ">=7.0"
 	},
 	"suggest": {

From e0533e555f5b3a76c00c266e383cabd64e63ef5c Mon Sep 17 00:00:00 2001
From: Luis Herranz <luisherranz@gmail.com>
Date: Tue, 6 Feb 2024 10:54:21 +0100
Subject: [PATCH 41/56] Fix some indentation issues

---
 .../class-wp-interactivity-api.php            | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 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 a0123a77e54be..e3b6ac8f67178 100644
--- a/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
+++ b/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
@@ -868,13 +868,13 @@ private function data_wp_each_processor( WP_Interactivity_API_Directives_Process
 			$p->release_bookmark( $template_end );
 
 			/*
-				* It doesn't process in these situations:
-				* - Manual server-side directive processing.
-				* - Empty or non-array values.
-				* - Associative arrays because those are deserialized as objects in JS.
-				* - Templates that contain top-level texts because those texts can't be
-				*   identified and removed in the client.
-				*/
+			 * It doesn't process in these situations:
+			 * - Manual server-side directive processing.
+			 * - Empty or non-array values.
+			 * - Associative arrays because those are deserialized as objects in JS.
+			 * - Templates that contain top-level texts because those texts can't be
+			 *   identified and removed in the client.
+			 */
 			if (
 				$manual_sdp ||
 				empty( $result ) ||
@@ -882,7 +882,7 @@ private function data_wp_each_processor( WP_Interactivity_API_Directives_Process
 				! array_is_list( $result ) ||
 				! str_starts_with( trim( $inner_content ), '<' ) ||
 				! str_ends_with( trim( $inner_content ), '>' )
-				) {
+			) {
 				array_pop( $tag_stack );
 				return;
 			}
@@ -890,8 +890,8 @@ private function data_wp_each_processor( WP_Interactivity_API_Directives_Process
 			// Extracts the namespace from the directive attribute value.
 			$namespace_value         = end( $namespace_stack );
 			list( $namespace_value ) = is_string( $attribute_value ) && ! empty( $attribute_value )
-			? $this->extract_directive_value( $attribute_value, $namespace_value )
-			: array( $namespace_value, null );
+				? $this->extract_directive_value( $attribute_value, $namespace_value )
+				: array( $namespace_value, null );
 
 			// Processes the inner content for each item of the array.
 			$processed_content = '';

From e5b88fa5386360c3816554a4b79b0217880380a0 Mon Sep 17 00:00:00 2001
From: Luis Herranz <luisherranz@gmail.com>
Date: Tue, 6 Feb 2024 10:55:36 +0100
Subject: [PATCH 42/56] Replace array_push

---
 .../interactivity-api/class-wp-interactivity-api.php     | 9 +++------
 1 file changed, 3 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 e3b6ac8f67178..e8c4b972a3238 100644
--- a/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
+++ b/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
@@ -897,12 +897,9 @@ private function data_wp_each_processor( WP_Interactivity_API_Directives_Process
 			$processed_content = '';
 			foreach ( $result as $item ) {
 				// Creates a new context that includes the current item of the array.
-				array_push(
-					$context_stack,
-					array_replace_recursive(
-						end( $context_stack ) !== false ? end( $context_stack ) : array(),
-						array( $namespace_value => array( $item_name => $item ) )
-					)
+				$context_stack[] = array_replace_recursive(
+					end( $context_stack ) !== false ? end( $context_stack ) : array(),
+					array( $namespace_value => array( $item_name => $item ) )
 				);
 
 				// Processes the inner content with the new context.

From f0103140dd7f88f67807d8f93953af0d5212ce4a Mon Sep 17 00:00:00 2001
From: Luis Herranz <luisherranz@gmail.com>
Date: Tue, 6 Feb 2024 18:36:28 +0100
Subject: [PATCH 43/56] Use two block names in tests to make sure they render
 fine

---
 .../interactivity-api/interactivity-api.php   | 33 ++++++++++---------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/tests/phpunit/tests/interactivity-api/interactivity-api.php b/tests/phpunit/tests/interactivity-api/interactivity-api.php
index cb6b8decf29b9..c98d74f415350 100644
--- a/tests/phpunit/tests/interactivity-api/interactivity-api.php
+++ b/tests/phpunit/tests/interactivity-api/interactivity-api.php
@@ -17,11 +17,9 @@ class Tests_Interactivity_API_Functions extends WP_UnitTestCase {
 	public function set_up() {
 		parent::set_up();
 
-		register_block_type(
-			'test/interactive-block',
-			array(
-				'render_callback' => function ( $attributes, $content ) {
-					return '
+		$interactive_block = array(
+			'render_callback' => function ( $attributes, $content ) {
+				return '
 						<div
 							data-wp-interactive=\'{ "namespace": "myPlugin" }\'
 							data-wp-context=\'{ "block": ' . $attributes['block'] . ' }\'
@@ -30,15 +28,17 @@ public function set_up() {
 								class="interactive/block-' . $attributes['block'] . '"
 								data-wp-bind--value="context.block"
 							>' .
-							$content .
-						'</div>';
-				},
-				'supports'        => array(
-					'interactivity' => true,
-				),
-			)
+						$content .
+					'</div>';
+			},
+			'supports'        => array(
+				'interactivity' => true,
+			),
 		);
 
+		register_block_type( 'test/interactive-block', $interactive_block );
+		register_block_type( 'test/interactive-block-2', $interactive_block );
+
 		register_block_type(
 			'test/non-interactive-block',
 			array(
@@ -59,6 +59,7 @@ class="interactive/block-' . $attributes['block'] . '"
 	 */
 	public function tear_down() {
 		unregister_block_type( 'test/interactive-block' );
+		unregister_block_type( 'test/interactive-block-2' );
 		unregister_block_type( 'test/non-interactive-block' );
 		parent::tear_down();
 	}
@@ -89,7 +90,7 @@ public function test_processs_directives_of_single_interactive_block() {
 	public function test_processs_directives_of_multiple_interactive_blocks_in_paralell() {
 		$post_content    = '
 			<!-- wp:test/interactive-block { "block": 1 } /-->
-			<!-- wp:test/interactive-block { "block": 2 } /-->
+			<!-- wp:test/interactive-block-2 { "block": 2 } /-->
 			<!-- wp:test/non-interactive-block { "block": 3, "hasDirective": true } /-->
 			<!-- wp:test/interactive-block { "block": 4 } /-->
 		';
@@ -161,7 +162,7 @@ public function test_processs_directives_of_interactive_block_inside_multple_non
 				<!-- wp:test/interactive-block { "block": 2 } /-->
 			<!-- /wp:test/non-interactive-block -->
 			<!-- wp:test/non-interactive-block { "block": 3 } -->
-				<!-- wp:test/interactive-block { "block": 4 } /-->
+				<!-- wp:test/interactive-block-2 { "block": 4 } /-->
 			<!-- /wp:test/non-interactive-block -->
 		';
 		$rendered_blocks = do_blocks( $post_content );
@@ -228,9 +229,9 @@ public function test_processs_directives_of_interactive_block_containing_non_int
 	public function test_processs_directives_of_interactive_block_containing_nested_interactive_and_non_interactive_blocks() {
 		$post_content    = '
 			<!-- wp:test/interactive-block { "block": 1 } -->
-				<!-- wp:test/interactive-block { "block": 2 } -->
+				<!-- wp:test/interactive-block-2 { "block": 2 } -->
 					<!-- wp:test/non-interactive-block { "block": 3, "hasDirective": true } /-->
-				<!-- /wp:test/interactive-block -->
+				<!-- /wp:test/interactive-block-2 -->
 				<!-- wp:test/non-interactive-block { "block": 4, "hasDirective": true } /-->
 			<!-- /wp:test/interactive-block -->
 		';

From a2b4aae37dc9dcfc7ecf6a30b9e491f99f5340f9 Mon Sep 17 00:00:00 2001
From: Luis Herranz <luisherranz@gmail.com>
Date: Tue, 6 Feb 2024 18:36:44 +0100
Subject: [PATCH 44/56] Switch to render_block_{$this->name} filter

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

diff --git a/src/wp-includes/interactivity-api/interactivity-api.php b/src/wp-includes/interactivity-api/interactivity-api.php
index ad85d27a7d37f..179a5fae611b1 100644
--- a/src/wp-includes/interactivity-api/interactivity-api.php
+++ b/src/wp-includes/interactivity-api/interactivity-api.php
@@ -46,7 +46,7 @@ function wp_interactivity_process_directives_of_interactive_blocks( array $parse
 					// The root interactive blocks has finished rendering, process it.
 					$content = wp_interactivity_process_directives( $content );
 					// Removes the filter and reset the root interactive block.
-					remove_filter( 'render_block', $process_interactive_blocks );
+					remove_filter( 'render_block_' . $parsed_block['blockName'], $process_interactive_blocks );
 					$root_interactive_block = null;
 				}
 				return $content;
@@ -56,7 +56,7 @@ function wp_interactivity_process_directives_of_interactive_blocks( array $parse
 			 * Uses a priority of 20 to ensure that other filters can add additional
 			 * directives before the processing starts.
 			 */
-			add_filter( 'render_block', $process_interactive_blocks, 20, 2 );
+			add_filter( 'render_block_' . $block_name, $process_interactive_blocks, 20, 2 );
 		}
 	}
 

From c90d33708229a1f26358864e37410c2b4749f63e Mon Sep 17 00:00:00 2001
From: Luis Herranz <luisherranz@gmail.com>
Date: Tue, 6 Feb 2024 18:37:40 +0100
Subject: [PATCH 45/56] Add LanguageTool suggestion

Co-authored-by: Weston Ruter <westonruter@google.com>
---
 .../interactivity-api/class-wp-interactivity-api.php            | 2 +-
 1 file changed, 1 insertion(+), 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 e8c4b972a3238..0f56c54e49f12 100644
--- a/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
+++ b/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
@@ -221,7 +221,7 @@ public function process_directives( string $html ): string {
 	 * Processes the interactivity directives contained within the HTML content
 	 * and updates the markup accordingly.
 	 *
-	 * It needs the context and namespace stacks to be passed by reference and
+	 * It needs the context and namespace stacks to be passed by reference, and
 	 * it returns null if the HTML contains unbalanced tags.
 	 *
 	 * @since 6.5.0

From 8eec2f3c42958482f459153b862172d6b8fa9130 Mon Sep 17 00:00:00 2001
From: Luis Herranz <luisherranz@gmail.com>
Date: Tue, 6 Feb 2024 18:37:59 +0100
Subject: [PATCH 46/56] Add missing processors in @uses

Co-authored-by: Weston Ruter <westonruter@google.com>
---
 .../interactivity-api/class-wp-interactivity-api.php            | 2 ++
 1 file changed, 2 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 0f56c54e49f12..4f2ac78c89c76 100644
--- a/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
+++ b/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
@@ -206,6 +206,8 @@ public function add_hooks() {
 	 * @uses WP_Interactivity_API::data_wp_class_processor()
 	 * @uses WP_Interactivity_API::data_wp_style_processor()
 	 * @uses WP_Interactivity_API::data_wp_text_processor()
+	 * @uses WP_Interactivity_API::data_wp_router_region_processor()
+	 * @uses WP_Interactivity_API::data_wp_each_processor()
 	 *
 	 * @param string $html The HTML content to process.
 	 * @return string The processed HTML content. It returns the original content when the HTML contains unbalanced tags.

From 8a1caa92a9e0183eaa8f3c33833c2391531f37de Mon Sep 17 00:00:00 2001
From: Luis Herranz <luisherranz@gmail.com>
Date: Tue, 6 Feb 2024 13:30:48 +0100
Subject: [PATCH 47/56] Try moving styles to a WP inline style

---
 .../class-wp-interactivity-api.php            | 123 ++++++++++--------
 1 file changed, 72 insertions(+), 51 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 4f2ac78c89c76..3d860cbd228de 100644
--- a/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
+++ b/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
@@ -753,6 +753,72 @@ private function data_wp_text_processor( WP_Interactivity_API_Directives_Process
 		}
 	}
 
+	/**
+	 * Returns the CSS styles for animating the top loading bar in the router.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @return string The CSS styles for the router's top loading bar animation.
+	 */
+	private function router_animation_styles(): string {
+		return <<<CSS
+			.wp-interactivity-router_loading-bar {
+				position: fixed;
+				top: 0;
+				left: 0;
+				margin: 0;
+				padding: 0;
+				width: 100vw;
+				max-width: 100vw !important;
+				height: 4px;
+				background-color: var(--wp--preset--color--primary, #000);
+				opacity: 0
+			}
+			.wp-interactivity-router_loading-bar.start-animation {
+				animation: wp-interactivity-router_loading-bar-start-animation 30s cubic-bezier(0.03, 0.5, 0, 1) forwards
+			}
+			.wp-interactivity-router_loading-bar.finish-animation {
+				animation: wp-interactivity-router_loading-bar-finish-animation 300ms ease-in
+			}
+			@keyframes wp-interactivity-router_loading-bar-start-animation {
+				0% { transform: scaleX(0); transform-origin: 0% 0%; opacity: 1 }
+				100% { transform: scaleX(1); transform-origin: 0% 0%; opacity: 1 }
+			}
+			@keyframes wp-interactivity-router_loading-bar-finish-animation {
+				0% { opacity: 1 }
+				50% { opacity: 1 }
+				100% { opacity: 0 }
+			}
+CSS;
+	}
+
+	/**
+	 * Outputs the markup for the top loading indicator and the screen reader
+	 * notifications during client-side navigations.
+	 *
+	 * This method prints a div element representing a loading bar visible during
+	 * navigation, as well as an aria-live region that can be read by screen
+	 * readers to announce navigation status.
+	 *
+	 * @since 6.5.0
+	 */
+	public function router_loading_and_screen_reader_markup() {
+		echo <<<HTML
+			<div
+				class="wp-interactivity-router_loading-bar"
+				data-wp-interactive='{"namespace":"core/router"}'
+				data-wp-class--start-animation="state.navigation.hasStarted"
+				data-wp-class--finish-animation="state.navigation.hasFinished"
+			></div>
+			<div
+				class="screen-reader-text"
+				aria-live="polite"
+				data-wp-interactive='{"namespace":"core/router"}'
+				data-wp-text="state.navigation.message"
+			></div>
+HTML;
+	}
+
 	/**
 	 * Processes the `data-wp-router-region` directive.
 	 *
@@ -774,10 +840,7 @@ private function data_wp_router_region_processor( WP_Interactivity_API_Directive
 				'core/router',
 				array(
 					'navigation' => array(
-						'message'     => '',
-						'hasStarted'  => false,
-						'hasFinished' => false,
-						'texts'       => array(
+						'texts' => array(
 							'loading' => __( 'Loading page, please wait.' ),
 							'loaded'  => __( 'Page Loaded.' ),
 						),
@@ -785,54 +848,12 @@ private function data_wp_router_region_processor( WP_Interactivity_API_Directive
 				)
 			);
 
-			$callback = static function () {
-				echo <<<HTML
-<style id="wp-interactivity-router_animations">
-	.wp-interactivity-router_loading-bar {
-		position: fixed;
-		top: 0;
-		left: 0;
-		margin: 0;
-		padding: 0;
-		width: 100vw;
-		max-width: 100vw !important;
-		height: 4px;
-		background-color: var(--wp--preset--color--primary, #000);
-		opacity: 0
-	}
-	.wp-interactivity-router_loading-bar.start-animation {
-		animation: wp-interactivity-router_loading-bar-start-animation 30s cubic-bezier(0.03, 0.5, 0, 1) forwards
-	}
-	.wp-interactivity-router_loading-bar.finish-animation {
-		animation: wp-interactivity-router_loading-bar-finish-animation 300ms ease-in
-	}
-
-	@keyframes wp-interactivity-router_loading-bar-start-animation {
-		0% { transform: scaleX(0); transform-origin: 0% 0%; opacity: 1 }
-		100% { transform: scaleX(1); transform-origin: 0% 0%; opacity: 1 }
-	}
-	@keyframes wp-interactivity-router_loading-bar-finish-animation {
-		0% { opacity: 1 }
-		50% { opacity: 1 }
-		100% { opacity: 0 }
-	}
-</style>
-<div
-	class="wp-interactivity-router_loading-bar"
-	data-wp-interactive='{"namespace":"core/router"}'
-	data-wp-class--start-animation="state.navigation.hasStarted"
-	data-wp-class--finish-animation="state.navigation.hasFinished"
-></div>
-<div
-	class="screen-reader-text"
-	aria-live="polite"
-	data-wp-interactive='{"namespace":"core/router"}'
-	data-wp-text="state.navigation.message"
-></div>
-HTML;
-			};
+			// Enqueues as an inline style.
+			wp_enqueue_style( 'wp-interactivity-router_animations', false );
+			wp_add_inline_style( 'wp-interactivity-router_animations', $this->router_animation_styles() );
 
-			add_action( 'wp_footer', $callback );
+			// Adds the necessary markup to the footer.
+			add_action( 'wp_footer', array( $this, 'router_loading_and_screen_reader_markup' ) );
 		}
 	}
 

From 71d1918b8f8b9b6cf3030b7cb2c2b7b942986bd0 Mon Sep 17 00:00:00 2001
From: Luis Herranz <luisherranz@gmail.com>
Date: Tue, 6 Feb 2024 19:34:53 +0100
Subject: [PATCH 48/56] Adapt interactivity detection to new schema

https://github.com/WordPress/gutenberg/pull/58132
---
 src/wp-includes/interactivity-api/interactivity-api.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/wp-includes/interactivity-api/interactivity-api.php b/src/wp-includes/interactivity-api/interactivity-api.php
index 179a5fae611b1..548fcc3638fb7 100644
--- a/src/wp-includes/interactivity-api/interactivity-api.php
+++ b/src/wp-includes/interactivity-api/interactivity-api.php
@@ -31,7 +31,11 @@ function wp_interactivity_process_directives_of_interactive_blocks( array $parse
 		$block_name = $parsed_block['blockName'];
 		$block_type = WP_Block_Type_Registry::get_instance()->get_registered( $block_name );
 
-		if ( isset( $block_name ) && isset( $block_type->supports['interactivity'] ) && $block_type->supports['interactivity'] ) {
+		if (
+			isset( $block_name ) &&
+			( ( isset( $block_type->supports['interactivity'] ) && true === $block_type->supports['interactivity'] ) ||
+			( isset( $block_type->supports['interactivity']['interactive'] ) && true === $block_type->supports['interactivity']['interactive'] ) )
+		) {
 			// Annotates the root interactive block for processing.
 			$root_interactive_block = array( $block_name, $parsed_block );
 

From 69afa1346687f53e9193b2ae7953abb3e5f3dbbb Mon Sep 17 00:00:00 2001
From: Luis Herranz <luisherranz@gmail.com>
Date: Tue, 6 Feb 2024 19:38:31 +0100
Subject: [PATCH 49/56] Fix inline style

---
 .../interactivity-api/class-wp-interactivity-api.php         | 5 +++--
 1 file changed, 3 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 3d860cbd228de..16e5cd88012a1 100644
--- a/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
+++ b/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
@@ -849,8 +849,9 @@ private function data_wp_router_region_processor( WP_Interactivity_API_Directive
 			);
 
 			// Enqueues as an inline style.
-			wp_enqueue_style( 'wp-interactivity-router_animations', false );
-			wp_add_inline_style( 'wp-interactivity-router_animations', $this->router_animation_styles() );
+			wp_register_style( 'wp_interactivity_router_animations', false );
+			wp_add_inline_style( 'wp_interactivity_router_animations', $this->router_animation_styles() );
+			wp_enqueue_style( 'wp_interactivity_router_animations' );
 
 			// Adds the necessary markup to the footer.
 			add_action( 'wp_footer', array( $this, 'router_loading_and_screen_reader_markup' ) );

From 1bb9137e10a660c9efeb99e48c93b1b67ce9f193 Mon Sep 17 00:00:00 2001
From: Luis Herranz <luisherranz@gmail.com>
Date: Tue, 6 Feb 2024 20:18:10 +0100
Subject: [PATCH 50/56] Change data-wp-router-region tests to check for the
 inline styles

---
 .../wpInteractivityAPI-wp-router-region.php   | 94 +++++++------------
 1 file changed, 33 insertions(+), 61 deletions(-)

diff --git a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-router-region.php b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-router-region.php
index 9387f6e0f209a..2f855d71fc3b1 100644
--- a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-router-region.php
+++ b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-router-region.php
@@ -23,6 +23,13 @@ class Tests_WP_Interactivity_API_WP_Router_Region extends WP_UnitTestCase {
 	 */
 	protected $original_wp_footer;
 
+	/**
+	 * Original instance associated to `wp_footer`.
+	 *
+	 * @var WP_Styles
+	 */
+	protected $original_wp_styles;
+
 	/**
 	 * Set up.
 	 */
@@ -34,6 +41,12 @@ public function set_up() {
 		global $wp_filter;
 		$this->original_wp_footer = $wp_filter['wp_footer'];
 		$wp_filter['wp_footer']   = new WP_Hook();
+
+		// Removes all registered styles.
+		$this->original_wp_styles = isset( $GLOBALS['wp_styles'] ) ? $GLOBALS['wp_styles'] : null;
+		$GLOBALS['wp_styles']     = new WP_Styles();
+		remove_action( 'wp_default_styles', 'wp_default_styles' );
+		remove_action( 'wp_print_styles', 'print_emoji_styles' );
 	}
 
 	/**
@@ -44,6 +57,11 @@ public function tear_down() {
 		global $wp_filter;
 		$wp_filter['wp_footer'] = $this->original_wp_footer;
 
+		// Restores all previous registered styles.
+		$GLOBALS['wp_styles'] = $this->original_wp_styles;
+		add_action( 'wp_default_styles', 'wp_default_styles' );
+		add_action( 'wp_print_styles', 'print_emoji_styles' );
+
 		parent::tear_down();
 	}
 
@@ -70,52 +88,13 @@ public function test_wp_router_region_missing() {
 		$footer   = $this->render_wp_footer();
 		$this->assertEquals( $html, $new_html );
 		$this->assertEquals( '', $footer );
+		$this->assertEquals( '', get_echo( 'wp_print_styles' ) );
 	}
 
 	/**
 	 * Tests that the `data-wp-router-region` directive adds a loading bar and a
-	 * region for screen reader announcements in the footer.
-	 *
-	 * @ticket 60356
-	 *
-	 * @covers ::process_directives
-	 */
-	public function test_wp_router_region_adds_loading_bar_aria_live_region() {
-		$html     = '<div data-wp-router-region="region A">Interactive region</div>';
-		$new_html = $this->interactivity->process_directives( $html );
-		$footer   = $this->render_wp_footer();
-
-		$this->assertEquals( $html, $new_html );
-
-		$query = array( 'tag_name' => 'style' );
-
-		$p = new WP_HTML_Tag_Processor( $footer );
-		$this->assertTrue( $p->next_tag( $query ) );
-		$this->assertEquals( 'wp-interactivity-router_animations', $p->get_attribute( 'id' ) );
-		$this->assertFalse( $p->next_tag( $query ) );
-
-		$query = array(
-			'tag_name'   => 'div',
-			'class_name' => 'wp-interactivity-router_loading-bar',
-		);
-
-		$p = new WP_HTML_Tag_Processor( $footer );
-		$this->assertTrue( $p->next_tag( $query ) );
-		$this->assertFalse( $p->next_tag( $query ) );
-
-		$query = array(
-			'tag_name'   => 'div',
-			'class_name' => 'screen-reader-text',
-		);
-
-		$p = new WP_HTML_Tag_Processor( $footer );
-		$this->assertTrue( $p->next_tag( $query ) );
-		$this->assertFalse( $p->next_tag( $query ) );
-	}
-
-	/**
-	 * Tests that the `data-wp-router-region` directive only adds the elements
-	 * once, independently of the number of directives processed.
+	 * region for screen reader announcements in the footer, and styles for the
+	 * loading bar. Also checks that the markup and styles are only added once.
 	 *
 	 * @ticket 60356
 	 *
@@ -127,32 +106,25 @@ public function test_wp_router_region_adds_loading_bar_aria_live_region_only_onc
 			<div data-wp-router-region="region B">Another interactive region</div>
 		';
 		$new_html = $this->interactivity->process_directives( $html );
-		$footer   = $this->render_wp_footer();
-
 		$this->assertEquals( $html, $new_html );
 
-		$query = array( 'tag_name' => 'style' );
-
-		$p = new WP_HTML_Tag_Processor( $footer );
+		// Check that the style is loaded, but only once.
+		$styles = get_echo( 'wp_print_styles' );
+		$query  = array( 'tag_name' => 'style' );
+		$p      = new WP_HTML_Tag_Processor( $styles );
 		$this->assertTrue( $p->next_tag( $query ) );
-		$this->assertEquals( 'wp-interactivity-router_animations', $p->get_attribute( 'id' ) );
+		$this->assertEquals( 'wp_interactivity_router_animations-inline-css', $p->get_attribute( 'id' ) );
+		$this->assertStringContainsString( '.wp-interactivity-router_loading-bar', $styles );
 		$this->assertFalse( $p->next_tag( $query ) );
 
-		$query = array(
-			'tag_name'   => 'div',
-			'class_name' => 'wp-interactivity-router_loading-bar',
-		);
-
-		$p = new WP_HTML_Tag_Processor( $footer );
+		// Check that the markup is loaded, but only once.
+		$footer = $this->render_wp_footer();
+		$query  = array( 'class_name' => 'wp-interactivity-router_loading-bar' );
+		$p      = new WP_HTML_Tag_Processor( $footer );
 		$this->assertTrue( $p->next_tag( $query ) );
 		$this->assertFalse( $p->next_tag( $query ) );
-
-		$query = array(
-			'tag_name'   => 'div',
-			'class_name' => 'screen-reader-text',
-		);
-
-		$p = new WP_HTML_Tag_Processor( $footer );
+		$query = array( 'class_name' => 'screen-reader-text' );
+		$p     = new WP_HTML_Tag_Processor( $footer );
 		$this->assertTrue( $p->next_tag( $query ) );
 		$this->assertFalse( $p->next_tag( $query ) );
 	}

From 30dc9046e3b0abf84d52aa029514ec10e8ffd4b6 Mon Sep 17 00:00:00 2001
From: Luis Herranz <luisherranz@gmail.com>
Date: Tue, 6 Feb 2024 20:51:19 +0100
Subject: [PATCH 51/56] Checks for valid namespace characters in
 `data-wp-interactive`

---
 .../class-wp-interactivity-api.php            | 10 ++++----
 .../wpInteractivityAPI-wp-interactive.php     | 23 +++++++++++++++++++
 2 files changed, 29 insertions(+), 4 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 16e5cd88012a1..eb26453b3a23c 100644
--- a/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
+++ b/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
@@ -495,16 +495,18 @@ private function data_wp_interactive_processor( WP_Interactivity_API_Directives_
 		 * independently of whether the previous `data-wp-interactive` definition
 		 * contained a valid namespace.
 		 */
+		$new_namespace = null;
 		if ( is_string( $attribute_value ) && ! empty( $attribute_value ) ) {
 			$decoded_json = json_decode( $attribute_value, true );
 			if ( is_array( $decoded_json ) ) {
-				$namespace_stack[] = $decoded_json['namespace'] ?? end( $namespace_stack );
+				$new_namespace = $decoded_json['namespace'] ?? null;
 			} else {
-				$namespace_stack[] = $attribute_value;
+				$new_namespace = $attribute_value;
 			}
-		} else {
-			$namespace_stack[] = end( $namespace_stack );
 		}
+		$namespace_stack[] = ( $new_namespace && 1 === preg_match( '/^([\w\-_\/]+)/', $new_namespace ) )
+			? $new_namespace
+			: end( $namespace_stack );
 	}
 
 	/**
diff --git a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-interactive.php b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-interactive.php
index fa30571e7dae9..277287a553ba3 100644
--- a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-interactive.php
+++ b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-interactive.php
@@ -147,6 +147,29 @@ public function test_wp_interactive_with_empty_value_doesnt_replace_the_previous
 		$this->assertEquals( 'some-id', $p->get_attribute( 'id' ) );
 	}
 
+	/**
+	 * Tests that an invalid value for `data-wp-interactive` does not replace the
+	 * previously established default namespace.
+	 *
+	 * @ticket 60356
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_interactive_with_invalid_value_doesnt_replace_the_previous_default_namespace() {
+		$html    = '
+				<div data-wp-interactive=\'{ "namespace": "myPlugin" }\'>
+						<div data-wp-interactive="$myPlugin">
+								<div class="test" data-wp-bind--id="state.id">Text</div>
+						</div>
+						<div class="test" data-wp-bind--id="state.id">Text</div>
+				</div>
+		';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'some-id', $p->get_attribute( 'id' ) );
+		$p->next_tag( array( 'class_name' => 'test' ) );
+		$this->assertEquals( 'some-id', $p->get_attribute( 'id' ) );
+	}
+
 	/**
 	 * Tests that a `data-wp-interactive` directive with no assigned value does
 	 * not replace the previously established default namespace.

From 9d215326317faac3a8d3225df025a89a9d29381b Mon Sep 17 00:00:00 2001
From: Luis Herranz <luisherranz@gmail.com>
Date: Tue, 6 Feb 2024 20:55:50 +0100
Subject: [PATCH 52/56] Replace underscores with hyphens

Co-authored-by: Weston Ruter <westonruter@google.com>
---
 .../class-wp-interactivity-api.php            | 22 +++++++++----------
 .../wpInteractivityAPI-wp-router-region.php   |  6 ++---
 2 files changed, 14 insertions(+), 14 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 eb26453b3a23c..417427104100c 100644
--- a/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
+++ b/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
@@ -764,7 +764,7 @@ private function data_wp_text_processor( WP_Interactivity_API_Directives_Process
 	 */
 	private function router_animation_styles(): string {
 		return <<<CSS
-			.wp-interactivity-router_loading-bar {
+			.wp-interactivity-router-loading-bar {
 				position: fixed;
 				top: 0;
 				left: 0;
@@ -776,17 +776,17 @@ private function router_animation_styles(): string {
 				background-color: var(--wp--preset--color--primary, #000);
 				opacity: 0
 			}
-			.wp-interactivity-router_loading-bar.start-animation {
-				animation: wp-interactivity-router_loading-bar-start-animation 30s cubic-bezier(0.03, 0.5, 0, 1) forwards
+			.wp-interactivity-router-loading-bar.start-animation {
+				animation: wp-interactivity-router-loading-bar-start-animation 30s cubic-bezier(0.03, 0.5, 0, 1) forwards
 			}
-			.wp-interactivity-router_loading-bar.finish-animation {
-				animation: wp-interactivity-router_loading-bar-finish-animation 300ms ease-in
+			.wp-interactivity-router-loading-bar.finish-animation {
+				animation: wp-interactivity-router-loading-bar-finish-animation 300ms ease-in
 			}
-			@keyframes wp-interactivity-router_loading-bar-start-animation {
+			@keyframes wp-interactivity-router-loading-bar-start-animation {
 				0% { transform: scaleX(0); transform-origin: 0% 0%; opacity: 1 }
 				100% { transform: scaleX(1); transform-origin: 0% 0%; opacity: 1 }
 			}
-			@keyframes wp-interactivity-router_loading-bar-finish-animation {
+			@keyframes wp-interactivity-router-loading-bar-finish-animation {
 				0% { opacity: 1 }
 				50% { opacity: 1 }
 				100% { opacity: 0 }
@@ -807,7 +807,7 @@ private function router_animation_styles(): string {
 	public function router_loading_and_screen_reader_markup() {
 		echo <<<HTML
 			<div
-				class="wp-interactivity-router_loading-bar"
+				class="wp-interactivity-router-loading-bar"
 				data-wp-interactive='{"namespace":"core/router"}'
 				data-wp-class--start-animation="state.navigation.hasStarted"
 				data-wp-class--finish-animation="state.navigation.hasFinished"
@@ -851,9 +851,9 @@ private function data_wp_router_region_processor( WP_Interactivity_API_Directive
 			);
 
 			// Enqueues as an inline style.
-			wp_register_style( 'wp_interactivity_router_animations', false );
-			wp_add_inline_style( 'wp_interactivity_router_animations', $this->router_animation_styles() );
-			wp_enqueue_style( 'wp_interactivity_router_animations' );
+			wp_register_style( 'wp-interactivity-router-animations', false );
+			wp_add_inline_style( 'wp-interactivity-router-animations', $this->router_animation_styles() );
+			wp_enqueue_style( 'wp-interactivity-router-animations' );
 
 			// Adds the necessary markup to the footer.
 			add_action( 'wp_footer', array( $this, 'router_loading_and_screen_reader_markup' ) );
diff --git a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-router-region.php b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-router-region.php
index 2f855d71fc3b1..a02ad6920b5a4 100644
--- a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-router-region.php
+++ b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-router-region.php
@@ -113,13 +113,13 @@ public function test_wp_router_region_adds_loading_bar_aria_live_region_only_onc
 		$query  = array( 'tag_name' => 'style' );
 		$p      = new WP_HTML_Tag_Processor( $styles );
 		$this->assertTrue( $p->next_tag( $query ) );
-		$this->assertEquals( 'wp_interactivity_router_animations-inline-css', $p->get_attribute( 'id' ) );
-		$this->assertStringContainsString( '.wp-interactivity-router_loading-bar', $styles );
+		$this->assertEquals( 'wp-interactivity-router-animations-inline-css', $p->get_attribute( 'id' ) );
+		$this->assertStringContainsString( '.wp-interactivity-router-loading-bar', $styles );
 		$this->assertFalse( $p->next_tag( $query ) );
 
 		// Check that the markup is loaded, but only once.
 		$footer = $this->render_wp_footer();
-		$query  = array( 'class_name' => 'wp-interactivity-router_loading-bar' );
+		$query  = array( 'class_name' => 'wp-interactivity-router-loading-bar' );
 		$p      = new WP_HTML_Tag_Processor( $footer );
 		$this->assertTrue( $p->next_tag( $query ) );
 		$this->assertFalse( $p->next_tag( $query ) );

From a24af7dfecd96133ea04b40e6df7b1708945d6f9 Mon Sep 17 00:00:00 2001
From: Luis Herranz <luisherranz@gmail.com>
Date: Wed, 7 Feb 2024 10:08:18 +0100
Subject: [PATCH 53/56] Remove % in 0 values of CSS

Co-authored-by: Pascal Birchler <pascal.birchler@gmail.com>
---
 .../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 417427104100c..4bf11cfd458ee 100644
--- a/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
+++ b/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
@@ -783,8 +783,8 @@ private function router_animation_styles(): string {
 				animation: wp-interactivity-router-loading-bar-finish-animation 300ms ease-in
 			}
 			@keyframes wp-interactivity-router-loading-bar-start-animation {
-				0% { transform: scaleX(0); transform-origin: 0% 0%; opacity: 1 }
-				100% { transform: scaleX(1); transform-origin: 0% 0%; opacity: 1 }
+				0% { transform: scaleX(0); transform-origin: 0 0; opacity: 1 }
+				100% { transform: scaleX(1); transform-origin: 0 0; opacity: 1 }
 			}
 			@keyframes wp-interactivity-router-loading-bar-finish-animation {
 				0% { opacity: 1 }

From 3b189f78cc92e4c4a11c05964ddee22932230059 Mon Sep 17 00:00:00 2001
From: Luis Herranz <luisherranz@gmail.com>
Date: Wed, 7 Feb 2024 10:10:38 +0100
Subject: [PATCH 54/56] Rename functions to use `get` and `print`

Co-authored-by: Weston Ruter <westonruter@google.com>
---
 .../interactivity-api/class-wp-interactivity-api.php      | 8 ++++----
 1 file changed, 4 insertions(+), 4 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 4bf11cfd458ee..467a3eef2be6f 100644
--- a/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
+++ b/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
@@ -762,7 +762,7 @@ private function data_wp_text_processor( WP_Interactivity_API_Directives_Process
 	 *
 	 * @return string The CSS styles for the router's top loading bar animation.
 	 */
-	private function router_animation_styles(): string {
+	private function get_router_animation_styles(): string {
 		return <<<CSS
 			.wp-interactivity-router-loading-bar {
 				position: fixed;
@@ -804,7 +804,7 @@ private function router_animation_styles(): string {
 	 *
 	 * @since 6.5.0
 	 */
-	public function router_loading_and_screen_reader_markup() {
+	public function print_router_loading_and_screen_reader_markup() {
 		echo <<<HTML
 			<div
 				class="wp-interactivity-router-loading-bar"
@@ -852,11 +852,11 @@ private function data_wp_router_region_processor( WP_Interactivity_API_Directive
 
 			// Enqueues as an inline style.
 			wp_register_style( 'wp-interactivity-router-animations', false );
-			wp_add_inline_style( 'wp-interactivity-router-animations', $this->router_animation_styles() );
+			wp_add_inline_style( 'wp-interactivity-router-animations', $this->get_router_animation_styles() );
 			wp_enqueue_style( 'wp-interactivity-router-animations' );
 
 			// Adds the necessary markup to the footer.
-			add_action( 'wp_footer', array( $this, 'router_loading_and_screen_reader_markup' ) );
+			add_action( 'wp_footer', array( $this, 'print_router_loading_and_screen_reader_markup' ) );
 		}
 	}
 

From ef1c9ae6fe9f097a2d1fe3e74726ca398e739f3a Mon Sep 17 00:00:00 2001
From: Luis Herranz <luisherranz@gmail.com>
Date: Wed, 7 Feb 2024 10:14:50 +0100
Subject: [PATCH 55/56] Remove use of `@uses`

Co-authored-by: Pascal Birchler <pascal.birchler@gmail.com>
---
 .../interactivity-api/class-wp-interactivity-api.php     | 9 ---------
 1 file changed, 9 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 467a3eef2be6f..2e2657cb53342 100644
--- a/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
+++ b/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
@@ -200,15 +200,6 @@ public function add_hooks() {
 	 *
 	 * @since 6.5.0
 	 *
-	 * @uses WP_Interactivity_API::data_wp_interactive_processor()
-	 * @uses WP_Interactivity_API::data_wp_context_processor()
-	 * @uses WP_Interactivity_API::data_wp_bind_processor()
-	 * @uses WP_Interactivity_API::data_wp_class_processor()
-	 * @uses WP_Interactivity_API::data_wp_style_processor()
-	 * @uses WP_Interactivity_API::data_wp_text_processor()
-	 * @uses WP_Interactivity_API::data_wp_router_region_processor()
-	 * @uses WP_Interactivity_API::data_wp_each_processor()
-	 *
 	 * @param string $html The HTML content to process.
 	 * @return string The processed HTML content. It returns the original content when the HTML contains unbalanced tags.
 	 */

From 76dea4f71d9ede63f6b2a2a71f75958222fa4bbc Mon Sep 17 00:00:00 2001
From: Luis Herranz <luisherranz@gmail.com>
Date: Wed, 7 Feb 2024 21:01:53 +0100
Subject: [PATCH 56/56] Don't use the primary color for the top loading bar

---
 .../interactivity-api/class-wp-interactivity-api.php            | 2 +-
 1 file changed, 1 insertion(+), 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 2e2657cb53342..bb491a54f4ee2 100644
--- a/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
+++ b/src/wp-includes/interactivity-api/class-wp-interactivity-api.php
@@ -764,7 +764,7 @@ private function get_router_animation_styles(): string {
 				width: 100vw;
 				max-width: 100vw !important;
 				height: 4px;
-				background-color: var(--wp--preset--color--primary, #000);
+				background-color: #000;
 				opacity: 0
 			}
 			.wp-interactivity-router-loading-bar.start-animation {