Merge branch 'main' into copilot/add-network-flag-event-run

Author: swissspidy

.gitattributes

@@ -0,0 +1,14 @@
+/.actrc export-ignore
+/.distignore export-ignore
+/.editorconfig export-ignore
+/.github export-ignore
+/.gitignore export-ignore
+/.typos.toml export-ignore
+/AGENTS.md export-ignore
+/behat.yml export-ignore
+/features export-ignore
+/phpcs.xml.dist export-ignore
+/phpstan.neon.dist export-ignore
+/phpunit.xml.dist export-ignore
+/tests export-ignore
+/wp-cli.yml export-ignore

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

@@ -21,13 +21,11 @@ jobs:
 
       - name: Check existence of composer.json file
         id: check_composer_file
-        uses: andstor/file-existence-action@076e0072799f4942c8bc574a82233e1e4d13e9d6 # v3
-        with:
-          files: "composer.json"
+        run: echo "files_exists=$(test -f composer.json && echo true || echo false)" >> "$GITHUB_OUTPUT"
 
       - name: Set up PHP environment
         if: steps.check_composer_file.outputs.files_exists == 'true'
-        uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # v2
+        uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # v2
         with:
           php-version: 'latest'
           ini-values: zend.assertions=1, error_reporting=-1, display_errors=On
@@ -38,7 +36,7 @@ jobs:
 
       - name: Install Composer dependencies & cache dependencies
         if: steps.check_composer_file.outputs.files_exists == 'true'
-        uses: ramsey/composer-install@3cf229dc2919194e9e36783941438d17239e8520 # v3
+        uses: ramsey/composer-install@65e4f84970763564f46a70b8a54b90d033b3bdda # v3
         env:
           COMPOSER_ROOT_VERSION: dev-${{ github.event.repository.default_branch }}
         with:

README.md

@@ -88,7 +88,7 @@ wp cron event
 Deletes all scheduled cron events for the given hook.
 
 ~~~
-wp cron event delete [<hook>...] [--due-now] [--exclude=<hooks>] [--all]
+wp cron event delete [<hook>...] [--due-now] [--exclude=<hooks>] [--all] [--match-args=<args>]
 ~~~
 
 **OPTIONS**
@@ -105,12 +105,19 @@ wp cron event delete [<hook>...] [--due-now] [--exclude=<hooks>] [--all]
 	[--all]
 		Delete all hooks.
 
+	[--match-args=<args>]
+		Only delete events whose arguments match the given JSON-encoded array or scalar value. Argument types must match exactly (for example, `["123"]` vs `[123]`). Requires exactly one hook name.
+
 **EXAMPLES**
 
     # Delete all scheduled cron events for the given hook
     $ wp cron event delete cron_test
     Success: Deleted a total of 2 cron events.
 
+    # Delete a specific cron event by hook and arguments
+    $ wp cron event delete cron_test --match-args='["123"]'
+    Success: Deleted a total of 1 cron event.
+
 
 
 ### wp cron event list
@@ -160,6 +167,7 @@ These fields are optionally available:
 * schedule
 * interval
 * next_run
+* actions
 
 **EXAMPLES**
 
@@ -193,7 +201,8 @@ wp cron event run [<hook>...] [--due-now] [--exclude=<hooks>] [--all]
 		One or more hooks to run.
 
 	[--due-now]
-		Run all hooks due right now.
+		Run all hooks due right now. Respects the doing_cron transient to
+		prevent overlapping runs.
 
 	[--exclude=<hooks>]
 		Comma-separated list of hooks to exclude.

features/cron-event.feature

@@ -198,6 +198,77 @@ Feature: Manage WP Cron events
       Success: Executed a total of 2 cron events across 3 sites.
       """
 
+  Scenario: List cron events with actions field
+    Given a wp-content/mu-plugins/test-cron-actions.php file:
+      """
+      <?php
+      add_action( 'wp_cli_test_hook', 'wp_cli_test_function' );
+      add_action( 'wp_cli_test_hook', array( 'MyTestClass', 'my_method' ) );
+      add_action( 'wp_cli_test_hook_closure', function() {
+        // Test closure
+      } );
+
+      function wp_cli_test_function() {
+        // Test function
+      }
+
+      class MyTestClass {
+        public static function my_method() {
+          // Test method
+        }
+      }
+      """
+
+    When I run `wp cron event schedule wp_cli_test_hook now`
+    Then STDOUT should contain:
+      """
+      Success: Scheduled event with hook 'wp_cli_test_hook'
+      """
+
+    When I run `wp cron event list --fields=hook,actions --format=csv`
+    Then STDOUT should contain:
+      """
+      wp_cli_test_function
+      """
+    And STDOUT should contain:
+      """
+      MyTestClass::my_method
+      """
+
+    When I run `wp cron event list --hook=wp_cli_test_hook --fields=hook,actions --format=json`
+    Then STDOUT should be JSON containing:
+      """
+      [{"hook":"wp_cli_test_hook"}]
+      """
+    And STDOUT should contain:
+      """
+      wp_cli_test_function
+      """
+
+    When I run `wp cron event schedule wp_cli_test_hook_closure now`
+    Then STDOUT should contain:
+      """
+      Success: Scheduled event with hook 'wp_cli_test_hook_closure'
+      """
+
+    When I run `wp cron event list --hook=wp_cli_test_hook_closure --fields=hook,actions --format=csv`
+    Then STDOUT should contain:
+      """
+      Closure
+      """
+
+    When I run `wp cron event schedule wp_cli_test_hook_no_actions now`
+    Then STDOUT should contain:
+      """
+      Success: Scheduled event with hook 'wp_cli_test_hook_no_actions'
+      """
+
+    When I run `wp cron event list --hook=wp_cli_test_hook_no_actions --fields=hook,actions --format=csv`
+    Then STDOUT should contain:
+      """
+      None
+      """
+
   Scenario: Confirm that cron event run in debug mode shows the start of events
     When I try `wp cron event run wp_version_check --debug=cron`
     Then STDOUT should contain:
@@ -212,3 +283,31 @@ Feature: Manage WP Cron events
       """
       Debug: Beginning execution of cron event 'wp_version_check'
       """
+
+  Scenario: --due-now respects the doing_cron transient and skips when another run is in progress
+    When I run `wp cron event schedule wp_cli_test_event_lock now hourly`
+    Then STDOUT should contain:
+      """
+      Success: Scheduled event with hook 'wp_cli_test_event_lock'
+      """
+
+    # Simulate an in-progress cron run by setting the doing_cron transient.
+    When I run `wp eval 'set_transient( "doing_cron", sprintf( "%.22F", microtime( true ) ) );'`
+
+    And I try `wp cron event run --due-now`
+    Then STDERR should contain:
+      """
+      Warning: A cron event run is already in progress; skipping.
+      """
+    And STDOUT should not contain:
+      """
+      wp_cli_test_event_lock
+      """
+
+    # After the transient is cleared, the run should proceed normally.
+    When I run `wp eval 'delete_transient( "doing_cron" );'`
+    And I try `wp cron event run --due-now`
+    Then STDOUT should contain:
+      """
+      Executed the cron event 'wp_cli_test_event_lock'
+      """

features/cron.feature

@@ -307,8 +307,13 @@ Feature: Manage WP-Cron events and schedules
   # executes the "wp_privacy_delete_old_export_files" event there.
   @require-wp-5.0
   Scenario: Run currently scheduled events
+    # Disable web-triggered cron so spawn_cron() cannot set doing_cron between
+    # steps - wp cron event run always defines DOING_CRON so this has no effect
+    # on the commands being tested.
+    When I run `wp config set DISABLE_WP_CRON true --raw`
+
     # WP throws a notice here for older versions of core.
-    When I try `wp cron event run --all`
+    And I try `wp cron event run --all`
     Then STDOUT should contain:
       """
       Executed the cron event 'wp_version_check'
@@ -583,3 +588,68 @@ Feature: Manage WP-Cron events and schedules
       """
       Error: Please either specify cron events, or use --all.
       """
+
+  Scenario: Delete a specific cron event by matching args
+    When I run `wp cron event schedule wp_cli_test_event_5 '+20 minutes' --0=banana`
+    And I run `wp cron event schedule wp_cli_test_event_5 '+20 minutes' --0=bar`
+    Then STDOUT should not be empty
+
+    When I run `wp cron event list --format=csv --fields=hook,recurrence,args`
+    Then STDOUT should be CSV containing:
+      | hook                | recurrence    | args       |
+      | wp_cli_test_event_5 | Non-repeating | ["banana"] |
+      | wp_cli_test_event_5 | Non-repeating | ["bar"]    |
+
+    When I run `wp cron event delete wp_cli_test_event_5 --match-args='["banana"]'`
+    Then STDOUT should be:
+      """
+      Success: Deleted a total of 1 cron event.
+      """
+
+    When I run `wp cron event list --format=csv --fields=hook,args`
+    Then STDOUT should be CSV containing:
+      | hook                | args     |
+      | wp_cli_test_event_5 | ["bar"]  |
+    And STDOUT should not contain:
+      """
+      ["banana"]
+      """
+
+    When I run `wp cron event delete wp_cli_test_event_5 --match-args=bar`
+    Then STDOUT should be:
+      """
+      Success: Deleted a total of 1 cron event.
+      """
+
+    When I try `wp cron event list`
+    Then STDOUT should not contain:
+      """
+      wp_cli_test_event_5
+      """
+
+    When I run `wp cron event schedule wp_cli_test_event_5 '+20 minutes' --0=banana`
+    Then STDOUT should not be empty
+
+    When I try `wp cron event delete wp_cli_test_event_5 --match-args='["banana"]' --all`
+    Then STDERR should be:
+      """
+      Error: The --match-args parameter cannot be combined with --all or --due-now.
+      """
+
+    When I try `wp cron event delete wp_cli_test_event_5 --match-args='["banana"]' --due-now`
+    Then STDERR should be:
+      """
+      Error: The --match-args parameter cannot be combined with --all or --due-now.
+      """
+
+    When I try `wp cron event delete --match-args='["banana"]'`
+    Then STDERR should be:
+      """
+      Error: The --match-args parameter requires exactly one hook name.
+      """
+
+    When I try `wp cron event delete wp_cli_test_event_5 wp_cli_test_event_5 --match-args='["banana"]'`
+    Then STDERR should be:
+      """
+      Error: The --match-args parameter requires exactly one hook name.
+      """