← All changes | class.jetpack-cli.php +128 -92 13.0.2 → 16.0 View file →

		@@ -9,8 +9,10 @@
9	9	use Automattic\Jetpack\Connection\Manager as Connection_Manager;
10	10	use Automattic\Jetpack\Connection\Tokens;
11	11	use Automattic\Jetpack\Identity_Crisis;
12	12	use Automattic\Jetpack\IP\Utils as IP_Utils;
	13	+use Automattic\Jetpack\Publicize\Connections;
	14	+use Automattic\Jetpack\Publicize\Publicize;
13	15	use Automattic\Jetpack\Status;
14	16	use Automattic\Jetpack\Sync\Actions;
15	17	use Automattic\Jetpack\Sync\Listener;
16	18	use Automattic\Jetpack\Sync\Modules;
		@@ -84,9 +86,9 @@
84	86	}
85	87
86	88	$master_user_email = Jetpack::get_master_user_email();
87	89
88		- $cxntests = new Jetpack_Cxn_Tests();
	90	+ $cxntests = new Automattic\Jetpack\Connection\Connection_Health_Tests();
89	91
90	92	if ( $cxntests->pass() ) {
91	93	$cxntests->output_results_for_cli();
92	94
		@@ -229,9 +231,9 @@
229	231	WP_CLI::success( __( 'The site is not currently connected, so nothing to do!', 'jetpack' ) );
230	232	return;
231	233	}
232	234
233		- $action = isset( $args[0] ) ? $args[0] : 'prompt';
	235	+ $action = $args[0] ?? 'prompt';
234	236	if ( ! in_array( $action, array( 'blog', 'user', 'prompt' ), true ) ) {
235	237	/* translators: %s is a command like "prompt" */
236	238	WP_CLI::error( sprintf( __( '%s is not a valid command.', 'jetpack' ), $action ) );
237	239	}
		@@ -323,9 +325,9 @@
323	325	* @param array $args Positional args.
324	326	* @param array $assoc_args Named args.
325	327	*/
326	328	public function reset( $args, $assoc_args ) {
327		- $action = isset( $args[0] ) ? $args[0] : 'prompt';
	329	+ $action = $args[0] ?? 'prompt';
328	330	if ( ! in_array( $action, array( 'options', 'modules', 'sync-checksum' ), true ) ) {
329	331	/* translators: %s is a command like "prompt" */
330	332	WP_CLI::error( sprintf( __( '%s is not a valid command.', 'jetpack' ), $action ) );
331	333	}
		@@ -544,9 +546,9 @@
544	546	* @param array $assoc_args Named args.
545	547	*/
546	548	public function module( $args, $assoc_args ) {
547	549	$module_slug = null;
548		- $action = isset( $args[0] ) ? $args[0] : 'list';
	550	+ $action = $args[0] ?? 'list';
549	551
550	552	if ( isset( $args[1] ) ) {
551	553	$module_slug = $args[1];
552	554	if ( 'all' !== $module_slug && ! Jetpack::is_module( $module_slug ) ) {
		@@ -637,9 +639,9 @@
637	639	*
638	640	* @param array $args Positional args.
639	641	*/
640	642	public function protect( $args ) {
641		- $action = isset( $args[0] ) ? $args[0] : 'prompt';
	643	+ $action = $args[0] ?? 'prompt';
642	644	if ( ! in_array( $action, array( 'whitelist', 'allow' ), true ) ) { // Still allow "whitelist" for legacy support.
643	645	/* translators: %s is a command like "prompt" */
644	646	WP_CLI::error( sprintf( __( '%s is not a valid command.', 'jetpack' ), $action ) );
645	647	}
		@@ -766,9 +768,9 @@
766	768	*
767	769	* @param array $args Positional args.
768	770	*/
769	771	public function options( $args ) {
770		- $action = isset( $args[0] ) ? $args[0] : 'list';
	772	+ $action = $args[0] ?? 'list';
771	773	$safe_to_modify = Jetpack_Options::get_options_for_reset();
772	774
773	775	// Is the option flagged as unsafe?
774	776	$flagged = ! in_array( $args[1], $safe_to_modify, true );
		@@ -892,9 +894,9 @@
892	894	* @param array $assoc_args Named args.
893	895	*/
894	896	public function sync( $args, $assoc_args ) {
895	897
896		- $action = isset( $args[0] ) ? $args[0] : 'status';
	898	+ $action = $args[0] ?? 'status';
897	899
898	900	switch ( $action ) {
899	901	case 'status':
900	902	$status = Actions::get_sync_status();
		@@ -901,9 +903,9 @@
901	903	$collection = array();
902	904	foreach ( $status as $key => $item ) {
903	905	$collection[] = array(
904	906	'option' => $key,
905		- 'value' => is_scalar( $item ) ? $item : wp_json_encode( $item ),
	907	+ 'value' => is_scalar( $item ) ? $item : wp_json_encode( $item, JSON_UNESCAPED_SLASHES ),
906	908	);
907	909	}
908	910	WP_CLI::log( __( 'Sync Status:', 'jetpack' ) );
909	911	WP_CLI\Utils\format_items( 'table', $collection, array( 'option', 'value' ) );
		@@ -913,9 +915,9 @@
913	915	$settings = array();
914	916	foreach ( Settings::get_settings() as $setting => $item ) {
915	917	$settings[] = array(
916	918	'setting' => $setting,
917		- 'value' => is_scalar( $item ) ? $item : wp_json_encode( $item ),
	919	+ 'value' => is_scalar( $item ) ? $item : wp_json_encode( $item, JSON_UNESCAPED_SLASHES ),
918	920	);
919	921	}
920	922	WP_CLI\Utils\format_items( 'table', $settings, array( 'setting', 'value' ) );
921	923	break;
		@@ -983,10 +985,10 @@
983	985	if ( $status->is_offline_mode() ) {
984	986	WP_CLI::error( __( 'Jetpack sync is not currently allowed for this site. The site is in offline mode.', 'jetpack' ) );
985	987	return;
986	988	}
987		- if ( $status->is_staging_site() ) {
988		- WP_CLI::error( __( 'Jetpack sync is not currently allowed for this site. The site is in staging mode.', 'jetpack' ) );
	989	+ if ( $status->in_safe_mode() ) {
	990	+ WP_CLI::error( __( 'Jetpack sync is not currently allowed for this site. The site is in safe mode.', 'jetpack' ) );
989	991	return;
990	992	}
991	993	}
992	994	// Get the original settings so that we can restore them later.
		@@ -1033,11 +1035,11 @@
1033	1035	$modules = null;
1034	1036	}
1035	1037
1036	1038	// Kick off a full sync.
1037		- if ( Actions::do_full_sync( $modules ) ) {
	1039	+ if ( Actions::do_full_sync( $modules, 'jetpack_cli' ) ) {
1038	1040	if ( $modules ) {
1039		- /* translators: %s is a comma separated list of Jetpack modules */
	1041	+ /* translators: %s is a comma-separated list of Jetpack modules */
1040	1042	WP_CLI::log( sprintf( __( 'Initialized a new full sync with modules: %s', 'jetpack' ), implode( ', ', array_keys( $modules ) ) ) );
1041	1043	} else {
1042	1044	WP_CLI::log( __( 'Initialized a new full sync', 'jetpack' ) );
1043	1045	}
		@@ -1046,9 +1048,9 @@
1046	1048	// Reset sync settings to original.
1047	1049	Settings::update_settings( $original_settings );
1048	1050
1049	1051	if ( $modules ) {
1050		- /* translators: %s is a comma separated list of Jetpack modules */
	1052	+ /* translators: %s is a comma-separated list of Jetpack modules */
1051	1053	WP_CLI::error( sprintf( __( 'Could not start a new full sync with modules: %s', 'jetpack' ), implode( ', ', $modules ) ) );
1052	1054	} else {
1053	1055	WP_CLI::error( __( 'Could not start a new full sync', 'jetpack' ) );
1054	1056	}
		@@ -1071,9 +1073,9 @@
1071	1073	WP_CLI::log( __( 'Sent more data to WordPress.com', 'jetpack' ) );
1072	1074	}
1073	1075
1074	1076	// Immediate Full Sync does not wait for WP.com to process data so we need to enforce a wait.
1075		- if ( str_contains( get_class( Modules::get_module( 'full-sync' ) ), 'Full_Sync_Immediately' ) ) {
	1077	+ if ( Modules::get_module( 'full-sync' ) instanceof \Automattic\Jetpack\Sync\Modules\Full_Sync_Immediately ) {
1076	1078	sleep( 15 );
1077	1079	}
1078	1080	}
1079	1081	++$i;
		@@ -1106,10 +1108,10 @@
1106	1108	if ( ! Actions::sync_allowed() ) {
1107	1109	WP_CLI::error( __( 'Jetpack sync is not currently allowed for this site.', 'jetpack' ) );
1108	1110	}
1109	1111
1110		- $queue_name = isset( $args[0] ) ? $args[0] : 'sync';
1111		- $action = isset( $args[1] ) ? $args[1] : 'peek';
	1112	+ $queue_name = $args[0] ?? 'sync';
	1113	+ $action = $args[1] ?? 'peek';
1112	1114
1113	1115	// We map the queue name that way we can support more friendly queue names in the commands, but still use
1114	1116	// the queue name that the code expects.
1115	1117	$allowed_queues = array(
		@@ -1116,9 +1118,9 @@
1116	1118	'incremental' => 'sync',
1117	1119	'full' => 'full_sync',
1118	1120	);
1119	1121	$queue_name_map = $allowed_queues;
1120		- $mapped_queue_name = isset( $queue_name_map[ $queue_name ] ) ? $queue_name_map[ $queue_name ] : $queue_name;
	1122	+ $mapped_queue_name = $queue_name_map[ $queue_name ] ?? $queue_name;
1121	1123
1122	1124	switch ( $action ) {
1123	1125	case 'peek':
1124	1126	$queue = new Queue( $mapped_queue_name );
		@@ -1131,9 +1133,9 @@
1131	1133	$collection = array();
1132	1134	foreach ( $items as $item ) {
1133	1135	$collection[] = array(
1134	1136	'action' => $item[0],
1135		- 'args' => wp_json_encode( $item[1] ),
	1137	+ 'args' => wp_json_encode( $item[1], JSON_UNESCAPED_SLASHES ),
1136	1138	'current_user_id' => $item[2],
1137	1139	'microtime' => $item[3],
1138	1140	'importing' => (string) $item[4],
1139	1141	);
		@@ -1189,9 +1191,9 @@
1189	1191	if ( Identity_Crisis::validate_sync_error_idc_option() ) {
1190	1192	$this->partner_provision_error(
1191	1193	new WP_Error(
1192	1194	'site_in_safe_mode',
1193		- esc_html__( 'Can not cancel a plan while in safe mode. See: https://jetpack.com/support/safe-mode/', 'jetpack' )
	1195	+ esc_html__( 'Cannot cancel a plan while in safe mode. See: https://jetpack.com/support/safe-mode/', 'jetpack' )
1194	1196	)
1195	1197	);
1196	1198	}
1197	1199
		@@ -1215,12 +1217,11 @@
1215	1217	if ( ! empty( $named_args ) && ! empty( $named_args['partner_tracking_id'] ) ) {
1216	1218	$url = esc_url_raw( add_query_arg( 'partner_tracking_id', $named_args['partner_tracking_id'], $url ) );
1217	1219	}
1218	1220
	1221	+ // @phan-suppress-next-line PhanAccessMethodInternal -- Phan is correct, but the usage is intentional.
1219	1222	$result = Client::_wp_remote_request( $url, $request );
1220	1223
1221		- Jetpack_Options::delete_option( 'onboarding' );
1222		-
1223	1224	if ( is_wp_error( $result ) ) {
1224	1225	$this->partner_provision_error( $result );
1225	1226	}
1226	1227
		@@ -1241,10 +1242,8 @@
1241	1242	* [--wpcom_user_id=<user_id>]
1242	1243	* : WordPress.com ID of user to connect as (must be whitelisted against partner key)
1243	1244	* [--wpcom_user_email=<wpcom_user_email>]
1244	1245	* : Override the email we send to WordPress.com for registration
1245		- * [--onboarding=<onboarding>]
1246		- * : Guide the user through an onboarding wizard
1247	1246	* [--force_register=<register>]
1248	1247	* : Whether to force a site to register
1249	1248	* [--force_connect=<force_connect>]
1250	1249	* : Force JPS to not reuse existing credentials
		@@ -1259,9 +1258,9 @@
1259	1258	*
1260	1259	* $ wp jetpack partner_provision '{ some: "json" }' premium 1
1261	1260	* { success: true }
1262	1261	*
1263		- * @synopsis <token_json> [--wpcom_user_id=<user_id>] [--plan=<plan_name>] [--onboarding=<onboarding>] [--force_register=<register>] [--force_connect=<force_connect>] [--home_url=<home_url>] [--site_url=<site_url>] [--wpcom_user_email=<wpcom_user_email>] [--partner_tracking_id=<partner_tracking_id>]
	1262	+ * @synopsis <token_json> [--wpcom_user_id=<user_id>] [--plan=<plan_name>] [--force_register=<register>] [--force_connect=<force_connect>] [--home_url=<home_url>] [--site_url=<site_url>] [--wpcom_user_email=<wpcom_user_email>] [--partner_tracking_id=<partner_tracking_id>]
1264	1263	*
1265	1264	* @param array $args Positional args.
1266	1265	* @param array $named_args Named args.
1267	1266	*/
		@@ -1274,11 +1273,9 @@
1274	1273	$this->partner_provision_error( new WP_Error( 'missing_access_token', sprintf( __( 'Invalid token JSON: %s', 'jetpack' ), $token_json ) ) );
1275	1274	}
1276	1275
1277	1276	if ( isset( $token->error ) ) {
1278		- $message = isset( $token->message )
1279		- ? $token->message
1280		- : '';
	1277	+ $message = $token->message ?? '';
1281	1278	$this->partner_provision_error( new WP_Error( $token->error, $message ) );
1282	1279	}
1283	1280
1284	1281	if ( ! isset( $token->access_token ) ) {
		@@ -1295,15 +1292,16 @@
1295	1292	array(
1296	1293	'success' => false,
1297	1294	'error_code' => $body_json->get_error_code(),
1298	1295	'error_message' => $body_json->get_error_message(),
1299		- )
	1296	+ ),
	1297	+ JSON_UNESCAPED_SLASHES
1300	1298	)
1301	1299	);
1302	1300	exit( 1 );
1303	1301	}
1304	1302
1305		- WP_CLI::log( wp_json_encode( $body_json ) );
	1303	+ WP_CLI::log( wp_json_encode( $body_json, JSON_UNESCAPED_SLASHES ) );
1306	1304	}
1307	1305
1308	1306	/**
1309	1307	* Manages your Jetpack sitemap
		@@ -1311,23 +1309,23 @@
1311	1309	* ## OPTIONS
1312	1310	*
1313	1311	* rebuild : Rebuild all sitemaps
1314	1312	* --purge : if set, will remove all existing sitemap data before rebuilding
	1313	+ * --monitor : if set, will output elapsed time, peak memory usage, CPU time (user/system), and average CPU utilization
	1314	+ * --suspend-cache-addition : if set, will suspend cache additions during sitemap generation
1315	1315	*
1316	1316	* ## EXAMPLES
1317	1317	*
1318	1318	* wp jetpack sitemap rebuild
	1319	+ * wp jetpack sitemap rebuild --monitor
1319	1320	*
1320	1321	* @subcommand sitemap
1321		- * @synopsis <rebuild> [--purge]
	1322	+ * @synopsis <rebuild> [--purge] [--monitor] [--suspend-cache-addition]
1322	1323	*
1323	1324	* @param array $args Positional args.
1324	1325	* @param array $assoc_args Named args.
1325	1326	*/
1326	1327	public function sitemap( $args, $assoc_args ) {
1327		- if ( ! Jetpack::is_connection_ready() ) {
1328		- WP_CLI::error( __( 'Jetpack is not currently connected to WordPress.com', 'jetpack' ) );
1329		- }
1330	1328	if ( ! Jetpack::is_module_active( 'sitemaps' ) ) {
1331	1329	WP_CLI::error( __( 'Jetpack Sitemaps module is not currently active. Activate it first if you want to work with sitemaps.', 'jetpack' ) );
1332	1330	}
1333	1331	if ( ! class_exists( 'Jetpack_Sitemap_Builder' ) ) {
		@@ -1333,15 +1331,65 @@
1333	1331	if ( ! class_exists( 'Jetpack_Sitemap_Builder' ) ) {
1334	1332	WP_CLI::error( __( 'Jetpack Sitemaps module is active, but unavailable. This can happen if your site is set to discourage search engine indexing. Please enable search engine indexing to allow sitemap generation.', 'jetpack' ) );
1335	1333	}
1336	1334
	1335	+ if ( isset( $assoc_args['suspend-cache-addition'] ) && $assoc_args['suspend-cache-addition'] ) {
	1336	+ add_filter( 'jetpack_sitemap_suspend_cache_addition', '__return_true' );
	1337	+ WP_CLI::success( 'Suspending cache addition.' );
	1338	+ }
	1339	+
	1340	+ $monitor = isset( $assoc_args['monitor'] ) && $assoc_args['monitor'];
	1341	+
	1342	+ if ( $monitor ) {
	1343	+ $start_time = microtime( true );
	1344	+ $rusage_start = function_exists( 'getrusage' ) ? getrusage() : null;
	1345	+ }
	1346	+
1337	1347	if ( isset( $assoc_args['purge'] ) && $assoc_args['purge'] ) {
1338	1348	$librarian = new Jetpack_Sitemap_Librarian();
1339	1349	$librarian->delete_all_stored_sitemap_data();
	1350	+
	1351	+ // Clear sitemap-related transients
	1352	+ delete_transient( 'jetpack_news_sitemap_xml' );
	1353	+ delete_transient( 'jetpack-sitemap-state-lock' );
	1354	+ WP_CLI::success( __( 'Purged all sitemap data and cleared sitemap transients.', 'jetpack' ) );
1340	1355	}
1341	1356
1342	1357	$sitemap_builder = new Jetpack_Sitemap_Builder();
1343	1358	$sitemap_builder->update_sitemap();
	1359	+
	1360	+ WP_CLI::success( __( 'Sitemap rebuilt successfully.', 'jetpack' ) );
	1361	+
	1362	+ if ( $monitor && isset( $start_time ) ) {
	1363	+ $end_time = microtime( true );
	1364	+ $peak_memory = memory_get_peak_usage();
	1365	+ $elapsed_time = $end_time - $start_time;
	1366	+ $rusage_end = function_exists( 'getrusage' ) ? getrusage() : null;
	1367	+
	1368	+ WP_CLI::log( '----------------------------------' );
	1369	+ WP_CLI::log( __( 'Performance Metrics:', 'jetpack' ) );
	1370	+ /* translators: %s is a float representing seconds */
	1371	+ WP_CLI::log( sprintf( __( 'Elapsed Time: %.4f seconds', 'jetpack' ), $elapsed_time ) );
	1372	+ /* translators: %s is a human-readable memory size (e.g., 128MB) */
	1373	+ WP_CLI::log( sprintf( __( 'Peak Memory Usage: %s', 'jetpack' ), size_format( $peak_memory ) ) );
	1374	+
	1375	+ if ( ! empty( $rusage_start ) && ! empty( $rusage_end ) ) {
	1376	+ $user_cpu_time = ( $rusage_end['ru_utime.tv_sec'] * 1e6 + $rusage_end['ru_utime.tv_usec'] ) - ( $rusage_start['ru_utime.tv_sec'] * 1e6 + $rusage_start['ru_utime.tv_usec'] );
	1377	+ $system_cpu_time = ( $rusage_end['ru_stime.tv_sec'] * 1e6 + $rusage_end['ru_stime.tv_usec'] ) - ( $rusage_start['ru_stime.tv_sec'] * 1e6 + $rusage_start['ru_stime.tv_usec'] );
	1378	+
	1379	+ /* translators: %d is an integer representing microseconds */
	1380	+ WP_CLI::log( sprintf( __( 'CPU time (user): %d microseconds', 'jetpack' ), $user_cpu_time ) );
	1381	+ /* translators: %d is an integer representing microseconds */
	1382	+ WP_CLI::log( sprintf( __( 'CPU time (system): %d microseconds', 'jetpack' ), $system_cpu_time ) );
	1383	+
	1384	+ // Average CPU utilization over the elapsed wall time.
	1385	+ $total_cpu_sec = ( $user_cpu_time + $system_cpu_time ) / 1e6;
	1386	+ $avg_cpu_pct = $elapsed_time > 0 ? ( $total_cpu_sec / $elapsed_time ) * 100 : 0.0;
	1387	+ /* translators: %s is a percentage like 83.4 */
	1388	+ WP_CLI::log( sprintf( __( 'Average CPU Utilization: %.1f%%', 'jetpack' ), $avg_cpu_pct ) );
	1389	+ }
	1390	+ WP_CLI::log( '----------------------------------' );
	1391	+ }
1344	1392	}
1345	1393
1346	1394	/**
1347	1395	* Allows authorizing a user via the command line and will activate
		@@ -1368,9 +1416,9 @@
1368	1416	$current_user_id = get_current_user_id();
1369	1417
1370	1418	( new Tokens() )->update_user_token( $current_user_id, sprintf( '%s.%d', $named_args['token'], $current_user_id ), $is_connection_owner );
1371	1419
1372		- WP_CLI::log( wp_json_encode( $named_args ) );
	1420	+ WP_CLI::log( wp_json_encode( $named_args, JSON_UNESCAPED_SLASHES ) );
1373	1421
1374	1422	if ( $is_connection_owner ) {
1375	1423	/**
1376	1424	* Auto-enable SSO module for new Jetpack Start connections
		@@ -1483,9 +1531,9 @@
1483	1531	$output = wp_remote_retrieve_body( $response );
1484	1532	if ( isset( $named_args['pretty'] ) ) {
1485	1533	$decoded_output = json_decode( $output );
1486	1534	if ( $decoded_output ) {
1487		- $output = wp_json_encode( $decoded_output, JSON_PRETTY_PRINT );
	1535	+ $output = wp_json_encode( $decoded_output, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT );
1488	1536	}
1489	1537	}
1490	1538
1491	1539	if ( isset( $named_args['strip-success'] ) ) {
		@@ -1571,9 +1619,9 @@
1571	1619	array(
1572	1620	'resource' => '/activity-log/%d/update-credentials',
1573	1621	'method' => 'POST',
1574	1622	'api_version' => '1.1',
1575		- 'body' => wp_json_encode( $values ),
	1623	+ 'body' => wp_json_encode( $values, JSON_UNESCAPED_SLASHES ),
1576	1624	'timeout' => 30,
1577	1625	),
1578	1626	$named_args
1579	1627	);
		@@ -1670,8 +1718,11 @@
1670	1718	*
1671	1719	* [<identifier>]
1672	1720	* : The connection ID or service to perform an action on.
1673	1721	*
	1722	+ * [--ignore-cache]
	1723	+ * : Whether to ignore connections cache.
	1724	+ *
1674	1725	* [--format=<format>]
1675	1726	* : Allows overriding the output of the command when listing connections.
1676	1727	* ---
1677	1728	* default: table
		@@ -1688,8 +1739,11 @@
1688	1739	*
1689	1740	* # List all publicize connections.
1690	1741	* $ wp jetpack publicize list
1691	1742	*
	1743	+ * # List all publicize connections, ignoring the cache.
	1744	+ * $ wp jetpack publicize list --ignore-cache
	1745	+ *
1692	1746	* # List publicize connections for a given service.
1693	1747	* $ wp jetpack publicize list linkedin
1694	1748	*
1695	1749	* # List all publicize connections for a given user.
		@@ -1724,9 +1778,8 @@
1724	1778
1725	1779	if ( ( new Status() )->is_offline_mode() ) {
1726	1780	if (
1727	1781	! defined( 'JETPACK_DEV_DEBUG' ) &&
1728		- ! has_filter( 'jetpack_development_mode' ) &&
1729	1782	! has_filter( 'jetpack_offline_mode' ) &&
1730	1783	! str_contains( site_url(), '.' )
1731	1784	) {
1732	1785	WP_CLI::error( __( "Jetpack is current in offline mode because the site url does not contain a '.', which often occurs when dynamically setting the WP_SITEURL constant. While in offline mode, the Jetpack Social module will not load.", 'jetpack' ) );
		@@ -1734,9 +1787,9 @@
1734	1787
1735	1788	WP_CLI::error( __( 'Jetpack is currently in offline mode, so the Jetpack Social module will not load.', 'jetpack' ) );
1736	1789	}
1737	1790
1738		- if ( ! class_exists( 'Publicize' ) ) {
	1791	+ if ( ! class_exists( Publicize::class ) ) {
1739	1792	WP_CLI::error( __( 'The Jetpack Social module is not loaded.', 'jetpack' ) );
1740	1793	}
1741	1794
1742	1795	$action = $args[0];
		@@ -1746,30 +1799,23 @@
1746	1799	$id_is_service = in_array( $identifier, $services, true );
1747	1800
1748	1801	switch ( $action ) {
1749	1802	case 'list':
1750		- $connections_to_return = array();
1751		-
	1803	+ $_args = array(
	1804	+ 'ignore_cache' => $named_args['ignore-cache'] ?? false,
	1805	+ );
1752	1806	// For the CLI command, let's return all connections when a user isn't specified. This
1753	1807	// differs from the logic in the Publicize class.
1754		- $option_connections = is_user_logged_in()
1755		- ? (array) $publicize->get_all_connections_for_user()
1756		- : (array) $publicize->get_all_connections();
	1808	+ $connections_to_return = is_user_logged_in()
	1809	+ ? Connections::get_all_for_user( $_args )
	1810	+ : Connections::get_all( $_args );
1757	1811
1758		- foreach ( $option_connections as $service_name => $connections ) {
1759		- foreach ( (array) $connections as $id => $connection ) {
1760		- $connection['id'] = $id;
1761		- $connection['service'] = $service_name;
1762		- $connections_to_return[] = $connection;
1763		- }
1764		- }
1765		-
1766	1812	if ( $id_is_service && ! empty( $identifier ) && ! empty( $connections_to_return ) ) {
1767	1813	$temp_connections = $connections_to_return;
1768	1814	$connections_to_return = array();
1769	1815
1770	1816	foreach ( $temp_connections as $connection ) {
1771		- if ( $identifier === $connection['service'] ) {
	1817	+ if ( $identifier === $connection['service_name'] ) {
1772	1818	$connections_to_return[] = $connection;
1773	1819	}
1774	1820	}
1775	1821	}
		@@ -1774,27 +1820,22 @@
1774	1820	}
1775	1821	}
1776	1822
1777	1823	if ( $identifier && ! $id_is_service && ! empty( $connections_to_return ) ) {
1778		- $connections_to_return = wp_list_filter( $connections_to_return, array( 'id' => $identifier ) );
	1824	+ $connections_to_return = wp_list_filter( $connections_to_return, array( 'connection_id' => $identifier ) );
1779	1825	}
1780	1826
1781	1827	$expected_keys = array(
1782		- 'id',
1783		- 'service',
1784		- 'user_id',
1785		- 'provider',
1786		- 'issued',
1787		- 'expires',
	1828	+ 'connection_id',
	1829	+ 'service_name',
	1830	+ 'display_name',
1788	1831	'external_id',
1789		- 'external_name',
1790		- 'external_display',
1791		- 'type',
1792		- 'connection_data',
	1832	+ 'wpcom_user_id',
	1833	+ 'shared',
1793	1834	);
1794	1835
1795	1836	// Somehow, a test site ended up in a state where $connections_to_return looked like:
1796		- // array( array( array( 'id' => 0, 'service' => 0 ) ) ) // phpcs:ignore Squiz.PHP.CommentedOutCode.Found
	1837	+ // array( array( array( 'id' => 0, 'service' => 0 ) ) )
1797	1838	// This caused the CLI command to error when running WP_CLI\Utils\format_items() below. So
1798	1839	// to minimize future issues, this nested loop will remove any connections that don't contain
1799	1840	// any keys that we expect.
1800	1841	foreach ( (array) $connections_to_return as $connection_key => $connection ) {
		@@ -1828,23 +1869,15 @@
1828	1869	}
1829	1870
1830	1871	jetpack_cli_are_you_sure();
1831	1872
1832		- $connections = array();
1833	1873	$service = $identifier;
	1874	+ $connections = is_user_logged_in()
	1875	+ ? Connections::get_all_for_user()
	1876	+ : Connections::get_all();
1834	1877
1835		- $option_connections = is_user_logged_in()
1836		- ? (array) $publicize->get_all_connections_for_user()
1837		- : (array) $publicize->get_all_connections();
1838		-
1839		- if ( 'all' === $service ) {
1840		- foreach ( (array) $option_connections as $service_name => $service_connections ) {
1841		- foreach ( $service_connections as $id => $connection ) {
1842		- $connections[ $id ] = $connection;
1843		- }
1844		- }
1845		- } elseif ( ! empty( $option_connections[ $service ] ) ) {
1846		- $connections = $option_connections[ $service ];
	1878	+ if ( 'all' !== $service ) {
	1879	+ $connections = wp_list_filter( $connections, array( 'service_name' => $service ) );
1847	1880	}
1848	1881
1849	1882	if ( ! empty( $connections ) ) {
1850	1883	$count = is_countable( $connections ) ? count( $connections ) : 0;
		@@ -1853,9 +1886,10 @@
1853	1886	sprintf( __( 'Disconnecting all connections to %s.', 'jetpack' ), $service ),
1854	1887	$count
1855	1888	);
1856	1889
1857		- foreach ( $connections as $id => $connection ) {
	1890	+ foreach ( $connections as $connection ) {
	1891	+ $id = $connection['connection_id'];
1858	1892	if ( false === $publicize->disconnect( false, $id ) ) {
1859	1893	WP_CLI::error(
1860	1894	sprintf(
1861	1895	/* translators: %1$d is a numeric ID and %2$s is a lowercase string for a social network. */
		@@ -1864,11 +1898,13 @@
1864	1898	)
1865	1899	);
1866	1900	}
1867	1901
	1902	+ // @phan-suppress-next-line PhanUndeclaredClassMethod - Class is missing from php-stubs/wp-cli-stubs 🤷
1868	1903	$progress->tick();
1869	1904	}
1870	1905
	1906	+ // @phan-suppress-next-line PhanUndeclaredClassMethod - Class is missing from php-stubs/wp-cli-stubs 🤷
1871	1907	$progress->finish();
1872	1908
1873	1909	if ( 'all' === $service ) {
1874	1910	WP_CLI::success( __( 'All Jetpack Social connections were successfully disconnected.', 'jetpack' ) );
		@@ -1873,9 +1909,9 @@
1873	1909	if ( 'all' === $service ) {
1874	1910	WP_CLI::success( __( 'All Jetpack Social connections were successfully disconnected.', 'jetpack' ) );
1875	1911	} else {
1876	1912	/* translators: %s is a lowercase string for a social network. */
1877		- WP_CLI::success( __( 'All Jetpack Social connections to %s were successfully disconnected.', 'jetpack' ), $service );
	1913	+ WP_CLI::success( sprintf( __( 'All Jetpack Social connections to %s were successfully disconnected.', 'jetpack' ), $service ) );
1878	1914	}
1879	1915	}
1880	1916	} elseif ( false !== $publicize->disconnect( false, $identifier ) ) {
1881	1917	/* translators: %d is a numeric ID. Example: 1234. */
		@@ -1901,8 +1937,9 @@
1901	1937	/**
1902	1938	* Log and exit on a partner provision error.
1903	1939	*
1904	1940	* @param WP_Error $error Error.
	1941	+ * @return never
1905	1942	*/
1906	1943	private function partner_provision_error( $error ) {
1907	1944	WP_CLI::log(
1908	1945	wp_json_encode(
		@@ -1909,9 +1946,10 @@
1909	1946	array(
1910	1947	'success' => false,
1911	1948	'error_code' => $error->get_error_code(),
1912	1949	'error_message' => $error->get_error_message(),
1913		- )
	1950	+ ),
	1951	+ JSON_UNESCAPED_SLASHES
1914	1952	)
1915	1953	);
1916	1954	exit( 1 );
1917	1955	}
		@@ -1964,19 +2002,17 @@
1964	2002	* @param array $args Positional parameters. Only one is used, that corresponds to the block title.
1965	2003	* @param array $assoc_args Associative parameters defined in the scaffold() method.
1966	2004	*/
1967	2005	public function block( $args, $assoc_args ) {
1968		- if ( isset( $args[1] ) ) {
1969		- $title = ucwords( $args[1] );
1970		- } else {
	2006	+ if ( ! isset( $args[1] ) ) {
1971	2007	WP_CLI::error( esc_html__( 'The title parameter is required.', 'jetpack' ) . ' 👻' );
1972	2008	exit( 1 );
1973	2009	}
1974	2010
1975		- $slug = isset( $assoc_args['slug'] )
1976		- ? $assoc_args['slug']
1977		- : sanitize_title( $title );
	2011	+ $title = ucwords( $args[1] );
1978	2012
	2013	+ $slug = $assoc_args['slug'] ?? sanitize_title( $title );
	2014	+
1979	2015	$next_version = "\x24\x24next-version$$"; // Escapes to hide the string from tools/replace-next-version-tag.sh
1980	2016
1981	2017	$variation_options = array( 'production', 'experimental', 'beta' );
1982	2018	$variation = ( isset( $assoc_args['variation'] ) && in_array( $assoc_args['variation'], $variation_options, true ) )
		@@ -2019,14 +2055,14 @@
2019	2055	"$path/block.json" => self::render_block_file(
2020	2056	'block-block-json',
2021	2057	array(
2022	2058	'slug' => $slug,
2023		- 'title' => wp_json_encode( $title, JSON_UNESCAPED_UNICODE ),
	2059	+ 'title' => wp_json_encode( $title, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE ),
2024	2060	'description' => isset( $assoc_args['description'] )
2025		- ? wp_json_encode( $assoc_args['description'], JSON_UNESCAPED_UNICODE )
2026		- : wp_json_encode( $title, JSON_UNESCAPED_UNICODE ),
	2061	+ ? wp_json_encode( $assoc_args['description'], JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE )
	2062	+ : wp_json_encode( $title, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE ),
2027	2063	'nextVersion' => $next_version,
2028		- 'keywords' => wp_json_encode( $keywords, JSON_UNESCAPED_UNICODE ),
	2064	+ 'keywords' => wp_json_encode( $keywords, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE ),
2029	2065	)
2030	2066	),
2031	2067	"$path/$slug.php" => self::render_block_file(
2032	2068	'block-register-php',
		@@ -2077,9 +2113,9 @@
2077	2113	$new_block_list = json_decode( $block_list );
2078	2114	$new_block_list->{ $variation }[] = $slug;
2079	2115
2080	2116	// Format the JSON to match our coding standards.
2081		- $new_block_list_formatted = wp_json_encode( $new_block_list, JSON_PRETTY_PRINT ) . "\n";
	2117	+ $new_block_list_formatted = wp_json_encode( $new_block_list, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT ) . "\n";
2082	2118	$new_block_list_formatted = preg_replace_callback(
2083	2119	// Find all occurrences of multiples of 4 spaces a the start of the line.
2084	2120	'/^((?: )+)/m',
2085	2121	function ( $matches ) {