Merge remote-tracking branch 'upstream/trunk' into refactor-wp-debug-…

…data/wp-media
WordPress · Sep 18, 2024 · 1e58731 · 1e58731
2 parents 2346e7d + 1324176
commit 1e58731
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/src/wp-includes/html-api/class-wp-html-processor.php b/src/wp-includes/html-api/class-wp-html-processor.php
@@ -782,7 +782,7 @@ public function matches_breadcrumbs( $breadcrumbs ): bool {
 	 * @return bool|null Whether to expect a closer for the currently-matched node,
 	 *                   or `null` if not matched on any token.
 	 */
-	public function expects_closer( WP_HTML_Token $node = null ): ?bool {
+	public function expects_closer( ?WP_HTML_Token $node = null ): ?bool {
 		$token_name = $node->node_name ?? $this->get_token_name();
 
 		if ( ! isset( $token_name ) ) {

diff --git a/src/wp-includes/script-loader.php b/src/wp-includes/script-loader.php
@@ -1213,7 +1213,7 @@ function wp_default_scripts( $scripts ) {
 	$scripts->add( 'auth-app', "/wp-admin/js/auth-app$suffix.js", array( 'jquery', 'wp-api-request', 'wp-i18n', 'wp-hooks' ), false, 1 );
 	$scripts->set_translations( 'auth-app' );
 
-	$scripts->add( 'user-profile', "/wp-admin/js/user-profile$suffix.js", array( 'jquery', 'password-strength-meter', 'wp-util' ), false, 1 );
+	$scripts->add( 'user-profile', "/wp-admin/js/user-profile$suffix.js", array( 'clipboard', 'jquery', 'password-strength-meter', 'wp-util', 'wp-a11y' ), false, 1 );
 	$scripts->set_translations( 'user-profile' );
 	$user_id = isset( $_GET['user_id'] ) ? (int) $_GET['user_id'] : 0;
 	did_action( 'init' ) && $scripts->localize(

diff --git a/tests/phpunit/tests/html-api/wpHtmlProcessorComments.php b/tests/phpunit/tests/html-api/wpHtmlProcessorComments.php
@@ -19,7 +19,7 @@ class Tests_HtmlApi_WpHtmlProcessorComments extends WP_UnitTestCase {
 	 *
 	 * @dataProvider data_comments
 	 */
-	public function test_comment_processing( string $html, string $expected_comment_type, string $expected_modifiable_text, string $expected_tag = null ) {
+	public function test_comment_processing( $html, $expected_comment_type, $expected_modifiable_text, $expected_tag = null ) {
 		$processor = WP_HTML_Processor::create_fragment( $html );
 		$processor->next_token();
 
@@ -53,7 +53,7 @@ public static function data_comments() {
 	 *
 	 * @dataProvider data_funky_comments
 	 */
-	public function test_funky_comment( string $html, string $expected_modifiable_text ) {
+	public function test_funky_comment( $html, $expected_modifiable_text ) {
 		$processor = WP_HTML_Processor::create_fragment( $html );
 		$processor->next_token();
 

diff --git a/tests/phpunit/tests/theme.php b/tests/phpunit/tests/theme.php
@@ -976,7 +976,7 @@ public function data_get_stylesheet_directory_with_filter() {
 				'block-theme',
 				'stylesheet_directory',
 				static function ( $dir ) {
-					return str_replace( realpath( DIR_TESTDATA ) . '/themedir1', '/fantasy-dir', $dir );
+					return str_replace( realpath( DIR_TESTDATA ) . DIRECTORY_SEPARATOR . 'themedir1', '/fantasy-dir', $dir );
 				},
 				'/fantasy-dir/block-theme',
 			),
@@ -1036,7 +1036,7 @@ public function data_get_template_directory_with_filter() {
 				'block-theme',
 				'template_directory',
 				static function ( $dir ) {
-					return str_replace( realpath( DIR_TESTDATA ) . '/themedir1', '/fantasy-dir', $dir );
+					return str_replace( realpath( DIR_TESTDATA ) . DIRECTORY_SEPARATOR . 'themedir1', '/fantasy-dir', $dir );
 				},
 				'/fantasy-dir/block-theme',
 			),