Merge remote-tracking branch 'upstream/trunk' into limit-jobs-for-fork-prs

Author: desrosj

.github/workflows/install-testing.yml

@@ -94,11 +94,12 @@ jobs:
           - db-version: '9.0'
           - db-version: '9.1'
           - db-version: '9.2'
+          - db-version: '9.3'
           # MySQL 9.0+ will not work on PHP 7.2 & 7.3. See https://core.trac.wordpress.org/ticket/61218.
           - php: '7.2'
-            db-version: '9.3'
+            db-version: '9.4'
           - php: '7.3'
-            db-version: '9.3'
+            db-version: '9.4'
 
     services:
       database:

.github/workflows/local-docker-environment.yml

@@ -99,11 +99,12 @@ jobs:
           - db-version: '9.0'
           - db-version: '9.1'
           - db-version: '9.2'
+          - db-version: '9.3'
           # MySQL 9.0+ will not work on PHP 7.2 & 7.3. See https://core.trac.wordpress.org/ticket/61218.
           - php: '7.2'
-            db-version: '9.3'
+            db-version: '9.4'
           - php: '7.3'
-            db-version: '9.3'
+            db-version: '9.4'
 
     with:
       os: ${{ matrix.os }}

.github/workflows/phpunit-tests.yml

@@ -184,6 +184,8 @@ jobs:
   # Because upstream support for innovation releases is dropped when a new one is released (including security updates),
   # only the most recent innovation version is tested.
   #
+  # MariaDB does not currently have a supported innovation release.
+  #
   test-innovation-releases:
     name: PHP ${{ matrix.php }}
     uses: ./.github/workflows/reusable-phpunit-tests-v3.yml
@@ -196,23 +198,18 @@ jobs:
       matrix:
         os: [ ubuntu-24.04 ]
         php: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4' ]
-        db-type: [ 'mysql', 'mariadb' ]
-        db-version: [ '9.3', '11.7' ]
+        db-type: [ 'mysql' ]
+        db-version: [ '9.4' ]
         multisite: [ false, true ]
         memcached: [ false ]
         db-innovation: [ true ]
 
         exclude:
           # MySQL 9.0+ will not work on PHP <= 7.3 because mysql_native_password was removed. See https://core.trac.wordpress.org/ticket/61218.
           - php: '7.2'
-            db-version: '9.3'
+            db-version: '9.4'
           - php: '7.3'
-            db-version: '9.3'
-          # Exclude version combinations that don't exist.
-          - db-type: 'mariadb'
-            db-version: '9.3'
-          - db-type: 'mysql'
-            db-version: '11.7'
+            db-version: '9.4'
     with:
       os: ${{ matrix.os }}
       php: ${{ matrix.php }}

.github/workflows/upgrade-testing.yml

@@ -65,7 +65,7 @@ jobs:
         os: [ 'ubuntu-24.04' ]
         php: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4' ]
         db-type: [ 'mysql' ]
-        db-version: [ '5.7', '8.0', '8.4', '9.3' ]
+        db-version: [ '5.7', '8.0', '8.4', '9.4' ]
         wp: [ '6.7', '6.8' ]
         multisite: [ false, true ]
 
@@ -77,9 +77,9 @@ jobs:
             db-version: '8.4'
           # MySQL 9.0+ will not work on PHP 7.2 & 7.3. See https://core.trac.wordpress.org/ticket/61218.
           - php: '7.2'
-            db-version: '9.3'
+            db-version: '9.4'
           - php: '7.3'
-            db-version: '9.3'
+            db-version: '9.4'
     with:
       os: ${{ matrix.os }}
       php: ${{ matrix.php }}
@@ -188,7 +188,7 @@ jobs:
         os: [ 'ubuntu-24.04' ]
         php: [ '7.2', '7.3', '7.4' ]
         db-type: [ 'mysql' ]
-        db-version: [ '5.7', '8.0', '8.4', '9.3' ]
+        db-version: [ '5.7', '8.0', '8.4', '9.4' ]
         wp: [ '4.7' ]
         multisite: [ false, true ]
 
@@ -200,9 +200,9 @@ jobs:
             db-version: '8.4'
           # MySQL 9.0+ will not work on PHP 7.2 & 7.3. See https://core.trac.wordpress.org/ticket/61218.
           - php: '7.2'
-            db-version: '9.3'
+            db-version: '9.4'
           - php: '7.3'
-            db-version: '9.3'
+            db-version: '9.4'
     with:
       os: ${{ matrix.os }}
       php: ${{ matrix.php }}

.version-support-mysql.json

@@ -1,5 +1,6 @@
 {
 	"6-9": [
+		"9.4",
 		"9.3",
 		"9.2",
 		"9.1",

composer.json

@@ -20,8 +20,8 @@
 	},
 	"require-dev": {
 		"composer/ca-bundle": "1.5.7",
-		"squizlabs/php_codesniffer": "3.10.3",
-		"wp-coding-standards/wpcs": "~3.1.0",
+		"squizlabs/php_codesniffer": "3.13.2",
+		"wp-coding-standards/wpcs": "~3.2.0",
 		"phpcompatibility/phpcompatibility-wp": "~2.1.3",
 		"yoast/phpunit-polyfills": "^1.1.0"
 	},

package.json

@@ -183,7 +183,7 @@
 		"env:clean": "node ./tools/local-env/scripts/docker.js down -v --remove-orphans",
 		"env:reset": "node ./tools/local-env/scripts/docker.js down --rmi all -v --remove-orphans",
 		"env:install": "node ./tools/local-env/scripts/install.js",
-		"env:cli": "node ./tools/local-env/scripts/docker.js exec cli wp --allow-root",
+		"env:cli": "node ./tools/local-env/scripts/docker.js exec --user wp_php cli wp",
 		"env:logs": "node ./tools/local-env/scripts/docker.js logs",
 		"env:pull": "node ./tools/local-env/scripts/docker.js pull",
 		"test:performance": "wp-scripts test-playwright --config tests/performance/playwright.config.js",

src/js/_enqueues/wp/customize/preview.js

@@ -635,11 +635,28 @@
 		/**
 		 * Preview changes to custom css.
 		 *
-		 * @param {string} value Custom CSS..
+		 * @param {string} value Custom CSS.
 		 * @return {void}
 		 */
 		custom_css: function( value ) {
-			$( '#wp-custom-css' ).text( value );
+			var style;
+			if ( api.settings.theme.isBlockTheme ) {
+				style = $( 'style#global-styles-inline-css' );
+
+				// Forbid milestone comments from appearing in Custom CSS which would break live preview.
+				value = value.replace( /\/\*(BEGIN|END)_CUSTOMIZER_CUSTOM_CSS\*\//g, '' );
+
+				var textContent = style.text().replace(
+					/(\/\*BEGIN_CUSTOMIZER_CUSTOM_CSS\*\/)((?:.|\s)*?)(\/\*END_CUSTOMIZER_CUSTOM_CSS\*\/)/,
+					function ( match, beforeComment, oldValue, afterComment ) {
+						return beforeComment + '\n' + value + '\n' + afterComment;
+					}
+				);
+				style.text( textContent );
+			} else {
+				style = $( 'style#wp-custom-css' );
+				style.text( value );
+			}
 		},
 
 		/**

src/js/_enqueues/wp/theme.js

@@ -1011,6 +1011,12 @@ themes.view.Preview = themes.view.Details.extend({
 			this.undelegateEvents();
 			this.close();
 		}
+
+		// Return if Ctrl + Shift or Shift key pressed
+		if ( event.shiftKey || ( event.ctrlKey && event.shiftKey ) ) {
+			return;
+		}
+
 		// The right arrow key, next theme.
 		if ( event.keyCode === 39 ) {
 			_.once( this.nextTheme() );
@@ -1115,6 +1121,11 @@ themes.view.Themes = wp.Backbone.View.extend({
 				return;
 			}
 
+			// Return if Ctrl + Shift or Shift key pressed
+			if ( event.shiftKey || ( event.ctrlKey && event.shiftKey ) ) {
+				return;
+			}
+
 			// Pressing the right arrow key fires a theme:next event.
 			if ( event.keyCode === 39 ) {
 				self.overlay.nextTheme();

src/js/media/views/frame/edit-attachments.js

@@ -255,6 +255,11 @@ EditAttachments = MediaFrame.extend(/** @lends wp.media.view.MediaFrame.EditAtta
 			return;
 		}
 
+		// Return if Ctrl + Shift or Shift key pressed
+		if ( event.shiftKey || ( event.ctrlKey && event.shiftKey ) ) {
+			return;
+		}
+
 		// The right arrow key.
 		if ( 39 === event.keyCode ) {
 			this.nextMediaItem();