Merge branch 'trunk' of https://github.com/Yoast/wordpress-seo into 23301-make-the-token_manager-consent-agnostic

# Conflicts:
#	src/ai/content-planner/application/content-outline-command-handler.php
#	src/ai/content-planner/application/content-suggestion-command-handler.php

Author: pls78

.github/workflows/build-zip.yml

@@ -9,18 +9,22 @@ jobs:
   build:
     name: "Build plugin zip"
     runs-on: ubuntu-latest
+    # Don't run on forks.
     if: >
-      github.event_name == 'workflow_dispatch' ||
+      github.repository_owner == 'Yoast' &&
       (
-        github.event_name == 'issue_comment' &&
-        github.event.issue.pull_request &&
-        startsWith(github.event.comment.body, '/build-zip')
+        github.event_name == 'workflow_dispatch' ||
+        (
+          github.event_name == 'issue_comment' &&
+          github.event.issue.pull_request &&
+          startsWith(github.event.comment.body, '/build-zip')
+        )
       )
 
     steps:
       - name: Check actions access
         if: github.event_name == 'issue_comment'
-        uses: actions/github-script@v9
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         with:
           script: |
             const { data } = await github.rest.repos.getCollaboratorPermissionLevel({
@@ -34,7 +38,7 @@ jobs:
 
       - name: Add reaction to command
         if: github.event_name == 'issue_comment'
-        uses: actions/github-script@v9
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         with:
           script: |
             await github.rest.reactions.createForIssueComment({
@@ -47,7 +51,7 @@ jobs:
       - name: Get PR head ref
         if: github.event_name == 'issue_comment'
         id: pr
-        uses: actions/github-script@v9
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         with:
           script: |
             const { data: pr } = await github.rest.pulls.get({
@@ -58,18 +62,19 @@ jobs:
             core.setOutput('ref', pr.head.ref);
 
       - name: Checkout code
-        uses: actions/checkout@v6
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           ref: ${{ steps.pr.outputs.ref || '' }}
+          persist-credentials: false
 
       - name: Install PHP
-        uses: shivammathur/setup-php@v2
+        uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # 2.37.0
         with:
           php-version: 7.4
           coverage: none
 
       - name: Set up Node
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
           node-version-file: './.nvmrc'
 
@@ -87,15 +92,15 @@ jobs:
         run: mv artifact wordpress-seo
 
       - name: Upload zip
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           name: wordpress-seo-${{ steps.timestamp.outputs.value }}
           path: wordpress-seo/
           retention-days: 1
 
       - name: Post artifact link
         if: github.event_name == 'issue_comment'
-        uses: actions/github-script@v9
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         with:
           script: |
             await github.rest.issues.createComment({

.github/workflows/codeql-analysis.yml

@@ -32,9 +32,9 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@e46ed2cbd01164d986452f91f178727624ae40d7 # v4.35.3
+      uses: github/codeql-action/init@9e0d7b8d25671d64c341c19c0152d693099fb5ba # v4.35.5
       with:
         languages: ${{ matrix.language }}
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@e46ed2cbd01164d986452f91f178727624ae40d7 # v4.35.3
+      uses: github/codeql-action/analyze@9e0d7b8d25671d64c341c19c0152d693099fb5ba # v4.35.5

admin/class-gutenberg-compatibility.php

@@ -15,14 +15,14 @@ class WPSEO_Gutenberg_Compatibility {
 	 *
 	 * @var string
 	 */
-	public const CURRENT_RELEASE = '23.1.1';
+	public const CURRENT_RELEASE = '23.2.2';
 
 	/**
 	 * The minimally supported version of Gutenberg by the plugin.
 	 *
 	 * @var string
 	 */
-	public const MINIMUM_SUPPORTED = '23.1.1';
+	public const MINIMUM_SUPPORTED = '23.2.2';
 
 	/**
 	 * Holds the current version.

admin/tracking/class-tracking-server-data.php

@@ -36,10 +36,11 @@ protected function get_server_data() {
 			$server_data['Hostname'] = gethostbyaddr( $ipaddress );
 		}
 
-		$server_data['os']            = function_exists( 'php_uname' ) ? php_uname() : PHP_OS;
-		$server_data['PhpVersion']    = PHP_VERSION;
-		$server_data['CurlVersion']   = $this->get_curl_info();
-		$server_data['PhpExtensions'] = $this->get_php_extensions();
+		$server_data['os']             = function_exists( 'php_uname' ) ? php_uname() : PHP_OS;
+		$server_data['PhpVersion']     = PHP_VERSION;
+		$server_data['CurlVersion']    = $this->get_curl_info();
+		$server_data['PhpExtensions']  = $this->get_php_extensions();
+		$server_data['ServerSoftware'] = isset( $_SERVER['SERVER_SOFTWARE'] ) ? sanitize_text_field( wp_unslash( $_SERVER['SERVER_SOFTWARE'] ) ) : '';
 
 		return $server_data;
 	}

apps/components/package.json

@@ -47,7 +47,7 @@
     "style-loader": "^0.23.1",
     "webpack": "4.19.1",
     "webpack-cli": "^2.1.3",
-    "webpack-dev-server": "5.2.1",
+    "webpack-dev-server": "5.2.4",
     "yoast-components": "^5.24.0"
   },
   "peerDependencies": {

apps/content-analysis/package.json

@@ -62,7 +62,7 @@
     "terser-webpack-plugin": "2.2.1",
     "url-loader": "3.0.0",
     "webpack": "^4.47.0",
-    "webpack-dev-server": "^3.11.3",
+    "webpack-dev-server": "^5.2.4",
     "webpack-manifest-plugin": "2.2.0",
     "workbox-webpack-plugin": "4.3.1",
     "worker-loader": "^2.0.0",