Merge branch 'trunk' into reintroduce-client-side-media

Author: adamsilverstein

.github/workflows/reusable-javascript-tests.yml

@@ -55,7 +55,7 @@ jobs:
       - name: Install npm Dependencies
         run: npm ci
 
-      # Older branches using outdated versions of Puppeteer fail on newer versions of the `ubuntu-24` image.
+      # Branches prior to 6.1 using outdated versions of Puppeteer fail on newer versions of the `ubuntu-24` image.
       # This disables AppArmor in order to work around those failures.
       #
       # See https://issues.chromium.org/issues/373753919

Gruntfile.js

@@ -115,7 +115,6 @@ module.exports = function(grunt) {
 			'cssmin',
 			'imagemin',
 			'jshint',
-			'qunit',
 			'uglify',
 			'watch'
 		],
@@ -957,7 +956,8 @@ module.exports = function(grunt) {
 				src: [
 					'tests/qunit/**/*.js',
 					'!tests/qunit/vendor/*',
-					'!tests/qunit/editor/**'
+					'!tests/qunit/qunit.js',
+					'!tests/qunit/playwright.config.js'
 				],
 				options: grunt.file.readJSON( 'tests/qunit/.jshintrc' )
 			},
@@ -1061,12 +1061,6 @@ module.exports = function(grunt) {
 				}
 			}
 		},
-		qunit: {
-			files: [
-				'tests/qunit/**/*.html',
-				'!tests/qunit/editor/**'
-			]
-		},
 		phpunit: {
 			'default': {
 				args: ['--verbose', '-c', 'phpunit.xml.dist']
@@ -1599,8 +1593,7 @@ module.exports = function(grunt) {
 			},
 			test: {
 				files: [
-					'tests/qunit/**',
-					'!tests/qunit/editor/**'
+					'tests/qunit/**'
 				],
 				tasks: ['qunit']
 			}
@@ -2222,6 +2215,20 @@ module.exports = function(grunt) {
 		}, this.async());
 	});
 
+	grunt.registerTask( 'qunit', 'Runs QUnit tests.', function() {
+		var done = this.async();
+		grunt.util.spawn( {
+			cmd: 'npx',
+			args: [ 'playwright', 'test', '--config', 'tests/qunit/playwright.config.js' ],
+			opts: { stdio: 'inherit' }
+		}, function( error, result, code ) {
+			if ( code !== 0 ) {
+				grunt.fail.warn( 'QUnit tests failed.' );
+			}
+			done();
+		} );
+	} );
+
 	grunt.registerTask( 'qunit:compiled', 'Runs QUnit tests on compiled as well as uncompiled scripts.',
 		['build', 'copy:qunit', 'qunit']
 	);

package-lock.json

@@ -53,7 +53,6 @@
 		"grunt-contrib-cssmin": "~5.0.0",
 		"grunt-contrib-imagemin": "~4.0.0",
 		"grunt-contrib-jshint": "3.2.0",
-		"grunt-contrib-qunit": "~10.1.1",
 		"grunt-contrib-uglify": "~5.2.2",
 		"grunt-contrib-watch": "~1.1.0",
 		"grunt-file-append": "0.0.7",

package.json

@@ -5898,7 +5898,7 @@ function wp_enqueue_emoji_styles() {
  *
  * @since 4.2.0
  */
-function print_emoji_detection_script() {
+function print_emoji_detection_script(): void {
 	static $printed = false;
 
 	if ( $printed ) {
@@ -5907,10 +5907,18 @@ function print_emoji_detection_script() {
 
 	$printed = true;
 
-	if ( did_action( 'wp_print_footer_scripts' ) ) {
-		_print_emoji_detection_script();
+	if ( is_admin() ) {
+		if ( did_action( 'admin_print_footer_scripts' ) ) {
+			_print_emoji_detection_script();
+		} else {
+			add_action( 'admin_print_footer_scripts', '_print_emoji_detection_script' );
+		}
 	} else {
-		add_action( 'wp_print_footer_scripts', '_print_emoji_detection_script' );
+		if ( did_action( 'wp_print_footer_scripts' ) ) {
+			_print_emoji_detection_script();
+		} else {
+			add_action( 'wp_print_footer_scripts', '_print_emoji_detection_script' );
+		}
 	}
 }
 

src/wp-includes/formatting.php

@@ -432,10 +432,17 @@ function dmp_filter( $a ) {
 	return $a;
 }
 
-function get_echo( $callback, $args = array() ) {
+/**
+ * Gets the output buffer for invoking the provided callback.
+ *
+ * @param callable $callback Callback.
+ * @param mixed[]  $args     Arguments.
+ * @return string Captured output.
+ */
+function get_echo( callable $callback, array $args = array() ): string {
 	ob_start();
 	call_user_func_array( $callback, $args );
-	return ob_get_clean();
+	return (string) ob_get_clean();
 }
 
 // Recursively generate some quick assertEquals() tests based on an array.