Merge pull request #4861 from jmichaelward/issue-4818-add-wordpress-action-to-initialize-plugin-commands

Trigger new 'cli_init' hook during WordPress plugins_loaded action.

Author: schlessera

features/command.feature

@@ -1666,3 +1666,21 @@ Feature: WP-CLI Commands
       """
       core custom-subcommand
       """
+
+  Scenario: An activated plugin should successfully add custom commands when hooked on the cli_init action
+    Given a WP installation
+    And a wp-content/plugins/custom-command/custom-cmd.php file:
+      """
+      <?php
+      // Plugin Name: Custom Command
+
+      add_action( 'cli_init', function() {
+        WP_CLI::add_command( 'custom', function () {} );
+      } );
+      """
+    And I run `wp plugin activate custom-command`
+    When I run `wp custom --help`
+    Then STDOUT should contain:
+    """
+    wp custom
+    """

php/WP_CLI/Runner.php

@@ -966,7 +966,6 @@ private function set_alias( $alias ) {
 	}
 
 	public function start() {
-
 		// Enable PHP error reporting to stderr if testing. Will need to be re-enabled after WP loads.
 		if ( getenv( 'BEHAT_RUN' ) ) {
 			$this->enable_error_reporting();
@@ -1487,6 +1486,10 @@ function( $url, $path, $scheme, $blog_id ) {
 			4
 		);
 
+		// Set up hook for plugins and themes to conditionally add WP-CLI commands.
+		WP_CLI::add_wp_hook( 'init', function () {
+			do_action( 'cli_init' );
+		} );
 	}
 
 	/**