Merge branch 'trunk' into fix/1347-check-if-exists-before-activating

packages/playground/blueprints/src/lib/steps/activate-plugin.ts

@@ -44,12 +44,11 @@ require_once( ${phpVar(docroot)}. "/wp-admin/includes/plugin.php" );
 wp_set_current_user( get_users(array('role' => 'Administrator') )[0]->ID );
 
 			$plugin_path = ${phpVar(pluginPath)};
-			$response = null;
+			$response = false;
 			if (!is_dir($plugin_path)) {
 				$response = activate_plugin($plugin_path);
-			}
-
-			if (is_null($response)) {
+			} else {
+				// A plugin name was provided instead of a path
 				foreach ( ( glob( $plugin_path . '/*.php' ) ?: array() ) as $file ) {
 					$info = get_plugin_data( $file, false, false );
 					if ( ! empty( $info['Name'] ) ) {
@@ -59,7 +58,9 @@ wp_set_current_user( get_users(array('role' => 'Administrator') )[0]->ID );
 				}
 			}
 
-			if ( is_wp_error( $response ) || is_null( $response ) ) {
+			if (  false === $response ) {
+				throw new Exception( 'Plugin not found' );
+			}else if ( is_wp_error( $response ) ) {
 				throw new Exception( $response->get_error_message() );
 			}