Merge pull request #7 from sirreal/make-processor-class-internal

Make processor class internal

Props jonsurrell.

Author: ockham

src/wp-includes/class-wp-block-bindings-processor.php

@@ -294,9 +294,9 @@ public function __get( $name ) {
 	 * @return array The computed block attributes for the provided block bindings.
 	 */
 	private function process_block_bindings() {
-		$block_type                 = $this->name;
-		$parsed_block               = $this->parsed_block;
-		$computed_attributes        = array();
+		$block_type          = $this->name;
+		$parsed_block        = $this->parsed_block;
+		$computed_attributes = array();
 
 		$supported_block_attributes =
 			self::BLOCK_BINDINGS_SUPPORTED_ATTRIBUTES[ $block_type ] ??
@@ -417,7 +417,7 @@ private function replace_html( string $block_content, string $attribute_name, $s
 		switch ( $block_type->attributes[ $attribute_name ]['source'] ) {
 			case 'html':
 			case 'rich-text':
-				$block_reader = WP_Block_Bindings_Processor::create_fragment( $block_content );
+				$block_reader = self::get_block_bindings_processor( $block_content );
 
 				// TODO: Support for CSS selectors whenever they are ready in the HTML API.
 				// In the meantime, support comma-separated selectors by exploding them into an array.
@@ -462,6 +462,56 @@ private function replace_html( string $block_content, string $attribute_name, $s
 		}
 	}
 
+	private static function get_block_bindings_processor( string $block_content ) {
+		static $internal_processor_class = null;
+		if ( null === $internal_processor_class ) {
+			$internal_processor_class = new class('', WP_HTML_Processor::CONSTRUCTOR_UNLOCK_CODE) extends WP_HTML_Processor {
+				private $output         = '';
+				private $end_of_flushed = 0;
+
+				public function build() {
+					return $this->output . substr( $this->get_updated_html(), $this->end_of_flushed );
+				}
+
+				/**
+				 * Replace the rich text content between a tag opener and matching closer.
+				 *
+				 * When stopped on a tag opener, replace the content enclosed by it and its
+				 * matching closer with the provided rich text.
+				 *
+				 * @param string $rich_text The rich text to replace the original content with.
+				 * @return bool True on success.
+				 */
+				public function replace_rich_text( $rich_text ) {
+					if ( $this->is_tag_closer() ) {
+						return false;
+					}
+
+					$depth = $this->get_current_depth();
+
+					$this->set_bookmark( '_wp_block_bindings_tag_opener' );
+					// The bookmark names are prefixed with `_` so the key below has an extra `_`.
+					$bm            = $this->bookmarks['__wp_block_bindings_tag_opener'];
+					$this->output .= substr( $this->get_updated_html(), $this->end_of_flushed, $bm->start + $bm->length );
+					$this->output .= $rich_text;
+					$this->release_bookmark( '_wp_block_bindings_tag_opener' );
+
+					// Find matching tag closer.
+					while ( $this->next_token() && $this->get_current_depth() >= $depth ) {
+					}
+
+					$this->set_bookmark( '_wp_block_bindings_tag_closer' );
+					$bm                   = $this->bookmarks['__wp_block_bindings_tag_closer'];
+					$this->end_of_flushed = $bm->start;
+					$this->release_bookmark( '_wp_block_bindings_tag_closer' );
+
+					return true;
+				}
+			};
+		}
+
+		return $internal_processor_class::create_fragment( $block_content );
+	}
 
 	/**
 	 * Generates the render output for the block.

src/wp-includes/class-wp-block.php

@@ -346,7 +346,6 @@
 require ABSPATH . WPINC . '/sitemaps/providers/class-wp-sitemaps-posts.php';
 require ABSPATH . WPINC . '/sitemaps/providers/class-wp-sitemaps-taxonomies.php';
 require ABSPATH . WPINC . '/sitemaps/providers/class-wp-sitemaps-users.php';
-require ABSPATH . WPINC . '/class-wp-block-bindings-processor.php';
 require ABSPATH . WPINC . '/class-wp-block-bindings-source.php';
 require ABSPATH . WPINC . '/class-wp-block-bindings-registry.php';
 require ABSPATH . WPINC . '/class-wp-block-editor-context.php';