Rename get_html_content_and_advance since HTML spans are not void/atomic.

Author: dmsnell

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

@@ -103,7 +103,7 @@
  *    associative array. {@see static::get_last_json_error()} for when this fails.
  *  - {@see self::is_html()} indicates if the token is a span of HTML which might
  *    be top-level freeform content or a block’s inner HTML.
- *  - {@see self::get_html_content_and_advance()} returns the span of HTML.
+ *  - {@see self::get_html_content()} returns the span of HTML.
  *  - {@see self::get_span()} for the byte offset and length into the input document
  *    representing the token.
  *
@@ -1256,7 +1256,7 @@ public function get_depth(): int {
 	 */
 	public function extract_block(): ?array {
 		if ( $this->is_html() ) {
-			$chunk = $this->get_html_content_and_advance();
+			$chunk = $this->get_html_content();
 
 			return array(
 				'blockName'    => null,
@@ -1278,7 +1278,7 @@ public function extract_block(): ?array {
 		$depth = $this->get_depth();
 		while ( $this->next_token() && $this->get_depth() > $depth ) {
 			if ( $this->is_html() ) {
-				$chunk                   = $this->get_html_content_and_advance();
+				$chunk                   = $this->get_html_content();
 				$block['innerHTML']     .= $chunk;
 				$block['innerContent'][] = $chunk;
 				continue;
@@ -1639,14 +1639,13 @@ public function is_non_whitespace_html(): bool {
 	}
 
 	/**
-	 * Returns the string content of an HTML span and advances the parser so that
-	 * the next delimiter will be after the HTML span.
+	 * Returns the string content of a matched HTML span, or `null` otherwise.
 	 *
 	 * @since 6.9.0
 	 *
-	 * @return string|null HTML content, or `null` if not currently matched on HTML.
+	 * @return string|null Raw HTML content, or `null` if not currently matched on HTML.
 	 */
-	public function get_html_content_and_advance(): ?string {
+	public function get_html_content(): ?string {
 		if ( ! $this->is_html() ) {
 			return null;
 		}

tests/phpunit/tests/block-processor/wpBlockProcessor.php

@@ -136,7 +136,7 @@ public function test_finds_open_and_inner_html_and_close_of_post_with_basic_bloc
 
 		$this->assertSame(
 			'<p>Content</p>',
-			$processor->get_html_content_and_advance(),
+			$processor->get_html_content(),
 			'Failed to extract the block’s inner HTML.'
 		);
 
@@ -264,7 +264,7 @@ public function test_rejects_invalid_block_comment_delimiters_as_html_comments(
 
 		$this->assertSame(
 			$html,
-			$processor->get_html_content_and_advance(),
+			$processor->get_html_content(),
 			'Failed to extract the proper HTML span.'
 		);