From 4ab4ff3bd20d59366d6d9cf7928514ef605c545b Mon Sep 17 00:00:00 2001
From: Paul Bearne <pbearne@git.wordpress.org>
Date: Thu, 7 May 2026 11:34:56 -0400
Subject: [PATCH 1/5] Add unit tests for wp_admin_canonical_url() in
 wp-admin/includes/misc.php

---
 .../includes/misc/wpAdminCanonicalUrl.php     | 126 ++++++++++++++++++
 1 file changed, 126 insertions(+)
 create mode 100644 tests/phpunit/tests/admin/includes/misc/wpAdminCanonicalUrl.php

diff --git a/tests/phpunit/tests/admin/includes/misc/wpAdminCanonicalUrl.php b/tests/phpunit/tests/admin/includes/misc/wpAdminCanonicalUrl.php
new file mode 100644
index 0000000000000..4e4daabaa4941
--- /dev/null
+++ b/tests/phpunit/tests/admin/includes/misc/wpAdminCanonicalUrl.php
@@ -0,0 +1,126 @@
+<?php
+/**
+ * Test wp_admin_canonical_url().
+ *
+ * @group admin
+ * @group misc
+ */
+class Tests_Admin_Includes_Misc_WpAdminCanonicalUrl extends WP_UnitTestCase {
+
+	/**
+	 * Original $_SERVER values.
+	 *
+	 * @var array
+	 */
+	private $server_orig;
+
+	public function set_up() {
+		parent::set_up();
+		$this->server_orig = $_SERVER;
+	}
+
+	public function tear_down() {
+		$_SERVER = $this->server_orig;
+		parent::tear_down();
+	}
+
+	/**
+	 * Tests wp_admin_canonical_url().
+	 *
+	 * @dataProvider data_wp_admin_canonical_url
+	 *
+	 * @param array  $server_vars $_SERVER variables to set.
+	 * @param string $expected    Expected output substring.
+	 */
+	public function test_wp_admin_canonical_url( array $server_vars, $expected ) {
+		foreach ( $server_vars as $key => $value ) {
+			$_SERVER[ $key ] = $value;
+		}
+
+		ob_start();
+		wp_admin_canonical_url();
+		$output = ob_get_clean();
+
+		$this->assertStringContainsString( $expected, $output );
+		$this->assertStringContainsString( '<script>', $output );
+	}
+
+	/**
+	 * Data provider for test_wp_admin_canonical_url.
+	 *
+	 * @return array<string, array{
+	 *     server_vars: array<string, string>,
+	 *     expected:    string
+	 * }>
+	 */
+	public function data_wp_admin_canonical_url(): array {
+		return array(
+			'no removable query args'            => array(
+				'server_vars' => array(
+					'HTTP_HOST'   => 'example.org',
+					'REQUEST_URI' => '/wp-admin/index.php',
+				),
+				'expected'    => 'href="http://example.org/wp-admin/index.php"',
+			),
+			'with removable query args'           => array(
+				'server_vars' => array(
+					'HTTP_HOST'   => 'example.org',
+					'REQUEST_URI' => '/wp-admin/index.php?settings-updated=true&other=arg',
+				),
+				'expected'    => 'href="http://example.org/wp-admin/index.php?other=arg"',
+			),
+			'with multiple removable query args'  => array(
+				'server_vars' => array(
+					'HTTP_HOST'   => 'example.org',
+					'REQUEST_URI' => '/wp-admin/edit.php?trashed=1&locked=1&paged=2',
+				),
+				'expected'    => 'href="http://example.org/wp-admin/edit.php?paged=2"',
+			),
+			'with https'                          => array(
+				'server_vars' => array(
+					'HTTP_HOST'   => 'example.org',
+					'REQUEST_URI' => '/wp-admin/index.php',
+					'HTTPS'       => 'on',
+				),
+				'expected'    => 'href="https://example.org/wp-admin/index.php"',
+			),
+		);
+	}
+
+	/**
+	 * Tests wp_admin_canonical_url() when removable query args are filtered to be empty.
+	 */
+	public function test_wp_admin_canonical_url_empty_removable_args() {
+		add_filter( 'removable_query_args', '__return_empty_array' );
+
+		ob_start();
+		wp_admin_canonical_url();
+		$output = ob_get_clean();
+
+		remove_filter( 'removable_query_args', '__return_empty_array' );
+
+		$this->assertEmpty( $output, 'Output should be empty when removable query args are filtered to be empty.' );
+	}
+
+	/**
+	 * Tests the wp_admin_canonical_url filter.
+	 */
+	public function test_wp_admin_canonical_url_filter() {
+		$_SERVER['HTTP_HOST']   = 'example.org';
+		$_SERVER['REQUEST_URI'] = '/wp-admin/index.php?settings-updated=true';
+
+		add_filter( 'wp_admin_canonical_url', array( $this, 'filter_canonical_url' ) );
+
+		ob_start();
+		wp_admin_canonical_url();
+		$output = ob_get_clean();
+
+		remove_filter( 'wp_admin_canonical_url', array( $this, 'filter_canonical_url' ) );
+
+		$this->assertStringContainsString( 'href="https://custom.example.org/canonical"', $output );
+	}
+
+	public function filter_canonical_url() {
+		return 'https://custom.example.org/canonical';
+	}
+}

From 12f5c159ba6d3c1076304fb777d8c480ca42a4db Mon Sep 17 00:00:00 2001
From: Paul Bearne <pbearne@gmail.com>
Date: Thu, 7 May 2026 11:42:08 -0400
Subject: [PATCH 2/5] Update wpAdminCanonicalUrl.php

---
 .../tests/admin/includes/misc/wpAdminCanonicalUrl.php     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/phpunit/tests/admin/includes/misc/wpAdminCanonicalUrl.php b/tests/phpunit/tests/admin/includes/misc/wpAdminCanonicalUrl.php
index 4e4daabaa4941..4489dd1b19ff5 100644
--- a/tests/phpunit/tests/admin/includes/misc/wpAdminCanonicalUrl.php
+++ b/tests/phpunit/tests/admin/includes/misc/wpAdminCanonicalUrl.php
@@ -55,28 +55,28 @@ public function test_wp_admin_canonical_url( array $server_vars, $expected ) {
 	 */
 	public function data_wp_admin_canonical_url(): array {
 		return array(
-			'no removable query args'            => array(
+			'no removable query args'           => array(
 				'server_vars' => array(
 					'HTTP_HOST'   => 'example.org',
 					'REQUEST_URI' => '/wp-admin/index.php',
 				),
 				'expected'    => 'href="http://example.org/wp-admin/index.php"',
 			),
-			'with removable query args'           => array(
+			'with removable query args'          => array(
 				'server_vars' => array(
 					'HTTP_HOST'   => 'example.org',
 					'REQUEST_URI' => '/wp-admin/index.php?settings-updated=true&other=arg',
 				),
 				'expected'    => 'href="http://example.org/wp-admin/index.php?other=arg"',
 			),
-			'with multiple removable query args'  => array(
+			'with multiple removable query args' => array(
 				'server_vars' => array(
 					'HTTP_HOST'   => 'example.org',
 					'REQUEST_URI' => '/wp-admin/edit.php?trashed=1&locked=1&paged=2',
 				),
 				'expected'    => 'href="http://example.org/wp-admin/edit.php?paged=2"',
 			),
-			'with https'                          => array(
+			'with https'                         => array(
 				'server_vars' => array(
 					'HTTP_HOST'   => 'example.org',
 					'REQUEST_URI' => '/wp-admin/index.php',

From e74b12453d647fd0506312ac4a21853da56583d5 Mon Sep 17 00:00:00 2001
From: Paul Bearne <pbearne@gmail.com>
Date: Thu, 7 May 2026 11:45:12 -0400
Subject: [PATCH 3/5] Update wpAdminCanonicalUrl.php

---
 tests/phpunit/tests/admin/includes/misc/wpAdminCanonicalUrl.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/phpunit/tests/admin/includes/misc/wpAdminCanonicalUrl.php b/tests/phpunit/tests/admin/includes/misc/wpAdminCanonicalUrl.php
index 4489dd1b19ff5..0ba71b4e7deda 100644
--- a/tests/phpunit/tests/admin/includes/misc/wpAdminCanonicalUrl.php
+++ b/tests/phpunit/tests/admin/includes/misc/wpAdminCanonicalUrl.php
@@ -55,7 +55,7 @@ public function test_wp_admin_canonical_url( array $server_vars, $expected ) {
 	 */
 	public function data_wp_admin_canonical_url(): array {
 		return array(
-			'no removable query args'           => array(
+			'no removable query args'          => array(
 				'server_vars' => array(
 					'HTTP_HOST'   => 'example.org',
 					'REQUEST_URI' => '/wp-admin/index.php',

From 57f90550b048541874274aa4ba43a7304c7f0dba Mon Sep 17 00:00:00 2001
From: Paul Bearne <pbearne@gmail.com>
Date: Thu, 7 May 2026 11:45:12 -0400
Subject: [PATCH 4/5] Update wpAdminCanonicalUrl.php

---
 .../tests/admin/includes/misc/wpAdminCanonicalUrl.php  | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/tests/phpunit/tests/admin/includes/misc/wpAdminCanonicalUrl.php b/tests/phpunit/tests/admin/includes/misc/wpAdminCanonicalUrl.php
index 4489dd1b19ff5..c1651e8c4bfc0 100644
--- a/tests/phpunit/tests/admin/includes/misc/wpAdminCanonicalUrl.php
+++ b/tests/phpunit/tests/admin/includes/misc/wpAdminCanonicalUrl.php
@@ -4,6 +4,8 @@
  *
  * @group admin
  * @group misc
+ *
+ * @covers ::wp_admin_canonical_url
  */
 class Tests_Admin_Includes_Misc_WpAdminCanonicalUrl extends WP_UnitTestCase {
 
@@ -27,6 +29,8 @@ public function tear_down() {
 	/**
 	 * Tests wp_admin_canonical_url().
 	 *
+	 * @ticket 65192
+	 *
 	 * @dataProvider data_wp_admin_canonical_url
 	 *
 	 * @param array  $server_vars $_SERVER variables to set.
@@ -55,7 +59,7 @@ public function test_wp_admin_canonical_url( array $server_vars, $expected ) {
 	 */
 	public function data_wp_admin_canonical_url(): array {
 		return array(
-			'no removable query args'           => array(
+			'no removable query args'          => array(
 				'server_vars' => array(
 					'HTTP_HOST'   => 'example.org',
 					'REQUEST_URI' => '/wp-admin/index.php',
@@ -89,6 +93,8 @@ public function data_wp_admin_canonical_url(): array {
 
 	/**
 	 * Tests wp_admin_canonical_url() when removable query args are filtered to be empty.
+	 *
+	 * @ticket 65192
 	 */
 	public function test_wp_admin_canonical_url_empty_removable_args() {
 		add_filter( 'removable_query_args', '__return_empty_array' );
@@ -104,6 +110,8 @@ public function test_wp_admin_canonical_url_empty_removable_args() {
 
 	/**
 	 * Tests the wp_admin_canonical_url filter.
+	 *
+	 * @ticket 65192
 	 */
 	public function test_wp_admin_canonical_url_filter() {
 		$_SERVER['HTTP_HOST']   = 'example.org';

From a6829df61b52545e006d8b6c90c9cb47654d301d Mon Sep 17 00:00:00 2001
From: Paul Bearne <pbearne@gmail.com>
Date: Thu, 7 May 2026 12:08:10 -0400
Subject: [PATCH 5/5] Update wpAdminCanonicalUrl.php

---
 tests/phpunit/tests/admin/includes/misc/wpAdminCanonicalUrl.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/phpunit/tests/admin/includes/misc/wpAdminCanonicalUrl.php b/tests/phpunit/tests/admin/includes/misc/wpAdminCanonicalUrl.php
index c1651e8c4bfc0..b5113bbd0b3e3 100644
--- a/tests/phpunit/tests/admin/includes/misc/wpAdminCanonicalUrl.php
+++ b/tests/phpunit/tests/admin/includes/misc/wpAdminCanonicalUrl.php
@@ -59,7 +59,7 @@ public function test_wp_admin_canonical_url( array $server_vars, $expected ) {
 	 */
 	public function data_wp_admin_canonical_url(): array {
 		return array(
-			'no removable query args'          => array(
+			'no removable query args'            => array(
 				'server_vars' => array(
 					'HTTP_HOST'   => 'example.org',
 					'REQUEST_URI' => '/wp-admin/index.php',