Merge branch 'trunk' into dependabot/composer/composer-packages-853032ace6

peterwilsoncc · web-flow · commit 4fef0f56f5e3 · 2026-04-27T12:26:38.000+10:00
diff --git a/src/js/_enqueues/admin/post.js b/src/js/_enqueues/admin/post.js
@@ -1028,7 +1028,7 @@ jQuery( function($) {
 		revert_e = $el.html();
 
 		buttons.html(
-			'<button type="button" class="save button button-small">' + __( 'OK' ) + '</button> ' +
+			'<button type="button" class="save button button-compact">' + __( 'OK' ) + '</button> ' +
 			'<button type="button" class="cancel button-link">' + __( 'Cancel' ) + '</button>'
 		);
 
diff --git a/src/wp-admin/css/edit.css b/src/wp-admin/css/edit.css
@@ -121,7 +121,6 @@ input#link_url {
 #edit-slug-box .cancel {
 	margin-right: 10px;
 	padding: 0;
-	font-size: 11px;
 }
 
 #comment-link-box {
@@ -140,7 +139,7 @@ input#link_url {
 #editable-post-name input {
 	font-size: 13px;
 	font-weight: 400;
-	height: 24px;
+	min-height: 32px;
 	margin: 0;
 	width: 16em;
 }
@@ -1068,6 +1067,10 @@ form#tags-filter {
 	#edit-slug-box {
 		padding: 0;
 	}
+
+	#editable-post-name input {
+		min-height: 40px;
+	}
 }
 
 @media only screen and (max-width: 1004px) {
diff --git a/src/wp-admin/css/forms.css b/src/wp-admin/css/forms.css
@@ -583,6 +583,11 @@ input[type="number"].tiny-text {
 	vertical-align: middle;
 }
 
+.button.wp-hide-pw.user-new-password-toggle > .dashicons {
+	line-height: 1.85;
+	vertical-align: top;
+}
+
 .wp-cancel-pw .dashicons-no {
 	display: none;
 }
diff --git a/src/wp-admin/includes/class-wp-screen.php b/src/wp-admin/includes/class-wp-screen.php
@@ -1280,7 +1280,7 @@ public function render_per_page_options() {
 		<legend><?php _e( 'Pagination' ); ?></legend>
 			<?php if ( $per_page_label ) : ?>
 				<label for="<?php echo esc_attr( $option ); ?>"><?php echo $per_page_label; ?></label>
-				<input type="number" step="1" min="1" max="999" class="screen-per-page" name="wp_screen_options[value]"
+				<input type="number" step="1" min="1" max="999" class="screen-per-page small-text" name="wp_screen_options[value]"
 					id="<?php echo esc_attr( $option ); ?>"
 					value="<?php echo esc_attr( $per_page ); ?>" />
 			<?php endif; ?>
diff --git a/src/wp-admin/user-edit.php b/src/wp-admin/user-edit.php
@@ -695,7 +695,7 @@
 											<input type="password" name="pass1" id="pass1" class="regular-text ltr" value="" autocomplete="new-password" spellcheck="false" data-pw="<?php echo esc_attr( wp_generate_password( 24 ) ); ?>" aria-describedby="pass-strength-result" />
 											<div style="display:none" id="pass-strength-result" aria-live="polite"></div>
 										</div>
-										<button type="button" class="button wp-hide-pw hide-if-no-js" data-toggle="0" aria-label="<?php esc_attr_e( 'Hide password' ); ?>">
+										<button type="button" class="button wp-hide-pw user-new-password-toggle hide-if-no-js" data-toggle="0" aria-label="<?php esc_attr_e( 'Hide password' ); ?>">
 											<span class="dashicons dashicons-hidden" aria-hidden="true"></span>
 											<span class="text"><?php _e( 'Hide' ); ?></span>
 										</button>
diff --git a/src/wp-includes/css/buttons.css b/src/wp-includes/css/buttons.css
@@ -380,6 +380,7 @@ TABLE OF CONTENTS:
 
 	.wp-core-ui .button,
 	.wp-core-ui .button.button-large,
+	.wp-core-ui .button.button-compact,
 	.wp-core-ui .button.button-small,
 	input#publish,
 	input#save-post,
diff --git a/tests/phpunit/tests/blocks/getHookedBlocks.php b/tests/phpunit/tests/blocks/getHookedBlocks.php
@@ -9,6 +9,8 @@
  *
  * @group blocks
  * @group block-hooks
+ *
+ * @covers ::get_hooked_blocks
  */
 class Tests_Blocks_GetHookedBlocks extends WP_UnitTestCase {
 
@@ -58,8 +60,6 @@ private function switch_to_block_theme_hooked_blocks() {
 
 	/**
 	 * @ticket 59383
-	 *
-	 * @covers ::get_hooked_blocks
 	 */
 	public function test_get_hooked_blocks_no_match_found() {
 		$result = get_hooked_blocks();
@@ -69,8 +69,6 @@ public function test_get_hooked_blocks_no_match_found() {
 
 	/**
 	 * @ticket 59383
-	 *
-	 * @covers ::get_hooked_blocks
 	 */
 	public function test_get_hooked_blocks_matches_found() {
 		register_block_type(
@@ -138,7 +136,6 @@ public function test_get_hooked_blocks_matches_found() {
 	 * @ticket 60008
 	 * @ticket 60506
 	 *
-	 * @covers ::get_hooked_blocks
 	 * @covers ::get_block_file_template
 	 */
 	public function test_loading_template_with_hooked_blocks() {
@@ -170,7 +167,6 @@ public function test_loading_template_with_hooked_blocks() {
 	 * @ticket 60008
 	 * @ticket 60506
 	 *
-	 * @covers ::get_hooked_blocks
 	 * @covers ::get_block_file_template
 	 */
 	public function test_loading_template_part_with_hooked_blocks() {
@@ -202,7 +198,6 @@ public function test_loading_template_part_with_hooked_blocks() {
 	 * @ticket 60008
 	 * @ticket 60506
 	 *
-	 * @covers ::get_hooked_blocks
 	 * @covers WP_Block_Patterns_Registry::get_registered
 	 */
 	public function test_loading_pattern_with_hooked_blocks() {
diff --git a/tests/phpunit/tests/blocks/insertHookedBlocks.php b/tests/phpunit/tests/blocks/insertHookedBlocks.php
@@ -9,6 +9,8 @@
  *
  * @group blocks
  * @group block-hooks
+ *
+ * @covers ::insert_hooked_blocks
  */
 class Tests_Blocks_InsertHookedBlocks extends WP_UnitTestCase {
 	const ANCHOR_BLOCK_TYPE       = 'tests/anchor-block';
@@ -26,8 +28,6 @@ class Tests_Blocks_InsertHookedBlocks extends WP_UnitTestCase {
 	 * @ticket 59572
 	 * @ticket 60126
 	 * @ticket 60506
-	 *
-	 * @covers ::insert_hooked_blocks
 	 */
 	public function test_insert_hooked_blocks_returns_correct_markup() {
 		$anchor_block = array(
@@ -46,8 +46,6 @@ public function test_insert_hooked_blocks_returns_correct_markup() {
 	 * @ticket 59572
 	 * @ticket 60126
 	 * @ticket 60506
-	 *
-	 * @covers ::insert_hooked_blocks
 	 */
 	public function test_insert_hooked_blocks_if_block_is_ignored() {
 		$anchor_block = array(
@@ -71,8 +69,6 @@ public function test_insert_hooked_blocks_if_block_is_ignored() {
 	 * @ticket 59572
 	 * @ticket 60126
 	 * @ticket 60506
-	 *
-	 * @covers ::insert_hooked_blocks
 	 */
 	public function test_insert_hooked_blocks_if_other_block_is_ignored() {
 		$anchor_block = array(
@@ -96,8 +92,6 @@ public function test_insert_hooked_blocks_if_other_block_is_ignored() {
 	 * @ticket 59572
 	 * @ticket 60126
 	 * @ticket 60506
-	 *
-	 * @covers ::insert_hooked_blocks
 	 */
 	public function test_insert_hooked_blocks_filter_can_set_attributes() {
 		$anchor_block = array(
@@ -139,8 +133,6 @@ public function test_insert_hooked_blocks_filter_can_set_attributes() {
 	 * @ticket 59572
 	 * @ticket 60126
 	 * @ticket 60506
-	 *
-	 * @covers ::insert_hooked_blocks
 	 */
 	public function test_insert_hooked_blocks_filter_can_wrap_block() {
 		$anchor_block = array(
@@ -184,7 +176,6 @@ public function test_insert_hooked_blocks_filter_can_wrap_block() {
 	/**
 	 * @ticket 60580
 	 *
-	 * @covers ::insert_hooked_blocks
 	 */
 	public function test_insert_hooked_blocks_filter_can_suppress_hooked_block() {
 		$anchor_block = array(
diff --git a/tests/phpunit/tests/blocks/insertHookedBlocksAndSetIgnoredHookedBlocksMetadata.php b/tests/phpunit/tests/blocks/insertHookedBlocksAndSetIgnoredHookedBlocksMetadata.php
@@ -9,6 +9,7 @@
  *
  * @group blocks
  * @group block-hooks
+ *
  * @covers ::insert_hooked_blocks_and_set_ignored_hooked_blocks_metadata
  */
 class Tests_Blocks_InsertHookedBlocksAndSetIgnoredHookedBlocksMetadata extends WP_UnitTestCase {
diff --git a/tests/phpunit/tests/blocks/registerBlockTypeFromMetadataWithRegistry.php b/tests/phpunit/tests/blocks/registerBlockTypeFromMetadataWithRegistry.php
@@ -3,6 +3,8 @@
  * Tests for WP_Block_Metadata_Registry integration with register_block_type_from_metadata().
  *
  * @group blocks
+ *
+ * @covers ::register_block_type_from_metadata
  */
 class Tests_Blocks_RegisterBlockTypeFromMetadataWithRegistry extends WP_UnitTestCase {
 	private $temp_manifest_file;
diff --git a/tests/phpunit/tests/blocks/wpBlockParser.php b/tests/phpunit/tests/blocks/wpBlockParser.php
@@ -7,6 +7,8 @@
  * @since 5.0.0
  *
  * @group blocks
+ *
+ * @coversDefaultClass WP_Block_Parser
  */
 class Tests_Blocks_wpBlockParser extends WP_UnitTestCase {
 	/**
@@ -17,35 +19,11 @@ class Tests_Blocks_wpBlockParser extends WP_UnitTestCase {
 	 */
 	protected static $fixtures_dir;
 
-	/**
-	 * @ticket 45109
-	 */
-	public function data_parsing_test_filenames() {
-		self::$fixtures_dir = DIR_TESTDATA . '/blocks/fixtures';
-
-		$fixture_filenames = array_merge(
-			glob( self::$fixtures_dir . '/*.json' ),
-			glob( self::$fixtures_dir . '/*.html' )
-		);
-
-		$fixture_filenames = array_values(
-			array_unique(
-				array_map(
-					array( $this, 'clean_fixture_filename' ),
-					$fixture_filenames
-				)
-			)
-		);
-
-		return array_map(
-			array( $this, 'pass_parser_fixture_filenames' ),
-			$fixture_filenames
-		);
-	}
-
 	/**
 	 * @dataProvider data_parsing_test_filenames
 	 * @ticket 45109
+	 *
+	 * @covers ::parse
 	 */
 	public function test_default_parser_output( $html_filename, $parsed_json_filename ) {
 		$html_path        = self::$fixtures_dir . '/' . $html_filename;
@@ -70,6 +48,32 @@ public function test_default_parser_output( $html_filename, $parsed_json_filenam
 		);
 	}
 
+	/**
+	 * @ticket 45109
+	 */
+	public function data_parsing_test_filenames() {
+		self::$fixtures_dir = DIR_TESTDATA . '/blocks/fixtures';
+
+		$fixture_filenames = array_merge(
+			glob( self::$fixtures_dir . '/*.json' ),
+			glob( self::$fixtures_dir . '/*.html' )
+		);
+
+		$fixture_filenames = array_values(
+			array_unique(
+				array_map(
+					array( $this, 'clean_fixture_filename' ),
+					$fixture_filenames
+				)
+			)
+		);
+
+		return array_map(
+			array( $this, 'pass_parser_fixture_filenames' ),
+			$fixture_filenames
+		);
+	}
+
 	/**
 	 * Helper function to remove relative paths and extension from a filename, leaving just the fixture name.
 	 *
diff --git a/tests/phpunit/tests/general/wpError.php b/tests/phpunit/tests/general/wpError.php

Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,6 @@ input#link_url {`
`121`	`121`	`#edit-slug-box .cancel {`
`122`	`122`	`margin-right: 10px;`
`123`	`123`	`padding: 0;`
`124`		`- font-size: 11px;`
`125`	`124`	`}`
`126`	`125`
`127`	`126`	`#comment-link-box {`
`@@ -140,7 +139,7 @@ input#link_url {`
`140`	`139`	`#editable-post-name input {`
`141`	`140`	`font-size: 13px;`
`142`	`141`	`font-weight: 400;`
`143`		`- height: 24px;`
	`142`	`+ min-height: 32px;`
`144`	`143`	`margin: 0;`
`145`	`144`	`width: 16em;`
`146`	`145`	`}`
`@@ -1068,6 +1067,10 @@ form#tags-filter {`
`1068`	`1067`	`#edit-slug-box {`
`1069`	`1068`	`padding: 0;`
`1070`	`1069`	`}`
	`1070`	`+`
	`1071`	`+ #editable-post-name input {`
	`1072`	`+ min-height: 40px;`
	`1073`	`+ }`
`1071`	`1074`	`}`
`1072`	`1075`
`1073`	`1076`	`@media only screen and (max-width: 1004px) {`
Original file line number	Diff line number	Diff line change
`@@ -583,6 +583,11 @@ input[type="number"].tiny-text {`
`583`	`583`	`vertical-align: middle;`
`584`	`584`	`}`
`585`	`585`
	`586`	`+.button.wp-hide-pw.user-new-password-toggle > .dashicons {`
	`587`	`+ line-height: 1.85;`
	`588`	`+ vertical-align: top;`
	`589`	`+}`
	`590`	`+`
`586`	`591`	`.wp-cancel-pw .dashicons-no {`
`587`	`592`	`display: none;`
`588`	`593`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`	`*`
`10`	`10`	`* @group blocks`
`11`	`11`	`* @group block-hooks`
	`12`	`+ *`
`12`	`13`	`* @covers ::insert_hooked_blocks_and_set_ignored_hooked_blocks_metadata`
`13`	`14`	`*/`
`14`	`15`	`class Tests_Blocks_InsertHookedBlocksAndSetIgnoredHookedBlocksMetadata extends WP_UnitTestCase {`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,8 @@`
`3`	`3`	`* Tests for WP_Block_Metadata_Registry integration with register_block_type_from_metadata().`
`4`	`4`	`*`
`5`	`5`	`* @group blocks`
	`6`	`+ *`
	`7`	`+ * @covers ::register_block_type_from_metadata`
`6`	`8`	`*/`
`7`	`9`	`class Tests_Blocks_RegisterBlockTypeFromMetadataWithRegistry extends WP_UnitTestCase {`
`8`	`10`	`private $temp_manifest_file;`