Merge branch 'WordPress:trunk' into trunk

Author: sabernhardt

.github/workflows/coding-standards.yml

@@ -77,7 +77,7 @@ jobs:
       - name: Set up PHP
         uses: shivammathur/setup-php@4bd44f22a98a19e0950cbad5f31095157cc9621b # v2.25.4
         with:
-          php-version: '7.4'
+          php-version: 'latest'
           coverage: none
           tools: cs2pr
 

.gitignore

@@ -60,6 +60,7 @@ wp-tests-config.php
 !/src/wp-content/themes/twentytwentyone
 !/src/wp-content/themes/twentytwentytwo
 !/src/wp-content/themes/twentytwentythree
+!/src/wp-content/themes/twentytwentyfour
 /src/wp-content/upgrade
 /src/wp-content/uploads
 /src/wp-content/advanced-cache.php

Gruntfile.js

@@ -171,6 +171,10 @@ module.exports = function(grunt) {
 			'webpack-assets': webpackFiles.map( function( file ) {
 				return setFilePath( WORKING_DIR, file );
 			} ),
+			'interactivity-assets': [
+				WORKING_DIR + 'wp-includes/js/dist/interactivity.asset.php',
+				WORKING_DIR + 'wp-includes/js/dist/interactivity.min.asset.php',
+			],
 			dynamic: {
 				dot: true,
 				expand: true,
@@ -1458,6 +1462,7 @@ module.exports = function(grunt) {
 		'clean:webpack-assets',
 		'webpack:prod',
 		'webpack:dev',
+		'clean:interactivity-assets',
 	] );
 
 	grunt.registerTask( 'build:js', [

composer.json

@@ -12,10 +12,12 @@
 	"require": {
 		"php": ">=7.0"
 	},
+	"suggest": {
+		"ext-dom": "*"
+	},
 	"require-dev": {
-		"dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
-		"squizlabs/php_codesniffer": "3.6.0",
-		"wp-coding-standards/wpcs": "~2.3.0",
+		"squizlabs/php_codesniffer": "3.7.2",
+		"wp-coding-standards/wpcs": "~3.0.0",
 		"phpcompatibility/phpcompatibility-wp": "~2.1.3",
 		"yoast/phpunit-polyfills": "^1.1.0"
 	},