Merge branch 'trunk' into collaboration/table-awareness-object-cache

Author: peterwilsoncc

src/wp-admin/includes/image-edit.php

@@ -61,7 +61,7 @@ function wp_image_editor( $post_id, $msg = false ) {
 	<div class="imgedit-panel-content imgedit-panel-tools wp-clearfix">
 		<div class="imgedit-menu wp-clearfix">
 			<button type="button" onclick="imageEdit.toggleCropTool( <?php echo "$post_id, '$nonce'"; ?>, this );" aria-expanded="false" aria-controls="imgedit-crop" class="imgedit-crop button disabled" disabled><?php esc_html_e( 'Crop' ); ?></button>
-			<button type="button" class="imgedit-scale button" onclick="imageEdit.toggleControls(this);" aria-expanded="false" aria-controls="imgedit-scale"><?php esc_html_e( 'Scale' ); ?></button>
+			<button type="button" class="imgedit-scale button" onclick="imageEdit.toggleControls(this);" aria-expanded="false" aria-controls="imgedit-scale"><?php echo esc_html_x( 'Scale', 'verb' ); ?></button>
 			<div class="imgedit-rotate-menu-container">
 				<button type="button" aria-controls="imgedit-rotate-menu" class="imgedit-rotate button" aria-expanded="false" onclick="imageEdit.togglePopup(this)" onblur="imageEdit.monitorPopup()"><?php esc_html_e( 'Image Rotation' ); ?></button>
 				<div id="imgedit-rotate-menu" class="imgedit-popup-menu">
@@ -158,7 +158,7 @@ function wp_image_editor( $post_id, $msg = false ) {
 							<span class="imgedit-separator" aria-hidden="true">&times;</span>
 							<label for="imgedit-scale-height-<?php echo $post_id; ?>" class="screen-reader-text"><?php _e( 'scale height' ); ?></label>
 							<input type="number" step="1" min="0" max="<?php echo $meta['height'] ?? ''; ?>" aria-describedby="imgedit-scale-warn-<?php echo $post_id; ?>" id="imgedit-scale-height-<?php echo $post_id; ?>" onkeyup="imageEdit.scaleChanged(<?php echo $post_id; ?>, 0, this)" onblur="imageEdit.scaleChanged(<?php echo $post_id; ?>, 0, this)" value="<?php echo $meta['height'] ?? 0; ?>" />
-							<button id="imgedit-scale-button" type="button" onclick="imageEdit.action(<?php echo "$post_id, '$nonce'"; ?>, 'scale')" class="button button-primary"><?php esc_html_e( 'Scale' ); ?></button>
+							<button id="imgedit-scale-button" type="button" onclick="imageEdit.action(<?php echo "$post_id, '$nonce'"; ?>, 'scale')" class="button button-primary"><?php echo esc_html_x( 'Scale', 'verb' ); ?></button>
 							</div>
 							<span class="imgedit-scale-warn" id="imgedit-scale-warn-<?php echo $post_id; ?>"><span class="dashicons dashicons-warning" aria-hidden="true"></span><?php esc_html_e( 'Images cannot be scaled to a size larger than the original.' ); ?></span>
 						</fieldset>

tests/phpunit/tests/admin/Admin_Includes_Misc_UpdateOptionNewAdminEmail_Test.php

@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * @group admin
+ *
+ * @covers ::update_option_new_admin_email
+ */
+class Admin_Includes_Misc_UpdateOptionNewAdminEmail_Test extends WP_UnitTestCase {
+
+	/**
+	 * @ticket 59520
+	 */
+	public function test_new_admin_email_subject_filter() {
+		// Default value.
+		$mailer = tests_retrieve_phpmailer_instance();
+		update_option_new_admin_email( 'old@example.com', 'new@example.com' );
+		$this->assertSame( '[Test Blog] New Admin Email Address', $mailer->get_sent()->subject );
+
+		// Filtered value.
+		add_filter(
+			'new_admin_email_subject',
+			function () {
+				return 'Filtered Admin Email Address';
+			},
+			10,
+			1
+		);
+
+		$mailer->mock_sent = array();
+
+		$mailer = tests_retrieve_phpmailer_instance();
+		update_option_new_admin_email( 'old@example.com', 'new@example.com' );
+		$this->assertSame( 'Filtered Admin Email Address', $mailer->get_sent()->subject );
+	}
+}

…sts/phpunit/tests/admin/includesMisc.php …/Admin_Includes_Misc_UrlShorten_Test.phptests/phpunit/tests/admin/includesMisc.php renamed to tests/phpunit/tests/admin/Admin_Includes_Misc_UrlShorten_Test.php tests/phpunit/tests/admin/includesMisc.php renamed to tests/phpunit/tests/admin/Admin_Includes_Misc_UrlShorten_Test.php

@@ -2,13 +2,12 @@
 
 /**
  * @group admin
+ *
+ * @covers ::url_shorten
  */
-class Tests_Admin_IncludesMisc extends WP_UnitTestCase {
+class Admin_Includes_Misc_UrlShorten_Test extends WP_UnitTestCase {
 
-	/**
-	 * @covers ::url_shorten
-	 */
-	public function test_shorten_url() {
+	public function test_url_shorten() {
 		$tests = array(
 			'wordpress\.org/about/philosophy'
 				=> 'wordpress\.org/about/philosophy',     // No longer strips slashes.
@@ -27,30 +26,4 @@ public function test_shorten_url() {
 			$this->assertSame( $v, url_shorten( $k ) );
 		}
 	}
-
-	/**
-	 * @ticket 59520
-	 */
-	public function test_new_admin_email_subject_filter() {
-		// Default value.
-		$mailer = tests_retrieve_phpmailer_instance();
-		update_option_new_admin_email( 'old@example.com', 'new@example.com' );
-		$this->assertSame( '[Test Blog] New Admin Email Address', $mailer->get_sent()->subject );
-
-		// Filtered value.
-		add_filter(
-			'new_admin_email_subject',
-			function () {
-				return 'Filtered Admin Email Address';
-			},
-			10,
-			1
-		);
-
-		$mailer->mock_sent = array();
-
-		$mailer = tests_retrieve_phpmailer_instance();
-		update_option_new_admin_email( 'old@example.com', 'new@example.com' );
-		$this->assertSame( 'Filtered Admin Email Address', $mailer->get_sent()->subject );
-	}
 }