Relocate cli_init hook to end of setup_bootstrap_hooks and re-attach to WordPress init hook.

Jeremy Ward · Jeremy Ward · commit 367b68fe4a7e · 2018-07-20T07:41:38.000-05:00
diff --git a/php/WP_CLI/Runner.php b/php/WP_CLI/Runner.php
@@ -966,10 +966,6 @@ private function set_alias( $alias ) {
 	}
 
 	public function start() {
-		WP_CLI::add_wp_hook( 'plugins_loaded', function () {
-			do_action( 'cli_init' );
-		} );
-
 		// 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();
@@ -1490,6 +1486,10 @@ function( $url, $path, $scheme, $blog_id ) {
 			4
 		);
 
+		// Set up hook for WP-CLI packages to use.
+		WP_CLI::add_wp_hook( 'init', function () {
+			do_action( 'cli_init' );
+		} );
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -966,10 +966,6 @@ private function set_alias( $alias ) {`
`966`	`966`	`}`
`967`	`967`
`968`	`968`	`public function start() {`
`969`		`- WP_CLI::add_wp_hook( 'plugins_loaded', function () {`
`970`		`- do_action( 'cli_init' );`
`971`		`- } );`
`972`		`-`
`973`	`969`	`// Enable PHP error reporting to stderr if testing. Will need to be re-enabled after WP loads.`
`974`	`970`	`if ( getenv( 'BEHAT_RUN' ) ) {`
`975`	`971`	`$this->enable_error_reporting();`
`@@ -1490,6 +1486,10 @@ function( $url, $path, $scheme, $blog_id ) {`
`1490`	`1486`	`4`
`1491`	`1487`	`);`
`1492`	`1488`
	`1489`	`+ // Set up hook for WP-CLI packages to use.`
	`1490`	`+ WP_CLI::add_wp_hook( 'init', function () {`
	`1491`	`+ do_action( 'cli_init' );`
	`1492`	`+ } );`
`1493`	`1493`	`}`
`1494`	`1494`
`1495`	`1495`	`/**`