WordPress<\/a>!<\/p>$/',
+ 'expected_markup' => '/^Hello WordPress<\/a>!<\/p>$/',
),
);
}
diff --git a/tests/phpunit/tests/block-supports/wpRenderElementsSupportStyles.php b/tests/phpunit/tests/block-supports/wpRenderElementsSupportStyles.php
index 16ed26fc9c7bc..5c9fc8af5819d 100644
--- a/tests/phpunit/tests/block-supports/wpRenderElementsSupportStyles.php
+++ b/tests/phpunit/tests/block-supports/wpRenderElementsSupportStyles.php
@@ -68,6 +68,62 @@ public function test_elements_block_support_styles( $color_settings, $elements_s
);
}
+ /**
+ * Tests that identical blocks with different elements styles
+ * generate distinct class names to avoid CSS cascade conflicts.
+ *
+ * @ticket 65435
+ *
+ * @covers ::wp_get_elements_class_name
+ */
+ public function test_elements_block_support_styles_with_duplicate_blocks(): void {
+ $this->test_block_name = 'test/element-block-supports';
+
+ register_block_type(
+ $this->test_block_name,
+ array(
+ 'api_version' => 3,
+ 'attributes' => array(
+ 'style' => array(
+ 'type' => 'object',
+ ),
+ ),
+ 'supports' => array(
+ 'color' => array(
+ 'link' => true,
+ ),
+ ),
+ )
+ );
+
+ $block = array(
+ 'blockName' => $this->test_block_name,
+ 'attrs' => array(
+ 'style' => array(
+ 'elements' => array(
+ 'link' => array(
+ 'color' => array(
+ 'text' => 'blue',
+ ),
+ ),
+ ),
+ ),
+ ),
+ );
+
+ // Process two identical blocks with the same elements styles.
+ $count = 2;
+ for ( $i = 0; $i < $count; $i++ ) {
+ wp_render_elements_support_styles( $block );
+ }
+ $actual_stylesheet = wp_style_engine_get_stylesheet_from_context( 'block-supports', array( 'prettify' => false ) );
+
+ // Count the number of distinct class names to confirm uniqueness.
+ $this->assertSame( $count, preg_match_all( '/\.wp-elements-(\d+)/', $actual_stylesheet, $matches ) );
+ $unique_classes = array_unique( $matches[1] );
+ $this->assertCount( $count, $unique_classes, 'Both blocks should produce distinct class names' );
+ }
+
/**
* Data provider.
*
@@ -127,7 +183,7 @@ public function data_elements_block_support_styles() {
'elements_styles' => array(
'button' => array( 'color' => $color_styles ),
),
- 'expected_styles' => '/^.wp-elements-[a-f0-9]{32} .wp-element-button, .wp-elements-[a-f0-9]{32} .wp-block-button__link' . $color_css_rules . '$/',
+ 'expected_styles' => '/^.wp-elements-\d+ .wp-element-button, .wp-elements-\d+ .wp-block-button__link' . $color_css_rules . '$/',
),
'link element styles are applied' => array(
'color_settings' => array( 'link' => true ),
@@ -139,15 +195,15 @@ public function data_elements_block_support_styles() {
),
),
),
- 'expected_styles' => '/^.wp-elements-[a-f0-9]{32} a:where\(:not\(.wp-element-button\)\)' . $color_css_rules .
- '.wp-elements-[a-f0-9]{32} a:where\(:not\(.wp-element-button\)\):hover' . $color_css_rules . '$/',
+ 'expected_styles' => '/^.wp-elements-\d+ a:where\(:not\(.wp-element-button\)\)' . $color_css_rules .
+ '.wp-elements-\d+ a:where\(:not\(.wp-element-button\)\):hover' . $color_css_rules . '$/',
),
'generic heading element styles are applied' => array(
'color_settings' => array( 'heading' => true ),
'elements_styles' => array(
'heading' => array( 'color' => $color_styles ),
),
- 'expected_styles' => '/^.wp-elements-[a-f0-9]{32} h1, .wp-elements-[a-f0-9]{32} h2, .wp-elements-[a-f0-9]{32} h3, .wp-elements-[a-f0-9]{32} h4, .wp-elements-[a-f0-9]{32} h5, .wp-elements-[a-f0-9]{32} h6' . $color_css_rules . '$/',
+ 'expected_styles' => '/^.wp-elements-\d+ h1, .wp-elements-\d+ h2, .wp-elements-\d+ h3, .wp-elements-\d+ h4, .wp-elements-\d+ h5, .wp-elements-\d+ h6' . $color_css_rules . '$/',
),
'individual heading element styles are applied' => array(
'color_settings' => array( 'heading' => true ),
@@ -159,12 +215,12 @@ public function data_elements_block_support_styles() {
'h5' => array( 'color' => $color_styles ),
'h6' => array( 'color' => $color_styles ),
),
- 'expected_styles' => '/^.wp-elements-[a-f0-9]{32} h1' . $color_css_rules .
- '.wp-elements-[a-f0-9]{32} h2' . $color_css_rules .
- '.wp-elements-[a-f0-9]{32} h3' . $color_css_rules .
- '.wp-elements-[a-f0-9]{32} h4' . $color_css_rules .
- '.wp-elements-[a-f0-9]{32} h5' . $color_css_rules .
- '.wp-elements-[a-f0-9]{32} h6' . $color_css_rules . '$/',
+ 'expected_styles' => '/^.wp-elements-\d+ h1' . $color_css_rules .
+ '.wp-elements-\d+ h2' . $color_css_rules .
+ '.wp-elements-\d+ h3' . $color_css_rules .
+ '.wp-elements-\d+ h4' . $color_css_rules .
+ '.wp-elements-\d+ h5' . $color_css_rules .
+ '.wp-elements-\d+ h6' . $color_css_rules . '$/',
),
);
}
diff --git a/tests/phpunit/tests/compat/wpUtf8CodePointSpan.php b/tests/phpunit/tests/compat/wpUtf8CodePointSpan.php
new file mode 100644
index 0000000000000..da66095ce79af
--- /dev/null
+++ b/tests/phpunit/tests/compat/wpUtf8CodePointSpan.php
@@ -0,0 +1,100 @@
+assertSame(
+ $expected_span,
+ _wp_utf8_codepoint_span( $text, $byte_offset, $max_code_points, $found_code_points ),
+ 'Should have found the expected byte span.'
+ );
+
+ $this->assertSame(
+ $expected_found,
+ $found_code_points,
+ 'Should have reported the expected number of code points.'
+ );
+ }
+
+ /**
+ * Data provider.
+ *
+ * @return array
+ */
+ public static function data_codepoint_spans() {
+ $long_ascii_run = str_repeat( 'a', 1024 );
+
+ return array(
+ 'zero code point budget' => array(
+ 'abcdef',
+ 0,
+ 0,
+ 0,
+ 0,
+ ),
+ 'long ASCII run at start' => array(
+ $long_ascii_run,
+ 0,
+ 5,
+ 5,
+ 5,
+ ),
+ 'long ASCII run from non-zero offset' => array(
+ "zz{$long_ascii_run}",
+ 2,
+ 5,
+ 5,
+ 5,
+ ),
+ 'multibyte character before the boundary' => array(
+ "ab\u{1F170}cd",
+ 0,
+ 2,
+ 2,
+ 2,
+ ),
+ 'multibyte character at the boundary' => array(
+ "ab\u{1F170}cd",
+ 0,
+ 3,
+ strlen( "ab\u{1F170}" ),
+ 3,
+ ),
+ 'invalid span after the boundary' => array(
+ "ab\xF0\x9Fzz",
+ 0,
+ 2,
+ 2,
+ 2,
+ ),
+ 'invalid span at the boundary' => array(
+ "ab\xF0\x9Fzz",
+ 0,
+ 3,
+ 4,
+ 3,
+ ),
+ );
+ }
+}
diff --git a/tests/phpunit/tests/general/template.php b/tests/phpunit/tests/general/template.php
index 20f6d0012b3a7..00b683971a6a0 100644
--- a/tests/phpunit/tests/general/template.php
+++ b/tests/phpunit/tests/general/template.php
@@ -860,7 +860,7 @@ public function test_the_embed_site_title_uses_fallback_when_attachment_url_fail
add_filter( 'wp_get_attachment_image_src', '__return_false' );
$output = get_echo( 'the_embed_site_title' );
- $fallback = includes_url( 'images/w-logo-blue.png' );
+ $fallback = includes_url( 'images/w-logo-gray-white-bg.svg' );
$processor = new WP_HTML_Tag_Processor( $output );
$this->assertTrue( $processor->next_tag( 'IMG' ), 'Expected IMG tag with fallback.' );
@@ -914,7 +914,7 @@ public function test_the_embed_site_title_omits_srcset_when_1x_and_2x_urls_are_i
*/
public function test_the_embed_site_title_uses_fallback_without_srcset_when_no_site_icon_set(): void {
$output = get_echo( 'the_embed_site_title' );
- $fallback = includes_url( 'images/w-logo-blue.png' );
+ $fallback = includes_url( 'images/w-logo-gray-white-bg.svg' );
$processor = new WP_HTML_Tag_Processor( $output );
diff --git a/tests/phpunit/tests/html-api/wpHtmlTagProcessor.php b/tests/phpunit/tests/html-api/wpHtmlTagProcessor.php
index fd73ddc43a4ba..185d93b7a652c 100644
--- a/tests/phpunit/tests/html-api/wpHtmlTagProcessor.php
+++ b/tests/phpunit/tests/html-api/wpHtmlTagProcessor.php
@@ -890,7 +890,8 @@ public function test_attribute_ops_on_tag_closer_do_not_change_the_markup() {
* //
* ```
*
- * To prevent it, `set_attribute` escapes dangerous characters (`"`, `'`, `<`, `>`, `&`) using HTML character references.
+ * To prevent it, `set_attribute` escapes HTML syntax characters like `"` using
+ * HTML character references.
*
* ```php
*
diff --git a/tests/phpunit/tests/icons/wpIconsRegistry.php b/tests/phpunit/tests/icons/wpIconsRegistry.php
new file mode 100644
index 0000000000000..fba2eacde43f5
--- /dev/null
+++ b/tests/phpunit/tests/icons/wpIconsRegistry.php
@@ -0,0 +1,110 @@
+registry = WP_Icons_Registry::get_instance();
+ }
+
+ public function tear_down() {
+ $instance_property = new ReflectionProperty( WP_Icons_Registry::class, 'instance' );
+
+ if ( PHP_VERSION_ID < 80100 ) {
+ $instance_property->setAccessible( true );
+ }
+
+ $instance_property->setValue( null, null );
+
+ $this->registry = null;
+ parent::tear_down();
+ }
+
+ /**
+ * Invokes WP_Icons_Registry::register despite it being private
+ *
+ * @param string $icon_name Icon name including namespace.
+ * @param array $icon_properties Icon properties (label, content, filePath).
+ * @return bool True if the icon was registered successfully.
+ */
+ private function register( $icon_name, $icon_properties ) {
+ $method = new ReflectionMethod( $this->registry, 'register' );
+
+ if ( PHP_VERSION_ID < 80100 ) {
+ $method->setAccessible( true );
+ }
+
+ return $method->invoke( $this->registry, $icon_name, $icon_properties );
+ }
+
+ /**
+ * Provides invalid icon names.
+ *
+ * @return array[]
+ */
+ public function data_invalid_icon_names() {
+ return array(
+ 'non-string name' => array( 1 ),
+ 'no namespace' => array( 'plus' ),
+ 'uppercase characters' => array( 'Test/Plus' ),
+ 'invalid characters' => array( 'test/_doing_it_wrong' ),
+ );
+ }
+
+ /**
+ * Should fail to re-register the same icon.
+ *
+ * @ticket 64847
+ *
+ * @expectedIncorrectUsage WP_Icons_Registry::register
+ */
+ public function test_register_icon_twice() {
+ $name = 'test-plugin/duplicate';
+ $settings = array(
+ 'label' => 'Icon',
+ 'content' => '',
+ );
+
+ $result = $this->register( $name, $settings );
+ $this->assertTrue( $result );
+ $result2 = $this->register( $name, $settings );
+ $this->assertFalse( $result2 );
+ }
+
+
+ /**
+ * Should fail to register icon with invalid names.
+ *
+ * @ticket 64847
+ *
+ * @dataProvider data_invalid_icon_names
+ * @expectedIncorrectUsage WP_Icons_Registry::register
+ *
+ * @param mixed $icon_name Icon name to register.
+ */
+ public function test_register_invalid_name( $icon_name ) {
+ $settings = array(
+ 'label' => 'Icon',
+ 'content' => '',
+ );
+
+ $result = $this->register( $icon_name, $settings );
+ $this->assertFalse( $result );
+ }
+}