Merge remote-tracking branch 'upstream' into 6-9/dependency-updates

Author: desrosj

.github/workflows/pull-request-comments.yml

@@ -130,6 +130,20 @@ jobs:
             const fs = require( 'fs' );
             const issue_number = Number( fs.readFileSync( './NR' ) );
 
+            core.info( `Checking pull request #${issue_number}.` );
+
+            // Confirm that the pull request is still open before leaving a comment.
+            const pr = await github.rest.pulls.get({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              pull_number: issue_number,
+            });
+
+            if ( pr.data.state !== 'open' ) {
+              core.info( 'The pull request has been closed. No comment will be left.' );
+              return;
+            }
+
             // Comments are only added after the first successful build. Check for the presence of a comment and bail early.
             const commentInfo = {
               owner: context.repo.owner,
@@ -141,6 +155,7 @@ jobs:
 
             for ( const currentComment of comments ) {
               if ( currentComment.user.type === 'Bot' && currentComment.body.includes( 'Test using WordPress Playground' ) ) {
+                core.info( 'A comment with instructions to test within a Playground instance already exists.' );
                 return;
               }
             };

Gruntfile.js

@@ -1159,7 +1159,7 @@ module.exports = function(grunt) {
 								}
 
 								// Fetch a list of the files that Twemoji supplies.
-								query = 'query={repository(owner: "jdecked", name: "twemoji") {object(expression: "v16.0.1:assets/svg") {... on Tree {entries {name}}}}}';
+								query = 'query={repository(owner: "jdecked", name: "twemoji") {object(expression: "v17.0.1:assets/svg") {... on Tree {entries {name}}}}}';
 								files = spawn( 'gh', [ 'api', 'graphql', '-f', query] );
 
 								if ( 0 !== files.status ) {

src/js/_enqueues/lib/emoji-loader.js

@@ -271,20 +271,20 @@ function browserSupportsEmoji( context, type, emojiSetsRenderIdentically, emojiR
 			return ! isIdentical;
 		case 'emoji':
 			/*
-			 * Does Emoji 16.0 cause the browser to go splat?
+			 * Is there a large, hairy, humanoid mythical creature living in the browser?
 			 *
-			 * To test for Emoji 16.0 support, try to render a new emoji: Splatter.
+			 * To test for Emoji 17.0 support, try to render a new emoji: Hairy Creature.
 			 *
-			 * The splatter emoji is a single code point emoji. Testing for browser support
-			 * required testing the center point of the emoji to see if it is empty.
+			 * The hairy creature emoji is a single code point emoji. Testing for browser
+			 * support required testing the center point of the emoji to see if it is empty.
 			 *
-			 * 0xD83E 0xDEDF (\uD83E\uDEDF) == 🫟 Splatter.
+			 * 0xD83E 0x1FAC8 (\uD83E\u1FAC8) == 🫈 Hairy creature.
 			 *
 			 * When updating this test, please ensure that the emoji is either a single code point
 			 * or switch to using the emojiSetsRenderIdentically function and testing with a zero-width
 			 * joiner vs a zero-width space.
 			 */
-			const notSupported = emojiRendersEmptyCenterPoint( context, '\uD83E\uDEDF' );
+			const notSupported = emojiRendersEmptyCenterPoint( context, '\uD83E\u1FAC8' );
 			return ! notSupported;
 	}
 

src/js/_enqueues/vendor/twemoji.js

@@ -445,7 +445,8 @@ class="<?php echo esc_attr( $classes_for_button ); ?>"
 				__( 'Standard time begins on: %s.' );
 			printf(
 				$message,
-				'<code>' . wp_date( __( 'F j, Y' ) . ' ' . __( 'g:i a' ), $transitions[1]['ts'] ) . '</code>'
+				/* translators: Localized date and time format, see https://www.php.net/manual/datetime.format.php */
+				'<code>' . wp_date( __( 'F j, Y g:i a' ), $transitions[1]['ts'] ) . '</code>'
 			);
 		} else {
 			_e( 'This timezone does not observe daylight saving time.' );

src/wp-admin/options-general.php

@@ -6,8 +6,8 @@
  */
 class Tests_Formatting_Emoji extends WP_UnitTestCase {
 
-	private $png_cdn = 'https://s.w.org/images/core/emoji/16.0.1/72x72/';
-	private $svg_cdn = 'https://s.w.org/images/core/emoji/16.0.1/svg/';
+	private $png_cdn = 'https://s.w.org/images/core/emoji/17.0.1-1/72x72/';
+	private $svg_cdn = 'https://s.w.org/images/core/emoji/17.0.1-1/svg/';
 
 	/**
 	 * @ticket 63842
@@ -157,6 +157,11 @@ public function data_wp_encode_emoji() {
 				'🧚',
 				'🧚',
 			),
+			array(
+				// Hairy creature (Unicode 17).
+				'🫈',
+				'🫈',
+			),
 		);
 	}
 
@@ -192,6 +197,11 @@ public function data_wp_staticize_emoji() {
 				'🧚',
 				'<img src="' . $this->png_cdn . '1f9da.png" alt="🧚" class="wp-smiley" style="height: 1em; max-height: 1em;" />',
 			),
+			array(
+				// Hairy creature (Unicode 17).
+				'🫈',
+				'<img src="' . $this->png_cdn . '1fac8.png" alt="🫈" class="wp-smiley" style="height: 1em; max-height: 1em;" />',
+			),
 		);
 
 		return $data;