Changeset 13710 for sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/jobs/class-manager.php

Timestamp:

05/16/2024 02:34:14 AM (2 years ago)

Author:

dd32

Message:

Plugin Directory: Cron: Refactor how we hook the colon-based jobs, such as import_plugin:example-slug such that the cron task will be executed when run manually through wp-cli.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/jobs/class-manager.php (modified) (4 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/jobs/class-manager.php

@@ -2 +2 @@
 namespace WordPressdotorg\Plugin_Directory\Jobs;
 use WordPressdotorg\Plugin_Directory\Tools;
+use const \WP_CLI;
 
 /**
@@ -31 +32 @@
 
         // Register the wildcard cron hook tasks.
-        if ( defined( 'DOING_CRON' ) && DOING_CRON ) {
+        if ( wp_doing_cron() || ( defined( 'WP_CLI' ) && WP_CLI ) ) {
             // This must be run after plugins_loaded, as that's when Cavalcade hooks in.
             add_action( 'init', array( $this, 'register_colon_based_hook_handlers' ) );
@@ -295 +296 @@
         );
 
+        // Add the wildcard cron task above to the specified colon-based hook.
+        $add_callback = static function( $hook ) use( $wildcard_cron_tasks ) {
+            if ( ! str_contains( $hook, ':' ) ) {
+                return;
+            }
+
+            list( $partial_hook, $slug ) = explode( ':', $hook, 2 );
+            $callback                    = $wildcard_cron_tasks[ $partial_hook ] ?? false;
+
+            if ( ! $callback ) {
+                return;
+            }
+
+            if ( ! has_action( $hook, $callback ) ) {
+                add_action( $hook, $callback, 10, PHP_INT_MAX );
+            }
+        };
+
         if ( is_array( $cron_array ) ) {
             foreach ( $cron_array as $timestamp => $handlers ) {
@@ -302 +321 @@
 
                 foreach ( $handlers as $hook => $jobs ) {
-                    $pos = strpos( $hook, ':' );
-                    if ( ! $pos ) {
-                        continue;
-                    }
-
-                    $partial_hook = substr( $hook, 0, $pos );
-
-                    if ( isset( $wildcard_cron_tasks[ $partial_hook ] ) ) {
-                        add_action( $hook, $wildcard_cron_tasks[ $partial_hook ], 10, PHP_INT_MAX );
-                    }
+                    $add_callback( $hook );
+                }
+            }
+        }
+
+        /*
+         * When jobs are run manually or after-the-fact, we need to find the current job first.
+         *
+         * The `CAVALCADE_JOB_ID` constant exists inside Cavalcade, which WordPress.org uses for cron,
+         * but the constant is only set just before the cron task fires, and is not available at the
+         * time that this code executes.
+         *
+         * We can get the job hook via the job id, either through `$job_id` global that our loader sets,
+         * or through the WP CLI arguments.
+         */
+        if ( wp_doing_cron() || ( defined( 'WP_CLI' ) && WP_CLI ) ) {
+            // The WordPress.org cavalcade loader sets the $job_id variable.
+            $job_id = $GLOBALS['job_id'] ?? false;
+
+            // Try to get it from the CLI args. `wp cavalcade run 12345`
+            if ( ! $job_id && in_array( 'run', $GLOBALS['argv'] ) ) {
+                $job_id = $GLOBALS['argv'][ array_search( 'run', $GLOBALS['argv'] ) + 1 ] ?? false;
+            }
+
+            if ( $job_id && class_exists( '\HM\Cavalcade\Plugin\Job' ) ) {
+                $job = \HM\Cavalcade\Plugin\Job::get( $job_id );
+                if ( $job ) {
+                    $add_callback( $job->hook );
                 }
             }