Merge pull request #4972 from Automattic/develop

Staging release: v20231024.1
Automattic · Oct 24, 2023 · e5fe601 · e5fe601
2 parents 2f5f738 + 15a311a
commit e5fe601
Show file tree

Hide file tree

Showing 26 changed files with 134 additions and 133 deletions.
diff --git a/.github/workflows/changelog-summary-prod.yml b/.github/workflows/changelog-summary-prod.yml
@@ -25,7 +25,7 @@ jobs:
           egress-policy: audit
 
       - name: Check out source code
-        uses: actions/checkout@v4.1.0
+        uses: actions/checkout@v4.1.1
 
       - name: Retrieve tags
         run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
@@ -61,7 +61,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4.1.0
+        uses: actions/checkout@v4.1.1
 
       - name: Setup PHP
         uses: shivammathur/setup-php@2.26.0

diff --git a/.github/workflows/changelog-summary-staging.yml b/.github/workflows/changelog-summary-staging.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4.1.0
+        uses: actions/checkout@v4.1.1
 
       - name: Setup PHP
         uses: shivammathur/setup-php@2.26.0

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -69,7 +69,7 @@ jobs:
           MYSQL_DATABASE: wordpress_test
     steps:
       - name: Check out source code
-        uses: actions/checkout@v4.1.0
+        uses: actions/checkout@v4.1.1
         with:
           submodules: recursive
 

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -29,7 +29,7 @@ jobs:
           - javascript
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4.1.0
+        uses: actions/checkout@v4.1.1
 
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v2

diff --git a/.github/workflows/core-tests.yml b/.github/workflows/core-tests.yml
@@ -42,14 +42,14 @@ jobs:
           echo "PHP_FPM_GID=$(id -g)" >> "${GITHUB_ENV}"
 
       - name: Checkout WordPress
-        uses: actions/checkout@v4.1.0 # v4.0.0
+        uses: actions/checkout@v4.1.1 # v4.0.0
         with:
           repository: wordpress/wordpress-develop
           path: wordpress
           ref: ${{ steps.version.outputs.latest }}
 
       - name: Check out source code
-        uses: actions/checkout@v4.1.0 # v4.0.0
+        uses: actions/checkout@v4.1.1 # v4.0.0
         with:
           submodules: recursive
           path: wordpress/src/wp-content/mu-plugins
@@ -60,7 +60,7 @@ jobs:
           echo "GITHUB_EVENT_NAME=pull_request" >> "wordpress/.env"
 
       - name: Set up Node.js
-        uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d # v3.8.1
+        uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65 # v4.0.0
         with:
           node-version-file: 'wordpress/.nvmrc'
           cache: npm

diff --git a/.github/workflows/coverage-develop.yml b/.github/workflows/coverage-develop.yml
@@ -36,7 +36,7 @@ jobs:
           MYSQL_DATABASE: wordpress_test
     steps:
       - name: Check out source code
-        uses: actions/checkout@v4.1.0
+        uses: actions/checkout@v4.1.1
         with:
           submodules: recursive
 

diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml
@@ -20,7 +20,7 @@ jobs:
             github.com:443
 
       - name: Check out the source code
-        uses: actions/checkout@v4.1.0
+        uses: actions/checkout@v4.1.1
 
       - name: Review dependencies
         uses: actions/dependency-review-action@v3
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -22,19 +22,19 @@ jobs:
       contents: write
     steps:
       - name: Check out the source code
-        uses: actions/checkout@v4.1.0
+        uses: actions/checkout@v4.1.1
         with:
           submodules: recursive
           path: ${{ env.SOURCE_REPO_PATH }}
 
       - name: Check out Automattic/vip-go-mu-plugins-ext
-        uses: actions/checkout@v4.1.0
+        uses: actions/checkout@v4.1.1
         with:
           repository: Automattic/vip-go-mu-plugins-ext
           path: ${{ env.EXT_REPO_PATH }}
 
       - name: Check out Automattic/vip-go-mu-plugins-built
-        uses: actions/checkout@v4.1.0
+        uses: actions/checkout@v4.1.1
         with:
           repository: Automattic/vip-go-mu-plugins-built
           path: ${{ env.TARGET_REPO_PATH }}

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -68,15 +68,15 @@ jobs:
             wordpress.org:443
 
       - name: Check out repository code
-        uses: actions/checkout@v4.1.0
+        uses: actions/checkout@v4.1.1
         with:
           submodules: true
 
       - name: Prepare source code
         uses: ./.github/actions/prepare-source
 
       - name: Setup Node
-        uses: actions/setup-node@v3.8.1
+        uses: actions/setup-node@v4.0.0
         with:
           node-version: 'lts/*'
           cache: npm

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -25,7 +25,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out source code
-        uses: actions/checkout@v4.1.0
+        uses: actions/checkout@v4.1.1
 
       - name: Set up PHP
         uses: shivammathur/setup-php@2.26.0
@@ -36,7 +36,7 @@ jobs:
           fail-fast: 'true'
 
       - name: Setup Node
-        uses: actions/setup-node@v3.8.1
+        uses: actions/setup-node@v4.0.0
         with:
           node-version: 'lts/*'
           cache: npm
@@ -52,10 +52,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out source code
-        uses: actions/checkout@v4.1.0
+        uses: actions/checkout@v4.1.1
 
       - name: Setup Node
-        uses: actions/setup-node@v3.8.1
+        uses: actions/setup-node@v4.0.0
         with:
           node-version: 'lts/*'
           cache: npm

diff --git a/.github/workflows/parsely.yml b/.github/workflows/parsely.yml
@@ -50,7 +50,7 @@ jobs:
           MYSQL_DATABASE: wordpress_test
     steps:
       - name: Check out source code
-        uses: actions/checkout@v4.1.0
+        uses: actions/checkout@v4.1.1
         with:
           submodules: recursive
 

diff --git a/.github/workflows/search-dev-tools.yml b/.github/workflows/search-dev-tools.yml
@@ -22,12 +22,12 @@ jobs:
       contents: write
     steps:
       - name: Check out source code
-        uses: actions/checkout@v4.1.0
+        uses: actions/checkout@v4.1.1
         with:
           token: ${{ secrets.WPCOM_VIP_BOT_TOKEN }}
 
       - name: Setup Node
-        uses: actions/setup-node@v3.8.1
+        uses: actions/setup-node@v4.0.0
         with:
           node-version: 'lts/*'
           cache: npm

diff --git a/.github/workflows/search-e2e.yml b/.github/workflows/search-e2e.yml
@@ -30,15 +30,15 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v4.1.0
+      uses: actions/checkout@v4.1.1
       with:
         submodules: recursive
 
     - name: Prepare source code
       uses: ./.github/actions/prepare-source
 
     - name: "Install node v${{ env.NODE_VERSION }}"
-      uses: actions/setup-node@v3.8.1
+      uses: actions/setup-node@v4.0.0
       with:
         node-version: ${{ env.NODE_VERSION }}
         cache: npm

diff --git a/__tests__/e2e/package-lock.json b/__tests__/e2e/package-lock.json
diff --git a/__tests__/e2e/package.json b/__tests__/e2e/package.json
@@ -16,7 +16,7 @@
     "@playwright/test": "^1.39.0",
     "asana-phrase": "^0.0.8",
     "eslint": "^8.51.0",
-    "eslint-plugin-playwright": "^0.17.0",
+    "eslint-plugin-playwright": "^0.18.0",
     "playwright": "^1.39.0",
     "typescript": "^5.2.2"
   }

diff --git a/files/class-curl-streamer.php b/files/class-curl-streamer.php
@@ -10,19 +10,13 @@ public function __construct( $file_path ) {
 	}
 
 	public function init() {
-		add_filter( 'http_api_transports', [ $this, 'enforce_curl_transport' ] );
 		add_action( 'http_api_curl', [ $this, 'init_upload' ], 10 );
 	}
 
 	public function deinit() {
-		remove_filter( 'http_api_transports', [ $this, 'enforce_curl_transport' ] );
 		remove_action( 'http_api_curl', [ $this, 'init_upload' ] );
 	}
 
-	public function enforce_curl_transport() {
-		return [ 'curl' ];
-	}
-
 	public function init_upload( $curl_handle ) {
 		// phpcs:ignore WordPress.WP.AlternativeFunctions.file_system_operations_fopen -- FP - the file is opened read-only
 		$file_stream = fopen( $this->file_path, 'r' );

diff --git a/jetpack b/jetpack
diff --git a/jetpack.php b/jetpack.php
@@ -5,7 +5,7 @@
  * Plugin URI: https://jetpack.com
  * Description: Security, performance, and marketing tools made by WordPress experts. Jetpack keeps your site protected so you can focus on more important things.
  * Author: Automattic
- * Version: 12.6
+ * Version: 12.7
  * Author URI: https://jetpack.com
  * License: GPL2+
  * Text Domain: jetpack
@@ -34,7 +34,7 @@ function vip_default_jetpack_version() {
 		return '12.5';
 	} else {
 		// WordPress 6.2 and newer.
-		return '12.6';
+		return '12.7';
 	}
 }