From 2330b2ea020e567c891178bf92ac4e3dc154c8b6 Mon Sep 17 00:00:00 2001
From: Aki Hamano <tetsuaki.hamano@gmail.com>
Date: Tue, 30 Dec 2025 15:27:16 +0900
Subject: [PATCH 01/13] Dynamically add CSS classe to Paragraph block

---
 .../block-library/src/paragraph/block.json    |  1 -
 .../block-library/src/paragraph/index.php     | 55 ++++++++++++
 phpunit/block-bindings-test.php               | 10 +--
 .../blocks/render-block-paragraph-test.php    | 86 +++++++++++++++++++
 phpunit/blocks/renderReusable.php             |  2 +-
 phpunit/class-wp-theme-json-test.php          |  4 +-
 6 files changed, 149 insertions(+), 9 deletions(-)
 create mode 100644 packages/block-library/src/paragraph/index.php
 create mode 100644 phpunit/blocks/render-block-paragraph-test.php

diff --git a/packages/block-library/src/paragraph/block.json b/packages/block-library/src/paragraph/block.json
index 64b65eefc7e4a0..1d207102f55cad 100644
--- a/packages/block-library/src/paragraph/block.json
+++ b/packages/block-library/src/paragraph/block.json
@@ -69,7 +69,6 @@
 				"fontSize": true
 			}
 		},
-		"__experimentalSelector": "p",
 		"__unstablePasteTextInline": true,
 		"interactivity": {
 			"clientNavigation": true
diff --git a/packages/block-library/src/paragraph/index.php b/packages/block-library/src/paragraph/index.php
new file mode 100644
index 00000000000000..c0bffebabd0aa6
--- /dev/null
+++ b/packages/block-library/src/paragraph/index.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Appending the wp-block-paragraph to before rendering the stored `core/paragraph` block contents.
+ *
+ * @package WordPress
+ */
+
+/**
+ * Adds a wp-block-paragraph class to the paragraph block content.
+ *
+ * For example, the following block content:
+ *  <p class="align-left">Hello World</p>
+ *
+ * Would be transformed to:
+ *  <p class="align-left wp-block-paragraph">Hello World</p>
+ *
+ * @since 7.0.0
+ *
+ * @param array  $attributes Attributes of the block being rendered.
+ * @param string $content Content of the block being rendered.
+ *
+ * @return string The content of the block being rendered.
+ */
+function block_core_paragraph_render( $attributes, $content ) {
+	if ( ! $content ) {
+		return $content;
+	}
+
+	$p = new WP_HTML_Tag_Processor( $content );
+
+	while ( $p->next_tag() ) {
+		if ( 'P' === $p->get_tag() ) {
+			$p->add_class( 'wp-block-paragraph' );
+			break;
+		}
+	}
+
+	return $p->get_updated_html();
+}
+
+/**
+ * Registers the `core/paragraph` block on server.
+ *
+ * @since 7.0.0
+ */
+function register_block_core_paragraph() {
+	register_block_type_from_metadata(
+		__DIR__ . '/paragraph',
+		array(
+			'render_callback' => 'block_core_paragraph_render',
+		)
+	);
+}
+
+add_action( 'init', 'register_block_core_paragraph' );
diff --git a/phpunit/block-bindings-test.php b/phpunit/block-bindings-test.php
index c122861158258b..9517c425bcd191 100644
--- a/phpunit/block-bindings-test.php
+++ b/phpunit/block-bindings-test.php
@@ -85,7 +85,7 @@ public function data_update_block_with_value_from_source() {
 <!-- /wp:paragraph -->
 HTML
 				,
-				'<p>test source value</p>',
+				'<p class="wp-block-paragraph">test source value</p>',
 			),
 			'button block'    => array(
 				'text',
@@ -162,19 +162,19 @@ function ( $source_args, $block_instance, $attribute_name ) {
 					$value = $source_args['key'];
 					return "The attribute name is '$attribute_name' and its binding has argument 'key' with value '$value'.";
 				},
-				"<p>The attribute name is 'content' and its binding has argument 'key' with value 'test'.</p>",
+				"<p class=\"wp-block-paragraph\">The attribute name is 'content' and its binding has argument 'key' with value 'test'.</p>",
 			),
 			'unsafe HTML should be sanitized' => array(
 				function () {
 					return '<script>alert("Unsafe HTML")</script>';
 				},
-				'<p>alert("Unsafe HTML")</p>',
+				'<p class="wp-block-paragraph">alert("Unsafe HTML")</p>',
 			),
 			'symbols and numbers should be rendered correctly' => array(
 				function () {
 					return '$12.50';
 				},
-				'<p>$12.50</p>',
+				'<p class="wp-block-paragraph">$12.50</p>',
 			),
 		);
 	}
@@ -386,7 +386,7 @@ public function test_filter_block_bindings_source_value() {
 		remove_filter( 'block_bindings_source_value', $filter_value );
 
 		$this->assertSame(
-			'<p>Filtered value: test_arg. Block instance: core/paragraph. Attribute name: content.</p>',
+			'<p class="wp-block-paragraph">Filtered value: test_arg. Block instance: core/paragraph. Attribute name: content.</p>',
 			trim( $result ),
 			'The block content should show the filtered value.'
 		);
diff --git a/phpunit/blocks/render-block-paragraph-test.php b/phpunit/blocks/render-block-paragraph-test.php
new file mode 100644
index 00000000000000..41f9ced4568586
--- /dev/null
+++ b/phpunit/blocks/render-block-paragraph-test.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ * Paragraph block rendering tests.
+ *
+ * @package WordPress
+ * @subpackage Blocks
+ */
+
+/**
+ * Tests for the Paragraph block.
+ *
+ * @group blocks
+ */
+class Render_Block_Paragraph_Test extends WP_UnitTestCase {
+
+
+	/**
+	 * @covers ::gutenberg_block_core_paragraph_render
+	 * @dataProvider add_css_class_test_examples
+	 */
+	public function test_block_core_paragraph_render_appends_css_class_to_a_vanilla_element( $input, $expected_result ) {
+		$actual = gutenberg_block_core_paragraph_render( array(), $input );
+		$this->assertEquals( $expected_result, $actual );
+	}
+
+	public function add_css_class_test_examples() {
+		return array(
+			'should add a class name to a vanilla p element' => array(
+				'<p>Hello World</p>',
+				'<p class="wp-block-paragraph">Hello World</p>',
+			),
+			'should not add a class name to a div element' => array(
+				'<div>Hello World</div>',
+				'<div>Hello World</div>',
+			),
+			'should not add a class name to a span element' => array(
+				'<span>Hello World</span>',
+				'<span>Hello World</span>',
+			),
+			'should not add a class name to a heading element' => array(
+				'<h2>Hello World</h2>',
+				'<h2>Hello World</h2>',
+			),
+			'should add a class name even when the class attribute is already defined' => array(
+				'<p class="is-align-right">Hello World</p>',
+				'<p class="is-align-right wp-block-paragraph">Hello World</p>',
+			),
+			'should handle single quotes'                  => array(
+				"<p class='is-align-right'>Hello World</p>",
+				'<p class="is-align-right wp-block-paragraph">Hello World</p>',
+			),
+			'should handle single quotes with double quotes inside' => array(
+				"<p class='\" is-align-right'>Hello World</p>",
+				'<p class="&quot; is-align-right wp-block-paragraph">Hello World</p>',
+			),
+			'should not add a class name even when it is already defined' => array(
+				'<p class="is-align-right wp-block-paragraph">Hello World</p>',
+				'<p class="is-align-right wp-block-paragraph">Hello World</p>',
+			),
+			'should add a class name even when there are other HTML attributes present' => array(
+				'<p style="display: block">Hello World</p>',
+				'<p class="wp-block-paragraph" style="display: block">Hello World</p>',
+			),
+			'should add a class name even when the class attribute is already defined and has many entries' => array(
+				'<p class="is-align-right custom   classes">Hello World</p>',
+				'<p class="is-align-right custom   classes wp-block-paragraph">Hello World</p>',
+			),
+			'should not add a class name to a nested p'    => array(
+				'<p class="is-align-right custom classes"><p>Hello World</p></p>',
+				'<p class="is-align-right custom classes wp-block-paragraph"><p>Hello World</p></p>',
+			),
+			'should not add a class name to a nested p when the parent has another attribute' => array(
+				'<p style="display: block" class="is-align-right"><p>Hello World</p></p>',
+				'<p style="display: block" class="is-align-right wp-block-paragraph"><p>Hello World</p></p>',
+			),
+			'should add a class name even when the class attribute is surrounded by other attributes' => array(
+				'<p style="display: block" class="is-align-right" data-class="corner case!"><p>Hello World</p></p>',
+				'<p style="display: block" class="is-align-right wp-block-paragraph" data-class="corner case!"><p>Hello World</p></p>',
+			),
+			'should add a class name without getting confused when there is a tricky data-class attribute present' => array(
+				'<p data-class="corner case!" style="display: block" class="is-align-right"><p>Hello World</p></p>',
+				'<p data-class="corner case!" style="display: block" class="is-align-right wp-block-paragraph"><p>Hello World</p></p>',
+			),
+		);
+	}
+}
diff --git a/phpunit/blocks/renderReusable.php b/phpunit/blocks/renderReusable.php
index 74c2bea127e363..91dbe37f774bc6 100644
--- a/phpunit/blocks/renderReusable.php
+++ b/phpunit/blocks/renderReusable.php
@@ -63,6 +63,6 @@ public function test_render_respects_custom_context() {
 		);
 
 		$output = $synced_pattern_block_instance->render();
-		$this->assertSame( '<p>Custom content set from block context</p>', $output );
+		$this->assertSame( '<p class="wp-block-paragraph">Custom content set from block context</p>', $output );
 	}
 }
diff --git a/phpunit/class-wp-theme-json-test.php b/phpunit/class-wp-theme-json-test.php
index 7001c0c63687da..de9837b7d5eb48 100644
--- a/phpunit/class-wp-theme-json-test.php
+++ b/phpunit/class-wp-theme-json-test.php
@@ -5153,7 +5153,7 @@ public function test_get_shadow_styles_for_blocks() {
 		);
 
 		$variable_styles = ':root{--wp--preset--shadow--natural: 5px 5px 0 0 black;}';
-		$element_styles  = 'a:where(:not(.wp-element-button)){box-shadow: var(--wp--preset--shadow--natural);}:root :where(.wp-element-button, .wp-block-button__link){box-shadow: var(--wp--preset--shadow--natural);}:root :where(p){box-shadow: var(--wp--preset--shadow--natural);}';
+		$element_styles  = 'a:where(:not(.wp-element-button)){box-shadow: var(--wp--preset--shadow--natural);}:root :where(.wp-element-button, .wp-block-button__link){box-shadow: var(--wp--preset--shadow--natural);}:root :where(.wp-block-paragraph){box-shadow: var(--wp--preset--shadow--natural);}';
 		$expected_styles = $variable_styles . $element_styles;
 		$this->assertSameCSS( $expected_styles, $theme_json->get_stylesheet( array( 'styles', 'presets', 'variables' ), null, array( 'skip_root_layout_styles' => true ) ) );
 	}
@@ -6347,7 +6347,7 @@ public function test_blocks_without_pseudo_support_ignore_pseudo_selectors() {
 			)
 		);
 
-		$expected = ':root :where(p){color: black;}';
+		$expected = ':root :where(.wp-block-paragraph){color: black;}';
 		$this->assertSameCSS( $expected, $theme_json->get_stylesheet( array( 'styles' ), null, array( 'skip_root_layout_styles' => true ) ) );
 		$this->assertStringNotContainsString( 'p:hover{', $theme_json->get_stylesheet( array( 'styles' ) ) );
 	}

From b086591a986495758e30c90201af0277ba042180 Mon Sep 17 00:00:00 2001
From: Aki Hamano <tetsuaki.hamano@gmail.com>
Date: Tue, 30 Dec 2025 15:51:36 +0900
Subject: [PATCH 02/13] Fix unit test

---
 packages/block-library/src/paragraph/block.json | 1 +
 phpunit/class-wp-theme-json-test.php            | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/block-library/src/paragraph/block.json b/packages/block-library/src/paragraph/block.json
index 1d207102f55cad..64b65eefc7e4a0 100644
--- a/packages/block-library/src/paragraph/block.json
+++ b/packages/block-library/src/paragraph/block.json
@@ -69,6 +69,7 @@
 				"fontSize": true
 			}
 		},
+		"__experimentalSelector": "p",
 		"__unstablePasteTextInline": true,
 		"interactivity": {
 			"clientNavigation": true
diff --git a/phpunit/class-wp-theme-json-test.php b/phpunit/class-wp-theme-json-test.php
index de9837b7d5eb48..7001c0c63687da 100644
--- a/phpunit/class-wp-theme-json-test.php
+++ b/phpunit/class-wp-theme-json-test.php
@@ -5153,7 +5153,7 @@ public function test_get_shadow_styles_for_blocks() {
 		);
 
 		$variable_styles = ':root{--wp--preset--shadow--natural: 5px 5px 0 0 black;}';
-		$element_styles  = 'a:where(:not(.wp-element-button)){box-shadow: var(--wp--preset--shadow--natural);}:root :where(.wp-element-button, .wp-block-button__link){box-shadow: var(--wp--preset--shadow--natural);}:root :where(.wp-block-paragraph){box-shadow: var(--wp--preset--shadow--natural);}';
+		$element_styles  = 'a:where(:not(.wp-element-button)){box-shadow: var(--wp--preset--shadow--natural);}:root :where(.wp-element-button, .wp-block-button__link){box-shadow: var(--wp--preset--shadow--natural);}:root :where(p){box-shadow: var(--wp--preset--shadow--natural);}';
 		$expected_styles = $variable_styles . $element_styles;
 		$this->assertSameCSS( $expected_styles, $theme_json->get_stylesheet( array( 'styles', 'presets', 'variables' ), null, array( 'skip_root_layout_styles' => true ) ) );
 	}
@@ -6347,7 +6347,7 @@ public function test_blocks_without_pseudo_support_ignore_pseudo_selectors() {
 			)
 		);
 
-		$expected = ':root :where(.wp-block-paragraph){color: black;}';
+		$expected = ':root :where(p){color: black;}';
 		$this->assertSameCSS( $expected, $theme_json->get_stylesheet( array( 'styles' ), null, array( 'skip_root_layout_styles' => true ) ) );
 		$this->assertStringNotContainsString( 'p:hover{', $theme_json->get_stylesheet( array( 'styles' ) ) );
 	}

From 804703b5b2763314bdb0a5383bf09f318150087b Mon Sep 17 00:00:00 2001
From: Aki Hamano <tetsuaki.hamano@gmail.com>
Date: Tue, 30 Dec 2025 16:36:35 +0900
Subject: [PATCH 03/13] Fix e2e tests

---
 .../specs/editor/plugins/block-hooks.spec.js  | 32 +++++++++++--------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/test/e2e/specs/editor/plugins/block-hooks.spec.js b/test/e2e/specs/editor/plugins/block-hooks.spec.js
index b0dba8287cafad..971dc5d764fd70 100644
--- a/test/e2e/specs/editor/plugins/block-hooks.spec.js
+++ b/test/e2e/specs/editor/plugins/block-hooks.spec.js
@@ -10,7 +10,7 @@ const dummyBlocksContent = `<!-- wp:heading -->
 <p class="dummy-paragraph">This is a dummy paragraph.</p>
 <!-- /wp:paragraph -->`;
 const dummyClassicContent =
-	'<h2 class="dummy-heading">This is a dummy heading</h2><p class="dummy-paragraph">This is a dummy paragraph.</p>';
+	'<h2 class="dummy-classic-heading">This is a dummy heading</h2><p class="dummy-classic-paragraph">This is a dummy paragraph.</p>';
 
 const getHookedBlockClassName = ( relativePosition, anchorBlock ) =>
 	`hooked-block-${ relativePosition }-${ anchorBlock.replace(
@@ -84,9 +84,11 @@ test.describe( 'Block Hooks API', () => {
 					page.locator( '.entry-content > *' )
 				).toHaveClass( [
 					'wp-block-heading',
-					getHookedBlockClassName( 'after', 'core/heading' ),
-					'dummy-paragraph',
-					getHookedBlockClassName( 'last_child', blockType ),
+					getHookedBlockClassName( 'after', 'core/heading' ) +
+						' wp-block-paragraph',
+					'dummy-paragraph wp-block-paragraph',
+					getHookedBlockClassName( 'last_child', blockType ) +
+						' wp-block-paragraph',
 				] );
 			} );
 
@@ -158,9 +160,11 @@ test.describe( 'Block Hooks API', () => {
 					page.locator( '.entry-content > *' )
 				).toHaveClass( [
 					'wp-block-heading',
-					getHookedBlockClassName( 'after', 'core/heading' ),
-					getHookedBlockClassName( 'last_child', blockType ),
-					'dummy-paragraph',
+					getHookedBlockClassName( 'after', 'core/heading' ) +
+						' wp-block-paragraph',
+					getHookedBlockClassName( 'last_child', blockType ) +
+						' wp-block-paragraph',
+					'dummy-paragraph wp-block-paragraph',
 				] );
 			} );
 		} );
@@ -212,9 +216,10 @@ test.describe( 'Block Hooks API', () => {
 				await expect(
 					page.locator( '.entry-content > *' )
 				).toHaveClass( [
-					'dummy-heading',
-					'dummy-paragraph',
-					getHookedBlockClassName( 'last_child', blockType ),
+					'dummy-classic-heading',
+					'dummy-classic-paragraph',
+					getHookedBlockClassName( 'last_child', blockType ) +
+						' wp-block-paragraph',
 				] );
 			} );
 
@@ -271,9 +276,10 @@ test.describe( 'Block Hooks API', () => {
 				await expect(
 					page.locator( '.entry-content > *' )
 				).toHaveClass( [
-					getHookedBlockClassName( 'last_child', blockType ),
-					'dummy-heading',
-					'dummy-paragraph',
+					getHookedBlockClassName( 'last_child', blockType ) +
+						' wp-block-paragraph',
+					'dummy-classic-heading',
+					'dummy-classic-paragraph',
 				] );
 			} );
 		} );

From d1a577fdb049301223c1cf49eb3073e7d785d52b Mon Sep 17 00:00:00 2001
From: Aki Hamano <54422211+t-hamano@users.noreply.github.com>
Date: Wed, 31 Dec 2025 21:32:42 +0900
Subject: [PATCH 04/13] Update PHPDoc

Co-authored-by: Aaron Robertshaw <60436221+aaronrobertshaw@users.noreply.github.com>
---
 packages/block-library/src/paragraph/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/block-library/src/paragraph/index.php b/packages/block-library/src/paragraph/index.php
index c0bffebabd0aa6..0ffc1e697d9550 100644
--- a/packages/block-library/src/paragraph/index.php
+++ b/packages/block-library/src/paragraph/index.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Appending the wp-block-paragraph to before rendering the stored `core/paragraph` block contents.
+ * Append the `wp-block-paragraph` class before rendering the stored `core/paragraph` block contents.
  *
  * @package WordPress
  */

From 77aa2a1779903873d693c6b79d76efe220bb5aeb Mon Sep 17 00:00:00 2001
From: Aki Hamano <tetsuaki.hamano@gmail.com>
Date: Wed, 31 Dec 2025 21:36:49 +0900
Subject: [PATCH 05/13] Simplify HTML Tag Processor logic

---
 packages/block-library/src/paragraph/index.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/packages/block-library/src/paragraph/index.php b/packages/block-library/src/paragraph/index.php
index 0ffc1e697d9550..3564090fac9cfc 100644
--- a/packages/block-library/src/paragraph/index.php
+++ b/packages/block-library/src/paragraph/index.php
@@ -28,11 +28,8 @@ function block_core_paragraph_render( $attributes, $content ) {
 
 	$p = new WP_HTML_Tag_Processor( $content );
 
-	while ( $p->next_tag() ) {
-		if ( 'P' === $p->get_tag() ) {
+	if ( $p->next_tag( 'p' ) ) {
 			$p->add_class( 'wp-block-paragraph' );
-			break;
-		}
 	}
 
 	return $p->get_updated_html();

From d8ae68240450faee2a8cab1a3df97fd837f58c80 Mon Sep 17 00:00:00 2001
From: Aki Hamano <tetsuaki.hamano@gmail.com>
Date: Fri, 2 Jan 2026 20:14:07 +0900
Subject: [PATCH 06/13] Use render_block hook

---
 .../block-library/src/paragraph/index.php     | 40 ++++++-------------
 1 file changed, 13 insertions(+), 27 deletions(-)

diff --git a/packages/block-library/src/paragraph/index.php b/packages/block-library/src/paragraph/index.php
index 3564090fac9cfc..bfdc7aa7c3f674 100644
--- a/packages/block-library/src/paragraph/index.php
+++ b/packages/block-library/src/paragraph/index.php
@@ -1,12 +1,13 @@
 <?php
 /**
- * Append the `wp-block-paragraph` class before rendering the stored `core/paragraph` block contents.
+ * Server-side rendering of the `core/paragraph` block.
  *
  * @package WordPress
  */
 
 /**
- * Adds a wp-block-paragraph class to the paragraph block content.
+ * Append the `wp-block-paragraph` class before rendering the stored
+ * `core/paragraph` block contents.
  *
  * For example, the following block content:
  *  <p class="align-left">Hello World</p>
@@ -16,37 +17,22 @@
  *
  * @since 7.0.0
  *
- * @param array  $attributes Attributes of the block being rendered.
- * @param string $content Content of the block being rendered.
+ * @param string $block_content The block content.
  *
- * @return string The content of the block being rendered.
+ * @return string Filtered block content.
  */
-function block_core_paragraph_render( $attributes, $content ) {
-	if ( ! $content ) {
-		return $content;
+function block_core_paragraph_add_class( $block_content ) {
+	if ( ! $block_content ) {
+		return $block_content;
 	}
 
-	$p = new WP_HTML_Tag_Processor( $content );
+	$processor = new WP_HTML_Tag_Processor( $block_content );
 
-	if ( $p->next_tag( 'p' ) ) {
-			$p->add_class( 'wp-block-paragraph' );
+	if ( $processor->next_tag( 'p' ) ) {
+		$processor->add_class( 'wp-block-paragraph' );
 	}
 
-	return $p->get_updated_html();
+	return $processor->get_updated_html();
 }
 
-/**
- * Registers the `core/paragraph` block on server.
- *
- * @since 7.0.0
- */
-function register_block_core_paragraph() {
-	register_block_type_from_metadata(
-		__DIR__ . '/paragraph',
-		array(
-			'render_callback' => 'block_core_paragraph_render',
-		)
-	);
-}
-
-add_action( 'init', 'register_block_core_paragraph' );
+add_filter( 'render_block_core/paragraph', 'block_core_paragraph_add_class' );

From bfba47fa8b00175a30085db93ab32d5981ea2652 Mon Sep 17 00:00:00 2001
From: Aki Hamano <tetsuaki.hamano@gmail.com>
Date: Fri, 2 Jan 2026 21:12:42 +0900
Subject: [PATCH 07/13] Register block on server side

---
 packages/block-library/src/paragraph/index.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/packages/block-library/src/paragraph/index.php b/packages/block-library/src/paragraph/index.php
index bfdc7aa7c3f674..f72ca085a2048f 100644
--- a/packages/block-library/src/paragraph/index.php
+++ b/packages/block-library/src/paragraph/index.php
@@ -36,3 +36,13 @@ function block_core_paragraph_add_class( $block_content ) {
 }
 
 add_filter( 'render_block_core/paragraph', 'block_core_paragraph_add_class' );
+
+/**
+ * Registers the `core/paragraph` block on server.
+ *
+ * @since 7.0.0
+ */
+function register_block_core_paragraph() {
+	register_block_type_from_metadata( __DIR__ . '/paragraph' );
+}
+add_action( 'init', 'register_block_core_paragraph' );

From 9b8d796246def877a5ca370fe6fbfac3c39c0eba Mon Sep 17 00:00:00 2001
From: Aki Hamano <tetsuaki.hamano@gmail.com>
Date: Fri, 2 Jan 2026 22:00:49 +0900
Subject: [PATCH 08/13] Fix unit test

---
 phpunit/blocks/render-block-paragraph-test.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/phpunit/blocks/render-block-paragraph-test.php b/phpunit/blocks/render-block-paragraph-test.php
index 41f9ced4568586..45195c0ba3f98c 100644
--- a/phpunit/blocks/render-block-paragraph-test.php
+++ b/phpunit/blocks/render-block-paragraph-test.php
@@ -19,7 +19,9 @@ class Render_Block_Paragraph_Test extends WP_UnitTestCase {
 	 * @dataProvider add_css_class_test_examples
 	 */
 	public function test_block_core_paragraph_render_appends_css_class_to_a_vanilla_element( $input, $expected_result ) {
-		$actual = gutenberg_block_core_paragraph_render( array(), $input );
+		$parsed_blocks = parse_blocks( '<!-- wp:paragraph -->' . $input . '<!-- /wp:paragraph -->' );
+		$block         = new WP_Block( $parsed_blocks[0] );
+		$actual        = $block->render();
 		$this->assertEquals( $expected_result, $actual );
 	}
 

From 5091d56cef5c2ff2aae7b66be3137784cc41f8fe Mon Sep 17 00:00:00 2001
From: Aki Hamano <tetsuaki.hamano@gmail.com>
Date: Sat, 3 Jan 2026 18:13:56 +0900
Subject: [PATCH 09/13] Add data_prefix to dataprovider function name

---
 phpunit/blocks/render-block-paragraph-test.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpunit/blocks/render-block-paragraph-test.php b/phpunit/blocks/render-block-paragraph-test.php
index 45195c0ba3f98c..7940cc4ad35ed0 100644
--- a/phpunit/blocks/render-block-paragraph-test.php
+++ b/phpunit/blocks/render-block-paragraph-test.php
@@ -16,7 +16,7 @@ class Render_Block_Paragraph_Test extends WP_UnitTestCase {
 
 	/**
 	 * @covers ::gutenberg_block_core_paragraph_render
-	 * @dataProvider add_css_class_test_examples
+	 * @dataProvider data_css_class_examples
 	 */
 	public function test_block_core_paragraph_render_appends_css_class_to_a_vanilla_element( $input, $expected_result ) {
 		$parsed_blocks = parse_blocks( '<!-- wp:paragraph -->' . $input . '<!-- /wp:paragraph -->' );
@@ -25,7 +25,7 @@ public function test_block_core_paragraph_render_appends_css_class_to_a_vanilla_
 		$this->assertEquals( $expected_result, $actual );
 	}
 
-	public function add_css_class_test_examples() {
+	public function data_css_class_examples() {
 		return array(
 			'should add a class name to a vanilla p element' => array(
 				'<p>Hello World</p>',

From e3ca87f03d0c40d1a32f996c79eed36e3bee1616 Mon Sep 17 00:00:00 2001
From: Aki Hamano <tetsuaki.hamano@gmail.com>
Date: Sat, 3 Jan 2026 18:15:05 +0900
Subject: [PATCH 10/13] Add param PHPDoc

---
 phpunit/blocks/render-block-paragraph-test.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/phpunit/blocks/render-block-paragraph-test.php b/phpunit/blocks/render-block-paragraph-test.php
index 7940cc4ad35ed0..53c14c4630ad3c 100644
--- a/phpunit/blocks/render-block-paragraph-test.php
+++ b/phpunit/blocks/render-block-paragraph-test.php
@@ -17,6 +17,9 @@ class Render_Block_Paragraph_Test extends WP_UnitTestCase {
 	/**
 	 * @covers ::gutenberg_block_core_paragraph_render
 	 * @dataProvider data_css_class_examples
+	 *
+	 * @param string $input           The input HTML.
+	 * @param string $expected_result The expected result HTML.
 	 */
 	public function test_block_core_paragraph_render_appends_css_class_to_a_vanilla_element( $input, $expected_result ) {
 		$parsed_blocks = parse_blocks( '<!-- wp:paragraph -->' . $input . '<!-- /wp:paragraph -->' );

From 990a58f8d60d29f2c6cf47de6ee907cb3fd46309 Mon Sep 17 00:00:00 2001
From: Aki Hamano <tetsuaki.hamano@gmail.com>
Date: Mon, 5 Jan 2026 15:02:24 +0900
Subject: [PATCH 11/13] Removed unnecessary @cover PHPDoc

---
 packages/block-library/src/form/icon.js        | 10 ++++++++++
 phpunit/blocks/render-block-paragraph-test.php |  1 -
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 packages/block-library/src/form/icon.js

diff --git a/packages/block-library/src/form/icon.js b/packages/block-library/src/form/icon.js
new file mode 100644
index 00000000000000..28e92088ac1423
--- /dev/null
+++ b/packages/block-library/src/form/icon.js
@@ -0,0 +1,10 @@
+/**
+ * WordPress dependencies
+ */
+import { SVG, Path } from '@wordpress/primitives';
+
+export default (
+	<SVG xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+		<Path d="M18 16H6c-1.1 0-2 .9-2 2s.9 2 2 2h12c1.1 0 2-.9 2-2s-.9-2-2-2Zm0 2.5H6c-.3 0-.5-.2-.5-.5s.2-.5.5-.5h12c.3 0 .5.2.5.5s-.2.5-.5.5ZM13 13H4v1.5h9V13Zm-7-2h12c1.1 0 2-.9 2-2s-.9-2-2-2H6c-1.1 0-2 .9-2 2s.9 2 2 2Zm0-2.5h12c.3 0 .5.2.5.5s-.2.5-.5.5H6c-.3 0-.5-.2-.5-.5s.2-.5.5-.5ZM13 4H4v1.5h9V4Z" />
+	</SVG>
+);
diff --git a/phpunit/blocks/render-block-paragraph-test.php b/phpunit/blocks/render-block-paragraph-test.php
index 53c14c4630ad3c..1f91d86ee066dd 100644
--- a/phpunit/blocks/render-block-paragraph-test.php
+++ b/phpunit/blocks/render-block-paragraph-test.php
@@ -15,7 +15,6 @@ class Render_Block_Paragraph_Test extends WP_UnitTestCase {
 
 
 	/**
-	 * @covers ::gutenberg_block_core_paragraph_render
 	 * @dataProvider data_css_class_examples
 	 *
 	 * @param string $input           The input HTML.

From 68dde11464589a65f747de2d83b82db72f0866ae Mon Sep 17 00:00:00 2001
From: Aki Hamano <tetsuaki.hamano@gmail.com>
Date: Mon, 5 Jan 2026 15:03:58 +0900
Subject: [PATCH 12/13] Remove unnecessary file

---
 packages/block-library/src/form/icon.js | 10 ----------
 1 file changed, 10 deletions(-)
 delete mode 100644 packages/block-library/src/form/icon.js

diff --git a/packages/block-library/src/form/icon.js b/packages/block-library/src/form/icon.js
deleted file mode 100644
index 28e92088ac1423..00000000000000
--- a/packages/block-library/src/form/icon.js
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { SVG, Path } from '@wordpress/primitives';
-
-export default (
-	<SVG xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
-		<Path d="M18 16H6c-1.1 0-2 .9-2 2s.9 2 2 2h12c1.1 0 2-.9 2-2s-.9-2-2-2Zm0 2.5H6c-.3 0-.5-.2-.5-.5s.2-.5.5-.5h12c.3 0 .5.2.5.5s-.2.5-.5.5ZM13 13H4v1.5h9V13Zm-7-2h12c1.1 0 2-.9 2-2s-.9-2-2-2H6c-1.1 0-2 .9-2 2s.9 2 2 2Zm0-2.5h12c.3 0 .5.2.5.5s-.2.5-.5.5H6c-.3 0-.5-.2-.5-.5s.2-.5.5-.5ZM13 4H4v1.5h9V4Z" />
-	</SVG>
-);

From 72aa10b758965bd3df74a4f1341b024ef986028c Mon Sep 17 00:00:00 2001
From: Aki Hamano <54422211+t-hamano@users.noreply.github.com>
Date: Mon, 5 Jan 2026 16:14:05 +0900
Subject: [PATCH 13/13] Remove redundant blank lines

---
 phpunit/blocks/render-block-paragraph-test.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/phpunit/blocks/render-block-paragraph-test.php b/phpunit/blocks/render-block-paragraph-test.php
index 1f91d86ee066dd..c65b12901b71ab 100644
--- a/phpunit/blocks/render-block-paragraph-test.php
+++ b/phpunit/blocks/render-block-paragraph-test.php
@@ -13,7 +13,6 @@
  */
 class Render_Block_Paragraph_Test extends WP_UnitTestCase {
 
-
 	/**
 	 * @dataProvider data_css_class_examples
 	 *