From 4b7fcef485334a1a874bcb78182cfebe410130db Mon Sep 17 00:00:00 2001
From: Jon Surrell <sirreal@users.noreply.github.com>
Date: Wed, 17 Dec 2025 13:47:42 +0100
Subject: [PATCH 1/2] Update styles tests to use assertEqualHTML

`assertEqualHTML` makes the tests more resilient to semantically
irrelevant changes.
---
 tests/phpunit/tests/dependencies/styles.php | 24 ++++++++++-----------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/tests/phpunit/tests/dependencies/styles.php b/tests/phpunit/tests/dependencies/styles.php
index 74e4db47330b4..27e37391e2f7b 100644
--- a/tests/phpunit/tests/dependencies/styles.php
+++ b/tests/phpunit/tests/dependencies/styles.php
@@ -68,7 +68,7 @@ public function test_wp_enqueue_style() {
 		$expected .= "<link rel='stylesheet' id='no-deps-null-version-css' href='http://example.com' type='text/css' media='all' />\n";
 		$expected .= "<link rel='stylesheet' id='no-deps-null-version-print-media-css' href='http://example.com' type='text/css' media='print' />\n";
 
-		$this->assertSame( $expected, get_echo( 'wp_print_styles' ) );
+		$this->assertEqualHTML( $expected, get_echo( 'wp_print_styles' ) );
 
 		// No styles left to print.
 		$this->assertSame( '', get_echo( 'wp_print_styles' ) );
@@ -88,7 +88,7 @@ public function test_wp_enqueue_style_with_html5_support_does_not_contain_type_a
 		$ver      = get_bloginfo( 'version' );
 		$expected = "<link rel='stylesheet' id='no-deps-no-version-css' href='http://example.com?ver=$ver' media='all' />\n";
 
-		$this->assertSame( $expected, get_echo( 'wp_print_styles' ) );
+		$this->assertEqualHTML( $expected, get_echo( 'wp_print_styles' ) );
 	}
 
 	/**
@@ -103,7 +103,7 @@ public function test_awkward_handles_are_supported_consistently( $handle ) {
 
 		$expected = "<link rel='stylesheet' id='$handle-css' href='http://example.com' type='text/css' media='all' />\n";
 
-		$this->assertSame( $expected, get_echo( 'wp_print_styles' ) );
+		$this->assertEqualHTML( $expected, get_echo( 'wp_print_styles' ) );
 	}
 
 	/**
@@ -157,7 +157,7 @@ public function test_protocols() {
 		$expected .= "<link rel='stylesheet' id='reset-css-ftp-css' href='{$wp_styles->base_url}ftp://yui.yahooapis.com/2.8.1/build/reset/reset-min.css?ver=$ver' type='text/css' media='all' />\n";
 
 		// Go!
-		$this->assertSame( $expected, get_echo( 'wp_print_styles' ) );
+		$this->assertEqualHTML( $expected, get_echo( 'wp_print_styles' ) );
 
 		// No styles left to print.
 		$this->assertSame( '', get_echo( 'wp_print_styles' ) );
@@ -186,8 +186,7 @@ public function test_inline_styles() {
 		wp_enqueue_style( 'handle', 'http://example.com', array(), 1 );
 		wp_add_inline_style( 'handle', $style );
 
-		// No styles left to print.
-		$this->assertSame( $expected, get_echo( 'wp_print_styles' ) );
+		$this->assertEqualHTML( $expected, get_echo( 'wp_print_styles' ) );
 	}
 
 	/**
@@ -215,7 +214,7 @@ public function test_inline_styles_concat() {
 		wp_add_inline_style( 'handle', $style );
 
 		wp_print_styles();
-		$this->assertSame( $expected, $wp_styles->print_html );
+		$this->assertEqualHTML( $expected, $wp_styles->print_html );
 	}
 
 	/**
@@ -233,7 +232,7 @@ public function test_inline_styles_concat() {
 	 * @param string $expected Expected result.
 	 */
 	public function test_normalize_relative_css_links( $css, $expected ) {
-		$this->assertSame(
+		$this->assertEqualHTML(
 			$expected,
 			_wp_normalize_relative_css_links( $css, site_url( 'wp-content/themes/test/style.css' ) )
 		);
@@ -311,8 +310,7 @@ public function test_multiple_inline_styles() {
 		wp_add_inline_style( 'handle', $style1 );
 		wp_add_inline_style( 'handle', $style2 );
 
-		// No styles left to print.
-		$this->assertSame( $expected, get_echo( 'wp_print_styles' ) );
+		$this->assertEqualHTML( $expected, get_echo( 'wp_print_styles' ) );
 	}
 
 	/**
@@ -337,7 +335,7 @@ public function test_plugin_doing_inline_styles_wrong() {
 
 		wp_add_inline_style( 'handle', "<style>{$style}</style>" );
 
-		$this->assertSame( $expected, get_echo( 'wp_print_styles' ) );
+		$this->assertEqualHTML( $expected, get_echo( 'wp_print_styles' ) );
 	}
 
 	/**
@@ -351,7 +349,7 @@ public function test_unnecessary_style_tags() {
 
 		wp_enqueue_style( 'handle', 'http://example.com', array(), 1 );
 
-		$this->assertSame( $expected, get_echo( 'wp_print_styles' ) );
+		$this->assertEqualHTML( $expected, get_echo( 'wp_print_styles' ) );
 	}
 
 	/**
@@ -399,7 +397,7 @@ public function test_wp_add_inline_style_for_handle_without_source() {
 		wp_enqueue_style( 'handle-three' );
 		wp_add_inline_style( 'handle-three', $style );
 
-		$this->assertSame( $expected, get_echo( 'wp_print_styles' ) );
+		$this->assertEqualHTML( $expected, get_echo( 'wp_print_styles' ) );
 	}
 
 	/**

From 4bb884d4f253c67027a6efa6d94c4e4a6b5a00c8 Mon Sep 17 00:00:00 2001
From: Jon Surrell <sirreal@users.noreply.github.com>
Date: Wed, 17 Dec 2025 13:49:28 +0100
Subject: [PATCH 2/2] Simplify conditional style no-print test

---
 tests/phpunit/tests/dependencies/styles.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/phpunit/tests/dependencies/styles.php b/tests/phpunit/tests/dependencies/styles.php
index 27e37391e2f7b..ee33f4d4bf1b3 100644
--- a/tests/phpunit/tests/dependencies/styles.php
+++ b/tests/phpunit/tests/dependencies/styles.php
@@ -359,12 +359,12 @@ public function test_unnecessary_style_tags() {
 	 * @expectedDeprecated WP_Dependencies->add_data()
 	 */
 	public function test_conditional_inline_styles_are_also_conditional() {
-		$expected = '';
 		wp_enqueue_style( 'handle', 'http://example.com', array(), 1 );
 		wp_style_add_data( 'handle', 'conditional', 'IE' );
 		wp_add_inline_style( 'handle', 'a { color: blue; }' );
 
-		$this->assertSameIgnoreEOL( $expected, get_echo( 'wp_print_styles' ) );
+		// Conditional styles are disabled.
+		$this->assertSame( '', get_echo( 'wp_print_styles' ) );
 	}
 
 	/**