| @@ -9,8 +9,9 @@ | ||
| 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; | |
| 13 | 14 | use Automattic\Jetpack\Publicize\Publicize; |
| 14 | 15 | use Automattic\Jetpack\Status; |
| 15 | 16 | use Automattic\Jetpack\Sync\Actions; |
| 16 | 17 | use Automattic\Jetpack\Sync\Listener; |
| @@ -22,9 +23,8 @@ | ||
| 22 | 23 | if ( ! class_exists( 'WP_CLI_Command' ) ) { |
| 23 | 24 | return; |
| 24 | 25 | } |
| 25 | 26 | |
| 26 | -// @phan-suppress-next-line PhanUndeclaredFunctionInCallable -- https://github.com/phan/phan/issues/4763 | |
| 27 | 27 | WP_CLI::add_command( 'jetpack', 'Jetpack_CLI' ); |
| 28 | 28 | |
| 29 | 29 | /** |
| 30 | 30 | * Control your local Jetpack installation. |
| @@ -86,9 +86,9 @@ | ||
| 86 | 86 | } |
| 87 | 87 | |
| 88 | 88 | $master_user_email = Jetpack::get_master_user_email(); |
| 89 | 89 | |
| 90 | - $cxntests = new Jetpack_Cxn_Tests(); | |
| 90 | + $cxntests = new Automattic\Jetpack\Connection\Connection_Health_Tests(); | |
| 91 | 91 | |
| 92 | 92 | if ( $cxntests->pass() ) { |
| 93 | 93 | $cxntests->output_results_for_cli(); |
| 94 | 94 | |
| @@ -231,9 +231,9 @@ | ||
| 231 | 231 | WP_CLI::success( __( 'The site is not currently connected, so nothing to do!', 'jetpack' ) ); |
| 232 | 232 | return; |
| 233 | 233 | } |
| 234 | 234 | |
| 235 | - $action = isset( $args[0] ) ? $args[0] : 'prompt'; | |
| 235 | + $action = $args[0] ?? 'prompt'; | |
| 236 | 236 | if ( ! in_array( $action, array( 'blog', 'user', 'prompt' ), true ) ) { |
| 237 | 237 | /* translators: %s is a command like "prompt" */ |
| 238 | 238 | WP_CLI::error( sprintf( __( '%s is not a valid command.', 'jetpack' ), $action ) ); |
| 239 | 239 | } |
| @@ -325,9 +325,9 @@ | ||
| 325 | 325 | * @param array $args Positional args. |
| 326 | 326 | * @param array $assoc_args Named args. |
| 327 | 327 | */ |
| 328 | 328 | public function reset( $args, $assoc_args ) { |
| 329 | - $action = isset( $args[0] ) ? $args[0] : 'prompt'; | |
| 329 | + $action = $args[0] ?? 'prompt'; | |
| 330 | 330 | if ( ! in_array( $action, array( 'options', 'modules', 'sync-checksum' ), true ) ) { |
| 331 | 331 | /* translators: %s is a command like "prompt" */ |
| 332 | 332 | WP_CLI::error( sprintf( __( '%s is not a valid command.', 'jetpack' ), $action ) ); |
| 333 | 333 | } |
| @@ -546,9 +546,9 @@ | ||
| 546 | 546 | * @param array $assoc_args Named args. |
| 547 | 547 | */ |
| 548 | 548 | public function module( $args, $assoc_args ) { |
| 549 | 549 | $module_slug = null; |
| 550 | - $action = isset( $args[0] ) ? $args[0] : 'list'; | |
| 550 | + $action = $args[0] ?? 'list'; | |
| 551 | 551 | |
| 552 | 552 | if ( isset( $args[1] ) ) { |
| 553 | 553 | $module_slug = $args[1]; |
| 554 | 554 | if ( 'all' !== $module_slug && ! Jetpack::is_module( $module_slug ) ) { |
| @@ -591,8 +591,12 @@ | ||
| 591 | 591 | case 'activate': |
| 592 | 592 | $module = Jetpack::get_module( $module_slug ); |
| 593 | 593 | Jetpack::log( 'activate', $module_slug ); |
| 594 | 594 | if ( Jetpack::activate_module( $module_slug, false, false ) ) { |
| 595 | + if ( ! Jetpack::is_module_active( $module_slug ) ) { | |
| 596 | + /* translators: %s is the name of a Jetpack module */ | |
| 597 | + WP_CLI::error( sprintf( __( '%s is disabled by your host or site administrator, so it stays off.', 'jetpack' ), $module['name'] ) ); | |
| 598 | + } | |
| 595 | 599 | /* translators: %s is the name of a Jetpack module */ |
| 596 | 600 | WP_CLI::success( sprintf( __( '%s has been activated.', 'jetpack' ), $module['name'] ) ); |
| 597 | 601 | } else { |
| 598 | 602 | /* translators: %s is the name of a Jetpack module */ |
| @@ -607,8 +611,12 @@ | ||
| 607 | 611 | case 'deactivate': |
| 608 | 612 | $module = Jetpack::get_module( $module_slug ); |
| 609 | 613 | Jetpack::log( 'deactivate', $module_slug ); |
| 610 | 614 | Jetpack::deactivate_module( $module_slug ); |
| 615 | + if ( Jetpack::is_module_active( $module_slug ) ) { | |
| 616 | + /* translators: %s is the name of a Jetpack module */ | |
| 617 | + WP_CLI::error( sprintf( __( '%s is enabled by your host or site administrator, so it stays on.', 'jetpack' ), $module['name'] ) ); | |
| 618 | + } | |
| 611 | 619 | /* translators: %s is the name of a Jetpack module */ |
| 612 | 620 | WP_CLI::success( sprintf( __( '%s has been deactivated.', 'jetpack' ), $module['name'] ) ); |
| 613 | 621 | break; |
| 614 | 622 | case 'deactivate_all': |
| @@ -639,9 +647,9 @@ | ||
| 639 | 647 | * |
| 640 | 648 | * @param array $args Positional args. |
| 641 | 649 | */ |
| 642 | 650 | public function protect( $args ) { |
| 643 | - $action = isset( $args[0] ) ? $args[0] : 'prompt'; | |
| 651 | + $action = $args[0] ?? 'prompt'; | |
| 644 | 652 | if ( ! in_array( $action, array( 'whitelist', 'allow' ), true ) ) { // Still allow "whitelist" for legacy support. |
| 645 | 653 | /* translators: %s is a command like "prompt" */ |
| 646 | 654 | WP_CLI::error( sprintf( __( '%s is not a valid command.', 'jetpack' ), $action ) ); |
| 647 | 655 | } |
| @@ -768,9 +776,9 @@ | ||
| 768 | 776 | * |
| 769 | 777 | * @param array $args Positional args. |
| 770 | 778 | */ |
| 771 | 779 | public function options( $args ) { |
| 772 | - $action = isset( $args[0] ) ? $args[0] : 'list'; | |
| 780 | + $action = $args[0] ?? 'list'; | |
| 773 | 781 | $safe_to_modify = Jetpack_Options::get_options_for_reset(); |
| 774 | 782 | |
| 775 | 783 | // Is the option flagged as unsafe? |
| 776 | 784 | $flagged = ! in_array( $args[1], $safe_to_modify, true ); |
| @@ -894,9 +902,9 @@ | ||
| 894 | 902 | * @param array $assoc_args Named args. |
| 895 | 903 | */ |
| 896 | 904 | public function sync( $args, $assoc_args ) { |
| 897 | 905 | |
| 898 | - $action = isset( $args[0] ) ? $args[0] : 'status'; | |
| 906 | + $action = $args[0] ?? 'status'; | |
| 899 | 907 | |
| 900 | 908 | switch ( $action ) { |
| 901 | 909 | case 'status': |
| 902 | 910 | $status = Actions::get_sync_status(); |
| @@ -903,9 +911,9 @@ | ||
| 903 | 911 | $collection = array(); |
| 904 | 912 | foreach ( $status as $key => $item ) { |
| 905 | 913 | $collection[] = array( |
| 906 | 914 | 'option' => $key, |
| 907 | - 'value' => is_scalar( $item ) ? $item : wp_json_encode( $item ), | |
| 915 | + 'value' => is_scalar( $item ) ? $item : wp_json_encode( $item, JSON_UNESCAPED_SLASHES ), | |
| 908 | 916 | ); |
| 909 | 917 | } |
| 910 | 918 | WP_CLI::log( __( 'Sync Status:', 'jetpack' ) ); |
| 911 | 919 | WP_CLI\Utils\format_items( 'table', $collection, array( 'option', 'value' ) ); |
| @@ -915,9 +923,9 @@ | ||
| 915 | 923 | $settings = array(); |
| 916 | 924 | foreach ( Settings::get_settings() as $setting => $item ) { |
| 917 | 925 | $settings[] = array( |
| 918 | 926 | 'setting' => $setting, |
| 919 | - 'value' => is_scalar( $item ) ? $item : wp_json_encode( $item ), | |
| 927 | + 'value' => is_scalar( $item ) ? $item : wp_json_encode( $item, JSON_UNESCAPED_SLASHES ), | |
| 920 | 928 | ); |
| 921 | 929 | } |
| 922 | 930 | WP_CLI\Utils\format_items( 'table', $settings, array( 'setting', 'value' ) ); |
| 923 | 931 | break; |
| @@ -1035,11 +1043,11 @@ | ||
| 1035 | 1043 | $modules = null; |
| 1036 | 1044 | } |
| 1037 | 1045 | |
| 1038 | 1046 | // Kick off a full sync. |
| 1039 | - if ( Actions::do_full_sync( $modules ) ) { | |
| 1047 | + if ( Actions::do_full_sync( $modules, 'jetpack_cli' ) ) { | |
| 1040 | 1048 | if ( $modules ) { |
| 1041 | - /* translators: %s is a comma separated list of Jetpack modules */ | |
| 1049 | + /* translators: %s is a comma-separated list of Jetpack modules */ | |
| 1042 | 1050 | WP_CLI::log( sprintf( __( 'Initialized a new full sync with modules: %s', 'jetpack' ), implode( ', ', array_keys( $modules ) ) ) ); |
| 1043 | 1051 | } else { |
| 1044 | 1052 | WP_CLI::log( __( 'Initialized a new full sync', 'jetpack' ) ); |
| 1045 | 1053 | } |
| @@ -1048,9 +1056,9 @@ | ||
| 1048 | 1056 | // Reset sync settings to original. |
| 1049 | 1057 | Settings::update_settings( $original_settings ); |
| 1050 | 1058 | |
| 1051 | 1059 | if ( $modules ) { |
| 1052 | - /* translators: %s is a comma separated list of Jetpack modules */ | |
| 1060 | + /* translators: %s is a comma-separated list of Jetpack modules */ | |
| 1053 | 1061 | WP_CLI::error( sprintf( __( 'Could not start a new full sync with modules: %s', 'jetpack' ), implode( ', ', $modules ) ) ); |
| 1054 | 1062 | } else { |
| 1055 | 1063 | WP_CLI::error( __( 'Could not start a new full sync', 'jetpack' ) ); |
| 1056 | 1064 | } |
| @@ -1108,10 +1116,10 @@ | ||
| 1108 | 1116 | if ( ! Actions::sync_allowed() ) { |
| 1109 | 1117 | WP_CLI::error( __( 'Jetpack sync is not currently allowed for this site.', 'jetpack' ) ); |
| 1110 | 1118 | } |
| 1111 | 1119 | |
| 1112 | - $queue_name = isset( $args[0] ) ? $args[0] : 'sync'; | |
| 1113 | - $action = isset( $args[1] ) ? $args[1] : 'peek'; | |
| 1120 | + $queue_name = $args[0] ?? 'sync'; | |
| 1121 | + $action = $args[1] ?? 'peek'; | |
| 1114 | 1122 | |
| 1115 | 1123 | // We map the queue name that way we can support more friendly queue names in the commands, but still use |
| 1116 | 1124 | // the queue name that the code expects. |
| 1117 | 1125 | $allowed_queues = array( |
| @@ -1118,9 +1126,9 @@ | ||
| 1118 | 1126 | 'incremental' => 'sync', |
| 1119 | 1127 | 'full' => 'full_sync', |
| 1120 | 1128 | ); |
| 1121 | 1129 | $queue_name_map = $allowed_queues; |
| 1122 | - $mapped_queue_name = isset( $queue_name_map[ $queue_name ] ) ? $queue_name_map[ $queue_name ] : $queue_name; | |
| 1130 | + $mapped_queue_name = $queue_name_map[ $queue_name ] ?? $queue_name; | |
| 1123 | 1131 | |
| 1124 | 1132 | switch ( $action ) { |
| 1125 | 1133 | case 'peek': |
| 1126 | 1134 | $queue = new Queue( $mapped_queue_name ); |
| @@ -1133,9 +1141,9 @@ | ||
| 1133 | 1141 | $collection = array(); |
| 1134 | 1142 | foreach ( $items as $item ) { |
| 1135 | 1143 | $collection[] = array( |
| 1136 | 1144 | 'action' => $item[0], |
| 1137 | - 'args' => wp_json_encode( $item[1] ), | |
| 1145 | + 'args' => wp_json_encode( $item[1], JSON_UNESCAPED_SLASHES ), | |
| 1138 | 1146 | 'current_user_id' => $item[2], |
| 1139 | 1147 | 'microtime' => $item[3], |
| 1140 | 1148 | 'importing' => (string) $item[4], |
| 1141 | 1149 | ); |
| @@ -1191,9 +1199,9 @@ | ||
| 1191 | 1199 | if ( Identity_Crisis::validate_sync_error_idc_option() ) { |
| 1192 | 1200 | $this->partner_provision_error( |
| 1193 | 1201 | new WP_Error( |
| 1194 | 1202 | 'site_in_safe_mode', |
| 1195 | - esc_html__( 'Can not cancel a plan while in safe mode. See: https://jetpack.com/support/safe-mode/', 'jetpack' ) | |
| 1203 | + esc_html__( 'Cannot cancel a plan while in safe mode. See: https://jetpack.com/support/safe-mode/', 'jetpack' ) | |
| 1196 | 1204 | ) |
| 1197 | 1205 | ); |
| 1198 | 1206 | } |
| 1199 | 1207 | |
| @@ -1217,12 +1225,11 @@ | ||
| 1217 | 1225 | if ( ! empty( $named_args ) && ! empty( $named_args['partner_tracking_id'] ) ) { |
| 1218 | 1226 | $url = esc_url_raw( add_query_arg( 'partner_tracking_id', $named_args['partner_tracking_id'], $url ) ); |
| 1219 | 1227 | } |
| 1220 | 1228 | |
| 1229 | + // @phan-suppress-next-line PhanAccessMethodInternal -- Phan is correct, but the usage is intentional. | |
| 1221 | 1230 | $result = Client::_wp_remote_request( $url, $request ); |
| 1222 | 1231 | |
| 1223 | - Jetpack_Options::delete_option( 'onboarding' ); | |
| 1224 | - | |
| 1225 | 1232 | if ( is_wp_error( $result ) ) { |
| 1226 | 1233 | $this->partner_provision_error( $result ); |
| 1227 | 1234 | } |
| 1228 | 1235 | |
| @@ -1243,10 +1250,8 @@ | ||
| 1243 | 1250 | * [--wpcom_user_id=<user_id>] |
| 1244 | 1251 | * : WordPress.com ID of user to connect as (must be whitelisted against partner key) |
| 1245 | 1252 | * [--wpcom_user_email=<wpcom_user_email>] |
| 1246 | 1253 | * : Override the email we send to WordPress.com for registration |
| 1247 | - * [--onboarding=<onboarding>] | |
| 1248 | - * : Guide the user through an onboarding wizard | |
| 1249 | 1254 | * [--force_register=<register>] |
| 1250 | 1255 | * : Whether to force a site to register |
| 1251 | 1256 | * [--force_connect=<force_connect>] |
| 1252 | 1257 | * : Force JPS to not reuse existing credentials |
| @@ -1261,9 +1266,9 @@ | ||
| 1261 | 1266 | * |
| 1262 | 1267 | * $ wp jetpack partner_provision '{ some: "json" }' premium 1 |
| 1263 | 1268 | * { success: true } |
| 1264 | 1269 | * |
| 1265 | - * @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>] | |
| 1270 | + * @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>] | |
| 1266 | 1271 | * |
| 1267 | 1272 | * @param array $args Positional args. |
| 1268 | 1273 | * @param array $named_args Named args. |
| 1269 | 1274 | */ |
| @@ -1276,11 +1281,9 @@ | ||
| 1276 | 1281 | $this->partner_provision_error( new WP_Error( 'missing_access_token', sprintf( __( 'Invalid token JSON: %s', 'jetpack' ), $token_json ) ) ); |
| 1277 | 1282 | } |
| 1278 | 1283 | |
| 1279 | 1284 | if ( isset( $token->error ) ) { |
| 1280 | - $message = isset( $token->message ) | |
| 1281 | - ? $token->message | |
| 1282 | - : ''; | |
| 1285 | + $message = $token->message ?? ''; | |
| 1283 | 1286 | $this->partner_provision_error( new WP_Error( $token->error, $message ) ); |
| 1284 | 1287 | } |
| 1285 | 1288 | |
| 1286 | 1289 | if ( ! isset( $token->access_token ) ) { |
| @@ -1297,15 +1300,16 @@ | ||
| 1297 | 1300 | array( |
| 1298 | 1301 | 'success' => false, |
| 1299 | 1302 | 'error_code' => $body_json->get_error_code(), |
| 1300 | 1303 | 'error_message' => $body_json->get_error_message(), |
| 1301 | - ) | |
| 1304 | + ), | |
| 1305 | + JSON_UNESCAPED_SLASHES | |
| 1302 | 1306 | ) |
| 1303 | 1307 | ); |
| 1304 | 1308 | exit( 1 ); |
| 1305 | 1309 | } |
| 1306 | 1310 | |
| 1307 | - WP_CLI::log( wp_json_encode( $body_json ) ); | |
| 1311 | + WP_CLI::log( wp_json_encode( $body_json, JSON_UNESCAPED_SLASHES ) ); | |
| 1308 | 1312 | } |
| 1309 | 1313 | |
| 1310 | 1314 | /** |
| 1311 | 1315 | * Manages your Jetpack sitemap |
| @@ -1313,23 +1317,23 @@ | ||
| 1313 | 1317 | * ## OPTIONS |
| 1314 | 1318 | * |
| 1315 | 1319 | * rebuild : Rebuild all sitemaps |
| 1316 | 1320 | * --purge : if set, will remove all existing sitemap data before rebuilding |
| 1321 | + * --monitor : if set, will output elapsed time, peak memory usage, CPU time (user/system), and average CPU utilization | |
| 1322 | + * --suspend-cache-addition : if set, will suspend cache additions during sitemap generation | |
| 1317 | 1323 | * |
| 1318 | 1324 | * ## EXAMPLES |
| 1319 | 1325 | * |
| 1320 | 1326 | * wp jetpack sitemap rebuild |
| 1327 | + * wp jetpack sitemap rebuild --monitor | |
| 1321 | 1328 | * |
| 1322 | 1329 | * @subcommand sitemap |
| 1323 | - * @synopsis <rebuild> [--purge] | |
| 1330 | + * @synopsis <rebuild> [--purge] [--monitor] [--suspend-cache-addition] | |
| 1324 | 1331 | * |
| 1325 | 1332 | * @param array $args Positional args. |
| 1326 | 1333 | * @param array $assoc_args Named args. |
| 1327 | 1334 | */ |
| 1328 | 1335 | public function sitemap( $args, $assoc_args ) { |
| 1329 | - if ( ! Jetpack::is_connection_ready() ) { | |
| 1330 | - WP_CLI::error( __( 'Jetpack is not currently connected to WordPress.com', 'jetpack' ) ); | |
| 1331 | - } | |
| 1332 | 1336 | if ( ! Jetpack::is_module_active( 'sitemaps' ) ) { |
| 1333 | 1337 | WP_CLI::error( __( 'Jetpack Sitemaps module is not currently active. Activate it first if you want to work with sitemaps.', 'jetpack' ) ); |
| 1334 | 1338 | } |
| 1335 | 1339 | if ( ! class_exists( 'Jetpack_Sitemap_Builder' ) ) { |
| @@ -1335,15 +1339,65 @@ | ||
| 1335 | 1339 | if ( ! class_exists( 'Jetpack_Sitemap_Builder' ) ) { |
| 1336 | 1340 | 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' ) ); |
| 1337 | 1341 | } |
| 1338 | 1342 | |
| 1343 | + if ( isset( $assoc_args['suspend-cache-addition'] ) && $assoc_args['suspend-cache-addition'] ) { | |
| 1344 | + add_filter( 'jetpack_sitemap_suspend_cache_addition', '__return_true' ); | |
| 1345 | + WP_CLI::success( 'Suspending cache addition.' ); | |
| 1346 | + } | |
| 1347 | + | |
| 1348 | + $monitor = isset( $assoc_args['monitor'] ) && $assoc_args['monitor']; | |
| 1349 | + | |
| 1350 | + if ( $monitor ) { | |
| 1351 | + $start_time = microtime( true ); | |
| 1352 | + $rusage_start = function_exists( 'getrusage' ) ? getrusage() : null; | |
| 1353 | + } | |
| 1354 | + | |
| 1339 | 1355 | if ( isset( $assoc_args['purge'] ) && $assoc_args['purge'] ) { |
| 1340 | 1356 | $librarian = new Jetpack_Sitemap_Librarian(); |
| 1341 | 1357 | $librarian->delete_all_stored_sitemap_data(); |
| 1358 | + | |
| 1359 | + // Clear sitemap-related transients | |
| 1360 | + delete_transient( 'jetpack_news_sitemap_xml' ); | |
| 1361 | + delete_transient( 'jetpack-sitemap-state-lock' ); | |
| 1362 | + WP_CLI::success( __( 'Purged all sitemap data and cleared sitemap transients.', 'jetpack' ) ); | |
| 1342 | 1363 | } |
| 1343 | 1364 | |
| 1344 | 1365 | $sitemap_builder = new Jetpack_Sitemap_Builder(); |
| 1345 | 1366 | $sitemap_builder->update_sitemap(); |
| 1367 | + | |
| 1368 | + WP_CLI::success( __( 'Sitemap rebuilt successfully.', 'jetpack' ) ); | |
| 1369 | + | |
| 1370 | + if ( $monitor && isset( $start_time ) ) { | |
| 1371 | + $end_time = microtime( true ); | |
| 1372 | + $peak_memory = memory_get_peak_usage(); | |
| 1373 | + $elapsed_time = $end_time - $start_time; | |
| 1374 | + $rusage_end = function_exists( 'getrusage' ) ? getrusage() : null; | |
| 1375 | + | |
| 1376 | + WP_CLI::log( '----------------------------------' ); | |
| 1377 | + WP_CLI::log( __( 'Performance Metrics:', 'jetpack' ) ); | |
| 1378 | + /* translators: %s is a float representing seconds */ | |
| 1379 | + WP_CLI::log( sprintf( __( 'Elapsed Time: %.4f seconds', 'jetpack' ), $elapsed_time ) ); | |
| 1380 | + /* translators: %s is a human-readable memory size (e.g., 128MB) */ | |
| 1381 | + WP_CLI::log( sprintf( __( 'Peak Memory Usage: %s', 'jetpack' ), size_format( $peak_memory ) ) ); | |
| 1382 | + | |
| 1383 | + if ( ! empty( $rusage_start ) && ! empty( $rusage_end ) ) { | |
| 1384 | + $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'] ); | |
| 1385 | + $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'] ); | |
| 1386 | + | |
| 1387 | + /* translators: %d is an integer representing microseconds */ | |
| 1388 | + WP_CLI::log( sprintf( __( 'CPU time (user): %d microseconds', 'jetpack' ), $user_cpu_time ) ); | |
| 1389 | + /* translators: %d is an integer representing microseconds */ | |
| 1390 | + WP_CLI::log( sprintf( __( 'CPU time (system): %d microseconds', 'jetpack' ), $system_cpu_time ) ); | |
| 1391 | + | |
| 1392 | + // Average CPU utilization over the elapsed wall time. | |
| 1393 | + $total_cpu_sec = ( $user_cpu_time + $system_cpu_time ) / 1e6; | |
| 1394 | + $avg_cpu_pct = $elapsed_time > 0 ? ( $total_cpu_sec / $elapsed_time ) * 100 : 0.0; | |
| 1395 | + /* translators: %s is a percentage like 83.4 */ | |
| 1396 | + WP_CLI::log( sprintf( __( 'Average CPU Utilization: %.1f%%', 'jetpack' ), $avg_cpu_pct ) ); | |
| 1397 | + } | |
| 1398 | + WP_CLI::log( '----------------------------------' ); | |
| 1399 | + } | |
| 1346 | 1400 | } |
| 1347 | 1401 | |
| 1348 | 1402 | /** |
| 1349 | 1403 | * Allows authorizing a user via the command line and will activate |
| @@ -1370,9 +1424,9 @@ | ||
| 1370 | 1424 | $current_user_id = get_current_user_id(); |
| 1371 | 1425 | |
| 1372 | 1426 | ( new Tokens() )->update_user_token( $current_user_id, sprintf( '%s.%d', $named_args['token'], $current_user_id ), $is_connection_owner ); |
| 1373 | 1427 | |
| 1374 | - WP_CLI::log( wp_json_encode( $named_args ) ); | |
| 1428 | + WP_CLI::log( wp_json_encode( $named_args, JSON_UNESCAPED_SLASHES ) ); | |
| 1375 | 1429 | |
| 1376 | 1430 | if ( $is_connection_owner ) { |
| 1377 | 1431 | /** |
| 1378 | 1432 | * Auto-enable SSO module for new Jetpack Start connections |
| @@ -1485,9 +1539,9 @@ | ||
| 1485 | 1539 | $output = wp_remote_retrieve_body( $response ); |
| 1486 | 1540 | if ( isset( $named_args['pretty'] ) ) { |
| 1487 | 1541 | $decoded_output = json_decode( $output ); |
| 1488 | 1542 | if ( $decoded_output ) { |
| 1489 | - $output = wp_json_encode( $decoded_output, JSON_PRETTY_PRINT ); | |
| 1543 | + $output = wp_json_encode( $decoded_output, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT ); | |
| 1490 | 1544 | } |
| 1491 | 1545 | } |
| 1492 | 1546 | |
| 1493 | 1547 | if ( isset( $named_args['strip-success'] ) ) { |
| @@ -1573,9 +1627,9 @@ | ||
| 1573 | 1627 | array( |
| 1574 | 1628 | 'resource' => '/activity-log/%d/update-credentials', |
| 1575 | 1629 | 'method' => 'POST', |
| 1576 | 1630 | 'api_version' => '1.1', |
| 1577 | - 'body' => wp_json_encode( $values ), | |
| 1631 | + 'body' => wp_json_encode( $values, JSON_UNESCAPED_SLASHES ), | |
| 1578 | 1632 | 'timeout' => 30, |
| 1579 | 1633 | ), |
| 1580 | 1634 | $named_args |
| 1581 | 1635 | ); |
| @@ -1672,8 +1726,11 @@ | ||
| 1672 | 1726 | * |
| 1673 | 1727 | * [<identifier>] |
| 1674 | 1728 | * : The connection ID or service to perform an action on. |
| 1675 | 1729 | * |
| 1730 | + * [--ignore-cache] | |
| 1731 | + * : Whether to ignore connections cache. | |
| 1732 | + * | |
| 1676 | 1733 | * [--format=<format>] |
| 1677 | 1734 | * : Allows overriding the output of the command when listing connections. |
| 1678 | 1735 | * --- |
| 1679 | 1736 | * default: table |
| @@ -1690,8 +1747,11 @@ | ||
| 1690 | 1747 | * |
| 1691 | 1748 | * # List all publicize connections. |
| 1692 | 1749 | * $ wp jetpack publicize list |
| 1693 | 1750 | * |
| 1751 | + * # List all publicize connections, ignoring the cache. | |
| 1752 | + * $ wp jetpack publicize list --ignore-cache | |
| 1753 | + * | |
| 1694 | 1754 | * # List publicize connections for a given service. |
| 1695 | 1755 | * $ wp jetpack publicize list linkedin |
| 1696 | 1756 | * |
| 1697 | 1757 | * # List all publicize connections for a given user. |
| @@ -1726,9 +1786,8 @@ | ||
| 1726 | 1786 | |
| 1727 | 1787 | if ( ( new Status() )->is_offline_mode() ) { |
| 1728 | 1788 | if ( |
| 1729 | 1789 | ! defined( 'JETPACK_DEV_DEBUG' ) && |
| 1730 | - ! has_filter( 'jetpack_development_mode' ) && | |
| 1731 | 1790 | ! has_filter( 'jetpack_offline_mode' ) && |
| 1732 | 1791 | ! str_contains( site_url(), '.' ) |
| 1733 | 1792 | ) { |
| 1734 | 1793 | 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' ) ); |
| @@ -1748,30 +1807,23 @@ | ||
| 1748 | 1807 | $id_is_service = in_array( $identifier, $services, true ); |
| 1749 | 1808 | |
| 1750 | 1809 | switch ( $action ) { |
| 1751 | 1810 | case 'list': |
| 1752 | - $connections_to_return = array(); | |
| 1753 | - | |
| 1811 | + $_args = array( | |
| 1812 | + 'ignore_cache' => $named_args['ignore-cache'] ?? false, | |
| 1813 | + ); | |
| 1754 | 1814 | // For the CLI command, let's return all connections when a user isn't specified. This |
| 1755 | 1815 | // differs from the logic in the Publicize class. |
| 1756 | - $option_connections = is_user_logged_in() | |
| 1757 | - ? (array) $publicize->get_all_connections_for_user() | |
| 1758 | - : (array) $publicize->get_all_connections(); | |
| 1816 | + $connections_to_return = is_user_logged_in() | |
| 1817 | + ? Connections::get_all_for_user( $_args ) | |
| 1818 | + : Connections::get_all( $_args ); | |
| 1759 | 1819 | |
| 1760 | - foreach ( $option_connections as $service_name => $connections ) { | |
| 1761 | - foreach ( (array) $connections as $id => $connection ) { | |
| 1762 | - $connection['id'] = $id; | |
| 1763 | - $connection['service'] = $service_name; | |
| 1764 | - $connections_to_return[] = $connection; | |
| 1765 | - } | |
| 1766 | - } | |
| 1767 | - | |
| 1768 | 1820 | if ( $id_is_service && ! empty( $identifier ) && ! empty( $connections_to_return ) ) { |
| 1769 | 1821 | $temp_connections = $connections_to_return; |
| 1770 | 1822 | $connections_to_return = array(); |
| 1771 | 1823 | |
| 1772 | 1824 | foreach ( $temp_connections as $connection ) { |
| 1773 | - if ( $identifier === $connection['service'] ) { | |
| 1825 | + if ( $identifier === $connection['service_name'] ) { | |
| 1774 | 1826 | $connections_to_return[] = $connection; |
| 1775 | 1827 | } |
| 1776 | 1828 | } |
| 1777 | 1829 | } |
| @@ -1776,27 +1828,22 @@ | ||
| 1776 | 1828 | } |
| 1777 | 1829 | } |
| 1778 | 1830 | |
| 1779 | 1831 | if ( $identifier && ! $id_is_service && ! empty( $connections_to_return ) ) { |
| 1780 | - $connections_to_return = wp_list_filter( $connections_to_return, array( 'id' => $identifier ) ); | |
| 1832 | + $connections_to_return = wp_list_filter( $connections_to_return, array( 'connection_id' => $identifier ) ); | |
| 1781 | 1833 | } |
| 1782 | 1834 | |
| 1783 | 1835 | $expected_keys = array( |
| 1784 | - 'id', | |
| 1785 | - 'service', | |
| 1786 | - 'user_id', | |
| 1787 | - 'provider', | |
| 1788 | - 'issued', | |
| 1789 | - 'expires', | |
| 1836 | + 'connection_id', | |
| 1837 | + 'service_name', | |
| 1838 | + 'display_name', | |
| 1790 | 1839 | 'external_id', |
| 1791 | - 'external_name', | |
| 1792 | - 'external_display', | |
| 1793 | - 'type', | |
| 1794 | - 'connection_data', | |
| 1840 | + 'wpcom_user_id', | |
| 1841 | + 'shared', | |
| 1795 | 1842 | ); |
| 1796 | 1843 | |
| 1797 | 1844 | // Somehow, a test site ended up in a state where $connections_to_return looked like: |
| 1798 | - // array( array( array( 'id' => 0, 'service' => 0 ) ) ) // phpcs:ignore Squiz.PHP.CommentedOutCode.Found | |
| 1845 | + // array( array( array( 'id' => 0, 'service' => 0 ) ) ) | |
| 1799 | 1846 | // This caused the CLI command to error when running WP_CLI\Utils\format_items() below. So |
| 1800 | 1847 | // to minimize future issues, this nested loop will remove any connections that don't contain |
| 1801 | 1848 | // any keys that we expect. |
| 1802 | 1849 | foreach ( (array) $connections_to_return as $connection_key => $connection ) { |
| @@ -1830,23 +1877,15 @@ | ||
| 1830 | 1877 | } |
| 1831 | 1878 | |
| 1832 | 1879 | jetpack_cli_are_you_sure(); |
| 1833 | 1880 | |
| 1834 | - $connections = array(); | |
| 1835 | 1881 | $service = $identifier; |
| 1882 | + $connections = is_user_logged_in() | |
| 1883 | + ? Connections::get_all_for_user() | |
| 1884 | + : Connections::get_all(); | |
| 1836 | 1885 | |
| 1837 | - $option_connections = is_user_logged_in() | |
| 1838 | - ? (array) $publicize->get_all_connections_for_user() | |
| 1839 | - : (array) $publicize->get_all_connections(); | |
| 1840 | - | |
| 1841 | - if ( 'all' === $service ) { | |
| 1842 | - foreach ( (array) $option_connections as $service_name => $service_connections ) { | |
| 1843 | - foreach ( $service_connections as $id => $connection ) { | |
| 1844 | - $connections[ $id ] = $connection; | |
| 1845 | - } | |
| 1846 | - } | |
| 1847 | - } elseif ( ! empty( $option_connections[ $service ] ) ) { | |
| 1848 | - $connections = $option_connections[ $service ]; | |
| 1886 | + if ( 'all' !== $service ) { | |
| 1887 | + $connections = wp_list_filter( $connections, array( 'service_name' => $service ) ); | |
| 1849 | 1888 | } |
| 1850 | 1889 | |
| 1851 | 1890 | if ( ! empty( $connections ) ) { |
| 1852 | 1891 | $count = is_countable( $connections ) ? count( $connections ) : 0; |
| @@ -1855,9 +1894,10 @@ | ||
| 1855 | 1894 | sprintf( __( 'Disconnecting all connections to %s.', 'jetpack' ), $service ), |
| 1856 | 1895 | $count |
| 1857 | 1896 | ); |
| 1858 | 1897 | |
| 1859 | - foreach ( $connections as $id => $connection ) { | |
| 1898 | + foreach ( $connections as $connection ) { | |
| 1899 | + $id = $connection['connection_id']; | |
| 1860 | 1900 | if ( false === $publicize->disconnect( false, $id ) ) { |
| 1861 | 1901 | WP_CLI::error( |
| 1862 | 1902 | sprintf( |
| 1863 | 1903 | /* translators: %1$d is a numeric ID and %2$s is a lowercase string for a social network. */ |
| @@ -1877,9 +1917,9 @@ | ||
| 1877 | 1917 | if ( 'all' === $service ) { |
| 1878 | 1918 | WP_CLI::success( __( 'All Jetpack Social connections were successfully disconnected.', 'jetpack' ) ); |
| 1879 | 1919 | } else { |
| 1880 | 1920 | /* translators: %s is a lowercase string for a social network. */ |
| 1881 | - WP_CLI::success( __( 'All Jetpack Social connections to %s were successfully disconnected.', 'jetpack' ), $service ); | |
| 1921 | + WP_CLI::success( sprintf( __( 'All Jetpack Social connections to %s were successfully disconnected.', 'jetpack' ), $service ) ); | |
| 1882 | 1922 | } |
| 1883 | 1923 | } |
| 1884 | 1924 | } elseif ( false !== $publicize->disconnect( false, $identifier ) ) { |
| 1885 | 1925 | /* translators: %d is a numeric ID. Example: 1234. */ |
| @@ -1914,9 +1954,10 @@ | ||
| 1914 | 1954 | array( |
| 1915 | 1955 | 'success' => false, |
| 1916 | 1956 | 'error_code' => $error->get_error_code(), |
| 1917 | 1957 | 'error_message' => $error->get_error_message(), |
| 1918 | - ) | |
| 1958 | + ), | |
| 1959 | + JSON_UNESCAPED_SLASHES | |
| 1919 | 1960 | ) |
| 1920 | 1961 | ); |
| 1921 | 1962 | exit( 1 ); |
| 1922 | 1963 | } |
| @@ -1969,19 +2010,17 @@ | ||
| 1969 | 2010 | * @param array $args Positional parameters. Only one is used, that corresponds to the block title. |
| 1970 | 2011 | * @param array $assoc_args Associative parameters defined in the scaffold() method. |
| 1971 | 2012 | */ |
| 1972 | 2013 | public function block( $args, $assoc_args ) { |
| 1973 | - if ( isset( $args[1] ) ) { | |
| 1974 | - $title = ucwords( $args[1] ); | |
| 1975 | - } else { | |
| 2014 | + if ( ! isset( $args[1] ) ) { | |
| 1976 | 2015 | WP_CLI::error( esc_html__( 'The title parameter is required.', 'jetpack' ) . ' 👻' ); |
| 1977 | 2016 | exit( 1 ); |
| 1978 | 2017 | } |
| 1979 | 2018 | |
| 1980 | - $slug = isset( $assoc_args['slug'] ) | |
| 1981 | - ? $assoc_args['slug'] | |
| 1982 | - : sanitize_title( $title ); | |
| 2019 | + $title = ucwords( $args[1] ); | |
| 1983 | 2020 | |
| 2021 | + $slug = $assoc_args['slug'] ?? sanitize_title( $title ); | |
| 2022 | + | |
| 1984 | 2023 | $next_version = "\x24\x24next-version$$"; // Escapes to hide the string from tools/replace-next-version-tag.sh |
| 1985 | 2024 | |
| 1986 | 2025 | $variation_options = array( 'production', 'experimental', 'beta' ); |
| 1987 | 2026 | $variation = ( isset( $assoc_args['variation'] ) && in_array( $assoc_args['variation'], $variation_options, true ) ) |
| @@ -2024,14 +2063,14 @@ | ||
| 2024 | 2063 | "$path/block.json" => self::render_block_file( |
| 2025 | 2064 | 'block-block-json', |
| 2026 | 2065 | array( |
| 2027 | 2066 | 'slug' => $slug, |
| 2028 | - 'title' => wp_json_encode( $title, JSON_UNESCAPED_UNICODE ), | |
| 2067 | + 'title' => wp_json_encode( $title, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE ), | |
| 2029 | 2068 | 'description' => isset( $assoc_args['description'] ) |
| 2030 | - ? wp_json_encode( $assoc_args['description'], JSON_UNESCAPED_UNICODE ) | |
| 2031 | - : wp_json_encode( $title, JSON_UNESCAPED_UNICODE ), | |
| 2069 | + ? wp_json_encode( $assoc_args['description'], JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE ) | |
| 2070 | + : wp_json_encode( $title, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE ), | |
| 2032 | 2071 | 'nextVersion' => $next_version, |
| 2033 | - 'keywords' => wp_json_encode( $keywords, JSON_UNESCAPED_UNICODE ), | |
| 2072 | + 'keywords' => wp_json_encode( $keywords, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE ), | |
| 2034 | 2073 | ) |
| 2035 | 2074 | ), |
| 2036 | 2075 | "$path/$slug.php" => self::render_block_file( |
| 2037 | 2076 | 'block-register-php', |
| @@ -2082,9 +2121,9 @@ | ||
| 2082 | 2121 | $new_block_list = json_decode( $block_list ); |
| 2083 | 2122 | $new_block_list->{ $variation }[] = $slug; |
| 2084 | 2123 | |
| 2085 | 2124 | // Format the JSON to match our coding standards. |
| 2086 | - $new_block_list_formatted = wp_json_encode( $new_block_list, JSON_PRETTY_PRINT ) . "\n"; | |
| 2125 | + $new_block_list_formatted = wp_json_encode( $new_block_list, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT ) . "\n"; | |
| 2087 | 2126 | $new_block_list_formatted = preg_replace_callback( |
| 2088 | 2127 | // Find all occurrences of multiples of 4 spaces a the start of the line. |
| 2089 | 2128 | '/^((?: )+)/m', |
| 2090 | 2129 | function ( $matches ) { |
