Merge pull request #5870 from Automattic/staging

Production release: v20240917.0

.dockerignore

@@ -99,7 +99,6 @@ wpcom-helper.php
 /shared-plugins/two-factor/dev-lib/
 /shared-plugins/two-factor/tests/
 **/tests/
-/vaultpress/changelog.txt
 /vip-support/.circleci
 /vip-support/bin/
 /vip-support/features/

.github/actions/run-wp-tests/action.yml

@@ -80,7 +80,7 @@ runs:
       uses: ramsey/composer-install@3.0.0
 
     - name: Set up WordPress and WordPress Test Library
-      uses: sjinks/setup-wordpress-test-library@v2.0.3
+      uses: sjinks/setup-wordpress-test-library@v2.1.1
       with:
         version: ${{ inputs.wordpress }}
 

.github/workflows/codeql-analysis.yml

@@ -32,10 +32,10 @@ jobs:
         uses: actions/checkout@v4.1.7
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3.26.5
+        uses: github/codeql-action/init@v3.26.6
         with:
           languages: ${{ matrix.language }}
           config-file: ./.github/codeql-config.yml
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3.26.5
+        uses: github/codeql-action/analyze@v3.26.6

.sonarcloud.properties

@@ -1,4 +1,4 @@
 sonar.sources=.
-sonar.exclusions=advanced-post-cache/**,akismet/**,bin/**,ci/**,cron-control/**,debug-bar-cron/**,debug-bar/**,drop-ins/**,http-concat/**,jetpack*/**,lightweight-term-count-update/**,query-monitor/**,rewrite-rules-inspector/**,search/elasticpress/**,search/debug-bar-elasticpress/**,search/es-wp-query/**,shared-plugins/**,vaultpress/**,wordpress-importer/**,wp-parsely*/**,tests/**,__tests__/**
+sonar.exclusions=advanced-post-cache/**,akismet/**,bin/**,ci/**,cron-control/**,debug-bar-cron/**,debug-bar/**,drop-ins/**,http-concat/**,jetpack*/**,lightweight-term-count-update/**,query-monitor/**,rewrite-rules-inspector/**,search/elasticpress/**,search/debug-bar-elasticpress/**,search/es-wp-query/**,shared-plugins/**,wordpress-importer/**,wp-parsely*/**,tests/**,__tests__/**
 sonar.tests=tests,__tests__
 sonar.cpd.exclusions=errors/**

bin/upgrade-plugin.sh

@@ -27,7 +27,7 @@ update_wporg_plugin() {
 }
 
 case $PLUGIN_SLUG in
-	vaultpress | akismet | debug-bar | query-monitor)
+	akismet | debug-bar | query-monitor)
 		update_wporg_plugin
 		;;
 

composer.json

@@ -5,7 +5,7 @@
         "phpcompatibility/phpcompatibility-wp": "2.1.5",
         "erusev/parsedown": "1.7.4",
         "dms/phpunit-arraysubset-asserts": "0.5.0",
-        "yoast/phpunit-polyfills": "2.0.1",
+        "yoast/phpunit-polyfills": "3.0.0",
         "johnpbloch/wordpress-core": "6.6.1",
         "wp-phpunit/wp-phpunit": "6.6.1",
         "wp-cli/wp-cli": "2.11.0"