Various: Ensure WP CLI is defined before extending (#23207)

* Ensure there is a check before extending a WP CLI class
Automattic · Mar 2, 2022 · a6b7c0b · a6b7c0b
1 parent c698649
commit a6b7c0b
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 2 deletions.
diff --git a/projects/packages/search/changelog/update-cli-classes b/projects/packages/search/changelog/update-cli-classes
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Ensure that WP CLI is present before extending the class.
diff --git a/projects/packages/search/package.json b/projects/packages/search/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "jetpack-search",
-	"version": "0.10.0",
+	"version": "0.10.1-alpha",
 	"description": "Package for Jetpack Search products",
 	"main": "main.js",
 	"directories": {

diff --git a/projects/packages/search/search.php b/projects/packages/search/search.php
@@ -7,7 +7,7 @@
 
 namespace Automattic\Jetpack\Search;
 
-define( 'JETPACK_SEARCH_PKG__VERSION', '0.10.0' );
+define( 'JETPACK_SEARCH_PKG__VERSION', '0.10.1-alpha' );
 define( 'JETPACK_SEARCH_PKG__DIR', __DIR__ . '/' );
 define( 'JETPACK_SEARCH_PKG__SLUG', 'search' );
 

diff --git a/projects/packages/search/src/class-cli.php b/projects/packages/search/src/class-cli.php
@@ -11,6 +11,10 @@
 use \WP_CLI_Command;
 use \WP_Error;
 
+if ( ! class_exists( 'WP_CLI_Command' ) ) {
+	return;
+}
+
 /**
  * Provide functionality by WPCLI.
  */

diff --git a/projects/plugins/beta/changelog/update-cli-classes b/projects/plugins/beta/changelog/update-cli-classes
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Ensure that WP CLI is present before extending the class.
diff --git a/projects/plugins/beta/src/class-clicommand.php b/projects/plugins/beta/src/class-clicommand.php
@@ -10,6 +10,10 @@
 use WP_CLI;
 use WP_CLI_Command;
 
+if ( ! class_exists( 'WP_CLI_Command' ) ) {
+	return;
+}
+
 /**
  * Control your local Jetpack Beta Tester plugin.
  */

diff --git a/projects/plugins/jetpack/changelog/update-cli-classes b/projects/plugins/jetpack/changelog/update-cli-classes
@@ -0,0 +1,4 @@
+Significance: patch
+Type: compat
+
+Ensure WP CLI is present before extending the class.
diff --git a/projects/plugins/jetpack/class.jetpack-cli.php b/projects/plugins/jetpack/class.jetpack-cli.php
@@ -16,6 +16,10 @@
 use Automattic\Jetpack\Sync\Queue;
 use Automattic\Jetpack\Sync\Settings;
 
+if ( ! class_exists( 'WP_CLI_Command' ) ) {
+	return;
+}
+
 WP_CLI::add_command( 'jetpack', 'Jetpack_CLI' );
 
 /**