Merge branch 'main' into copilot/fix-multinetwork-update-db

Author: swissspidy

.github/workflows/copilot-setup-steps.yml

@@ -17,17 +17,17 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v6
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
 
       - name: Check existence of composer.json file
         id: check_composer_file
-        uses: andstor/file-existence-action@v3
+        uses: andstor/file-existence-action@076e0072799f4942c8bc574a82233e1e4d13e9d6 # v3
         with:
           files: "composer.json"
 
       - name: Set up PHP environment
         if: steps.check_composer_file.outputs.files_exists == 'true'
-        uses: shivammathur/setup-php@v2
+        uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # v2
         with:
           php-version: 'latest'
           ini-values: zend.assertions=1, error_reporting=-1, display_errors=On
@@ -38,7 +38,7 @@ jobs:
 
       - name: Install Composer dependencies & cache dependencies
         if: steps.check_composer_file.outputs.files_exists == 'true'
-        uses: ramsey/composer-install@v3
+        uses: ramsey/composer-install@3cf229dc2919194e9e36783941438d17239e8520 # v3
         env:
           COMPOSER_ROOT_VERSION: dev-${{ github.event.repository.default_branch }}
         with:

.github/workflows/issue-triage.yml

@@ -1,18 +1,33 @@
 ---
-name: Issue Triage
+name: Issue and PR Triage
 
 'on':
   issues:
     types: [opened]
+  pull_request_target:
+    types: [opened]
   workflow_dispatch:
     inputs:
       issue_number:
-        description: 'Issue number to triage (leave empty to process all)'
+        description: 'Issue/PR number to triage (leave empty to process all)'
         required: false
         type: string
 
+permissions:
+  issues: write
+  pull-requests: write
+  actions: write
+  contents: read
+  models: read
+
 jobs:
   issue-triage:
     uses: wp-cli/.github/.github/workflows/reusable-issue-triage.yml@main
     with:
-      issue_number: ${{ github.event_name == 'workflow_dispatch' && inputs.issue_number || github.event.issue.number }}
+      issue_number: >-
+        ${{
+          (github.event_name == 'workflow_dispatch' && inputs.issue_number) ||
+          (github.event_name == 'pull_request_target' && github.event.pull_request.number) ||
+          (github.event_name == 'issues' && github.event.issue.number) ||
+          ''
+        }}

.github/workflows/regenerate-readme.yml

@@ -10,6 +10,10 @@ on:
       - "features/**"
       - "README.md"
 
+permissions:
+  contents: write
+  pull-requests: write
+
 jobs:
   regenerate-readme:
     uses: wp-cli/.github/.github/workflows/reusable-regenerate-readme.yml@main

.github/workflows/welcome-new-contributors.yml

@@ -0,0 +1,15 @@
+name: Welcome New Contributors
+
+on:
+  pull_request_target:
+    types: [opened]
+    branches:
+      - main
+      - master
+
+permissions:
+  pull-requests: write
+
+jobs:
+  welcome:
+    uses: wp-cli/.github/.github/workflows/reusable-welcome-new-contributors.yml@main

.typos.toml

@@ -0,0 +1,6 @@
+[default]
+extend-ignore-re = [
+	"(?Rm)^.*(#|//)\\s*spellchecker:disable-line$",
+	"(?s)(#|//)\\s*spellchecker:off.*?\\n\\s*(#|//)\\s*spellchecker:on",
+	"(#|//)\\s*spellchecker:ignore-next-line\\n.*"
+]

README.md

@@ -239,6 +239,8 @@ Transforms an existing single-site installation into a multisite installation.
 wp core multisite-convert [--title=<network-title>] [--base=<url-path>] [--subdomains] [--skip-config]
 ~~~
 
+**Alias:** `install-network`
+
 Creates the multisite database tables, and adds the multisite constants
 to wp-config.php.
 
@@ -344,6 +346,8 @@ Updates WordPress to a newer version.
 wp core update [<zip>] [--minor] [--version=<version>] [--force] [--locale=<locale>] [--format=<format>] [--insecure]
 ~~~
 
+**Alias:** `upgrade`
+
 Defaults to updating WordPress to the latest version.
 
 If you see "Error: Another update is currently in progress.", you may

features/core-update.feature

@@ -330,7 +330,7 @@ Feature: Update WordPress core
     When I run `wp post create --post_title='Test post' --porcelain`
     Then STDOUT should be a number
 
-  @require-php-7.2
+  @require-php-7.4
   Scenario Outline: Use `--version=(nightly|trunk)` to update to the latest nightly version
     Given a WP install
 
@@ -350,7 +350,7 @@ Feature: Update WordPress core
       | trunk      |
       | nightly    |
 
-  @require-php-7.2
+  @require-php-7.4
   Scenario: Installing latest nightly build should skip cache
     Given a WP install
 
@@ -419,3 +419,21 @@ Feature: Update WordPress core
       """
       </div>
       """
+
+  Scenario: Show helpful tip when update is locked
+    Given a WP install
+
+    When I run `wp option update core_updater.lock 100000000000000`
+    And I try `wp core update --version=trunk`
+    Then STDERR should contain:
+      """
+      Another update is currently in progress. You may need to run `wp option delete core_updater.lock` after verifying another update isn't actually running.
+      """
+    And the return code should be 1
+
+    # Clean up the lock
+    When I run `wp option delete core_updater.lock`
+    Then STDOUT should contain:
+      """
+      Success:
+      """

src/Core_Command.php

@@ -1243,7 +1243,12 @@ static function () {
 			if ( is_wp_error( $result ) ) {
 				$message = WP_CLI::error_to_string( $result );
 				if ( 'up_to_date' !== $result->get_error_code() ) {
-					WP_CLI::error( $message );
+					// Check if the error is related to the core_updater.lock
+					if ( self::is_lock_error( $result ) ) {
+						WP_CLI::error( rtrim( $message, '.' ) . '. You may need to run `wp option delete core_updater.lock` after verifying another update isn\'t actually running.' );
+					} else {
+						WP_CLI::error( $message );
+					}
 				} else {
 					WP_CLI::success( $message );
 				}
@@ -1684,4 +1689,21 @@ function () use ( $new_zip_file ) {
 			WP_CLI::error( 'ZipArchive failed to open ZIP file.' );
 		}
 	}
+
+	/**
+	 * Checks if a WP_Error is related to the core_updater.lock.
+	 *
+	 * @param \WP_Error $error The error object to check.
+	 * @return bool True if the error is related to the lock, false otherwise.
+	 */
+	private static function is_lock_error( $error ) {
+		// Check for the 'locked' error code used by WordPress Core
+		if ( 'locked' === $error->get_error_code() ) {
+			return true;
+		}
+
+		// Also check if the error message contains the lock text as a fallback
+		$message = WP_CLI::error_to_string( $error );
+		return false !== stripos( $message, 'another update is currently in progress' );
+	}
 }