Merge branch 'trunk' into html-api/normalize-html

WordPress · Sep 20, 2024 · 6167887 · 6167887
2 parents 92558b9 + 675a1aa
commit 6167887
Show file tree

Hide file tree

Showing 190 changed files with 8,045 additions and 3,708 deletions.
diff --git a/.env → .env.example b/.env → .env.example
diff --git a/.github/workflows/phpunit-tests.yml b/.github/workflows/phpunit-tests.yml
@@ -85,9 +85,8 @@ jobs:
             memcached: false
           # Report test results to the Host Test Results.
           - os: ubuntu-latest
-            php: '7.4'
             db-type: 'mysql'
-            db-version: '5.7'
+            db-version: '8.0'
             tests-domain: 'example.org'
             multisite: false
             memcached: false

diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,7 @@
 # gitignore file for WordPress Core
 
 # Configuration files with possibly sensitive information
+.env
 wp-config.php
 wp-tests-config.php
 .htaccess

diff --git a/Gruntfile.js b/Gruntfile.js
@@ -1151,6 +1151,7 @@ module.exports = function(grunt) {
 						flatten: true,
 						src: [
 							BUILD_DIR + 'wp-includes/js/dist/block-editor.js',
+							BUILD_DIR + 'wp-includes/js/dist/commands.js',
 						],
 						dest: BUILD_DIR + 'wp-includes/js/dist/'
 					}

diff --git a/composer.json b/composer.json
@@ -17,7 +17,7 @@
 		"ext-dom": "*"
 	},
 	"require-dev": {
-		"squizlabs/php_codesniffer": "3.9.0",
+		"squizlabs/php_codesniffer": "3.10.3",
 		"wp-coding-standards/wpcs": "~3.1.0",
 		"phpcompatibility/phpcompatibility-wp": "~2.1.3",
 		"yoast/phpunit-polyfills": "^1.1.0"