From e4e26f5f3150cd482ce0f1c9e60e29168aae86d0 Mon Sep 17 00:00:00 2001 From: okmttdhr Date: Thu, 22 Aug 2024 08:08:08 +0000 Subject: [PATCH] Sync Calypso locale to Atomic Classic & Atomic Default (#39009) * Sync locale on Atomic Classic * changelog * Update versions * Revert "Sync locale on Atomic Classic" This reverts commit 9a79265b5dccbc2d90fdd4852772c302b84854c7. * Extract locale sync logic * changelog * Bump versions * Fix phan errors * Remove return type * Add guard clause * Revert version bump in masterbar * Revert jetpack change * Update composer.lock * Change the directory name * Load wpcom-profile-settings only for wpcom users * Update composer.lock * Remove locale sync from Masterbar package * changelog * Bump versions Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/10504061625 Upstream-Ref: Automattic/jetpack@ba848570456956bfc4ae25fa915e0bb0688f1323 --- composer.lock | 64 +++++----- .../automattic/jetpack-masterbar/CHANGELOG.md | 5 +- .../jetpack-masterbar/composer.json | 2 +- .../jetpack-masterbar/src/class-main.php | 2 +- .../src/masterbar/class-masterbar.php | 7 -- .../automattic/jetpack-mu-wpcom/CHANGELOG.md | 3 + .../automattic/jetpack-mu-wpcom/composer.json | 2 +- .../src/class-jetpack-mu-wpcom.php | 5 +- .../sync-locale-from-calypso-to-atomic.php | 110 ++++++++++++++++++ vendor/composer/installed.json | 64 +++++----- vendor/composer/installed.php | 60 +++++----- 11 files changed, 216 insertions(+), 108 deletions(-) create mode 100644 vendor/automattic/jetpack-mu-wpcom/src/features/wpcom-locale/sync-locale-from-calypso-to-atomic.php diff --git a/composer.lock b/composer.lock index 5dd1fe36..62f72ad8 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "5ca9ebccc80c3eea258136b6bd953c6e", + "content-hash": "f4d5110f4494efacd2a47b4d7669dc9b", "packages": [ { "name": "automattic/jetpack-a8c-mc-stats", @@ -12,7 +12,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-a8c-mc-stats", - "reference": "a050905bd3f6434af761db121695ddb2e1a5ed4f" + "reference": "9f0a10faa215f68e847487f4cb42aa9e7f898ea0" }, "require": { "php": ">=7.0" @@ -62,7 +62,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-admin-ui", - "reference": "61b1c2b520cddba7f78a9210eea347cf68fff495" + "reference": "eedaf71296e480fb290bbde41f5070755fdba4b3" }, "require": { "php": ">=7.0" @@ -124,7 +124,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-assets", - "reference": "0a531fc432002972b1b2fa1193591931f7a39b64" + "reference": "d529d32703103eb32670276d4aab2e794f8b1d52" }, "require": { "automattic/jetpack-constants": "^2.0.4-alpha", @@ -190,7 +190,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-blaze", - "reference": "7b6fd8cc4092957813179d3552e308e57649b3c6" + "reference": "9dfe59549c3bc5b04bec53fd8c605468d1831617" }, "require": { "automattic/jetpack-assets": "^2.3.4-alpha", @@ -268,7 +268,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-blocks", - "reference": "65ecdcb74801b58715503fd63ad03d623bd24f15" + "reference": "08645472bfe3b152fa9af0fe1f37f8b99e57973b" }, "require": { "automattic/jetpack-constants": "^2.0.4-alpha", @@ -327,7 +327,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-calypsoify", - "reference": "88bec13183a0efabd18968ce10b0ab5825cdf4fc" + "reference": "cffb1a40a825e8aff3ab1bdc68ac44547f0e8a6c" }, "require": { "automattic/jetpack-assets": "^2.3.4-alpha", @@ -389,7 +389,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-classic-theme-helper", - "reference": "7ed674168dde102821b4ad713fe3d457e5994b7c" + "reference": "087fd03956b47a1a45d64977fb55936175b5f37c" }, "require": { "automattic/jetpack-assets": "^2.3.4-alpha", @@ -457,7 +457,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-compat", - "reference": "4befc618df27e6f3dce9ee790f21a1d706ad1cd6" + "reference": "bc69b9e552e4f225699e5b81dfcbfb450168a239" }, "require": { "php": ">=7.0" @@ -494,7 +494,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-connection", - "reference": "ea86fc9c9a723c39f13d818a01883a40ad146f75" + "reference": "8f28b33ff89361c901716ae6dcbb288db73bd608" }, "require": { "automattic/jetpack-a8c-mc-stats": "^2.0.2-alpha", @@ -578,7 +578,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-constants", - "reference": "08abb23b7a4d5db0062c825e02eac1cafd84c1ee" + "reference": "3b1af44743cac0e20eee7eb02cf869c1daace8ed" }, "require": { "php": ">=7.0" @@ -629,7 +629,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-device-detection", - "reference": "3ae1968cd9e23ad9ee7f5ad3cd0d64cb8dda6744" + "reference": "7379841dc986b986ec0653d980cdd5a5b565df00" }, "require": { "php": ">=7.0" @@ -679,7 +679,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-google-analytics", - "reference": "912a37757977e8eda41924c9d0e1bc4d584bc30b" + "reference": "24112b3cab0a30001e00749a6cba4399f40e0f3f" }, "require": { "automattic/jetpack-status": "^3.3.4-alpha", @@ -747,7 +747,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-ip", - "reference": "9f84e5c8cfbe78eaf6cbc6485e199adf8a516e05" + "reference": "d5acb9a82aad06ed68bf96492c2f58ebb3c347b7" }, "require": { "php": ">=7.0" @@ -802,7 +802,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-jitm", - "reference": "5744b4daa09247681283f781f6be8f58c00c1458" + "reference": "de4ec5b33cd3cbff121c5accbb3082b58da23a4b" }, "require": { "automattic/jetpack-a8c-mc-stats": "^2.0.2-alpha", @@ -874,7 +874,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-logo", - "reference": "0d37546a824a2497f477b0721c8301330521d86f" + "reference": "d857313e62938a3a88479c800f1b02e87a732b51" }, "require": { "php": ">=7.0" @@ -920,11 +920,11 @@ }, { "name": "automattic/jetpack-masterbar", - "version": "0.7.1-alpha.1724273335", + "version": "0.8.0-alpha.1724313227", "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-masterbar", - "reference": "0ed7982c766f3bf62c31a9ed9593436c035285a3" + "reference": "b282ff286e932042c5ceb93ac02caf8859e25db2" }, "require": { "automattic/jetpack-assets": "^2.3.4-alpha", @@ -952,7 +952,7 @@ "extra": { "autotagger": true, "branch-alias": { - "dev-trunk": "0.7.x-dev" + "dev-trunk": "0.8.x-dev" }, "changelogger": { "link-template": "https://github.com/Automattic/jetpack-masterbar/compare/v${old}...v${new}" @@ -999,11 +999,11 @@ }, { "name": "automattic/jetpack-mu-wpcom", - "version": "5.58.0-alpha.1724308680", + "version": "5.58.0-alpha.1724313227", "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-mu-wpcom", - "reference": "15949dc819985b926b8cbc3ea80259008b1c100e" + "reference": "6df8674c1c40c9409057f4926120b3be86a9cdf9" }, "require": { "automattic/jetpack-assets": "^2.3.4-alpha", @@ -1013,7 +1013,7 @@ "automattic/jetpack-compat": "^3.0.2", "automattic/jetpack-connection": "^2.12.4-alpha", "automattic/jetpack-google-analytics": "^0.2.3-alpha", - "automattic/jetpack-masterbar": "^0.7.1-alpha", + "automattic/jetpack-masterbar": "^0.8.0-alpha", "automattic/jetpack-redirect": "^2.0.3-alpha", "automattic/jetpack-stats-admin": "^0.21.1-alpha", "automattic/jetpack-status": "^3.3.4-alpha", @@ -1083,7 +1083,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-password-checker", - "reference": "c7a9f6b27185ad362bb3bd30da656daec0439251" + "reference": "a52a289c98b78665101fda807fd48b854a728e63" }, "require": { "php": ">=7.0" @@ -1141,7 +1141,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-plans", - "reference": "7f94d790d2d0c3d5f1db15c9e27b35fc65b9ab35" + "reference": "6f3a6f80aab818dd7e51e9bbe05272c634044d04" }, "require": { "automattic/jetpack-connection": "^2.12.4-alpha", @@ -1206,7 +1206,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-redirect", - "reference": "09fe9d566a58b63e44155677d9eb441bb8c19f2b" + "reference": "559d4864661c969ea060a2b055c7386f2d2a5aa9" }, "require": { "automattic/jetpack-status": "^3.3.4-alpha", @@ -1258,7 +1258,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-roles", - "reference": "b8a4cc6c762e12320c0d662d009eafefcef06b5a" + "reference": "f157fd7d15e4319f4ba86ad39495abad05881ec3" }, "require": { "php": ">=7.0" @@ -1309,7 +1309,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-stats", - "reference": "c8c9fd9a792028c8a0b0390a97f6ce7cb5560e1a" + "reference": "edaf68094ed5615db3ee0b84c47bc8cedb7c6797" }, "require": { "automattic/jetpack-connection": "^2.12.4-alpha", @@ -1373,7 +1373,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-stats-admin", - "reference": "58500633878b0a36c4ea7bca06a2335d1a19d9f3" + "reference": "8d818c8069362e43921f1441537f5e46e3e39c54" }, "require": { "automattic/jetpack-connection": "^2.12.4-alpha", @@ -1443,7 +1443,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-status", - "reference": "2c65be59185ac7dc3064d8fabc74c835a9fa8c0a" + "reference": "cc90687ed9b7a9414007ceaea2ce8ab1185405bb" }, "require": { "automattic/jetpack-constants": "^2.0.4-alpha", @@ -1504,7 +1504,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-sync", - "reference": "a7e2e606dc9bce5b0bc13a85fec0decd7ad967d8" + "reference": "5a51eb0a4314fe882087eba420a628946d5b5573" }, "require": { "automattic/jetpack-connection": "^2.12.4-alpha", @@ -1579,7 +1579,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/scheduled-updates", - "reference": "9811bd2b11c6e64091d2803c4fa8cf61fc86e003" + "reference": "a2c2d12561ba69cfe0cae729dd7c287174559f35" }, "require": { "automattic/jetpack-connection": "^2.12.4-alpha", @@ -1728,7 +1728,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-changelogger", - "reference": "e0c773ab76f0bc5e1ddc398b71be265f80180853" + "reference": "bf010359100cb6efa17e7097bfdea30af17ea888" }, "require": { "php": ">=7.0", diff --git a/vendor/automattic/jetpack-masterbar/CHANGELOG.md b/vendor/automattic/jetpack-masterbar/CHANGELOG.md index 954ae7b6..ed350cb6 100644 --- a/vendor/automattic/jetpack-masterbar/CHANGELOG.md +++ b/vendor/automattic/jetpack-masterbar/CHANGELOG.md @@ -5,11 +5,12 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [0.7.1-alpha] - unreleased +## [0.8.0-alpha] - unreleased This is an alpha version! The changes listed here are not final. ### Changed +- Remove locale sync - Updated package dependencies. ## [0.7.0] - 2024-08-21 @@ -101,7 +102,7 @@ This is an alpha version! The changes listed here are not final. - Updated package dependencies. [#37669] - Updated package dependencies. [#37706] -[0.7.1-alpha]: https://github.com/Automattic/jetpack-masterbar/compare/v0.7.0...v0.7.1-alpha +[0.8.0-alpha]: https://github.com/Automattic/jetpack-masterbar/compare/v0.7.0...v0.8.0-alpha [0.7.0]: https://github.com/Automattic/jetpack-masterbar/compare/v0.6.1...v0.7.0 [0.6.1]: https://github.com/Automattic/jetpack-masterbar/compare/v0.6.0...v0.6.1 [0.6.0]: https://github.com/Automattic/jetpack-masterbar/compare/v0.5.0...v0.6.0 diff --git a/vendor/automattic/jetpack-masterbar/composer.json b/vendor/automattic/jetpack-masterbar/composer.json index d704eefb..9939d911 100644 --- a/vendor/automattic/jetpack-masterbar/composer.json +++ b/vendor/automattic/jetpack-masterbar/composer.json @@ -54,7 +54,7 @@ "extra": { "autotagger": true, "branch-alias": { - "dev-trunk": "0.7.x-dev" + "dev-trunk": "0.8.x-dev" }, "changelogger": { "link-template": "https://github.com/Automattic/jetpack-masterbar/compare/v${old}...v${new}" diff --git a/vendor/automattic/jetpack-masterbar/src/class-main.php b/vendor/automattic/jetpack-masterbar/src/class-main.php index d6689093..94f76da7 100644 --- a/vendor/automattic/jetpack-masterbar/src/class-main.php +++ b/vendor/automattic/jetpack-masterbar/src/class-main.php @@ -14,7 +14,7 @@ */ class Main { - const PACKAGE_VERSION = '0.7.1-alpha'; + const PACKAGE_VERSION = '0.8.0-alpha'; /** * Initializer. diff --git a/vendor/automattic/jetpack-masterbar/src/masterbar/class-masterbar.php b/vendor/automattic/jetpack-masterbar/src/masterbar/class-masterbar.php index cff37f0e..a9c84085 100644 --- a/vendor/automattic/jetpack-masterbar/src/masterbar/class-masterbar.php +++ b/vendor/automattic/jetpack-masterbar/src/masterbar/class-masterbar.php @@ -135,13 +135,6 @@ public function __construct() { if ( isset( $this->user_data['use_wp_admin_links'] ) ) { update_user_option( $this->user_id, 'jetpack_admin_menu_link_destination', $this->user_data['use_wp_admin_links'] ? '1' : '0' ); } - // If Atomic, store and install user locale. - if ( $this->site_woa && 'wp-admin' !== get_option( 'wpcom_admin_interface' ) ) { - $this->user_locale = $this->get_jetpack_locale( $this->user_locale ); - $this->install_locale( $this->user_locale ); - $this->unload_non_default_textdomains_on_wpcom_user_locale_switch( $this->user_locale ); - update_user_option( $this->user_id, 'locale', $this->user_locale, true ); - } add_action( 'admin_bar_init', array( $this, 'init' ) ); diff --git a/vendor/automattic/jetpack-mu-wpcom/CHANGELOG.md b/vendor/automattic/jetpack-mu-wpcom/CHANGELOG.md index 2d6742e1..b6be6c5e 100644 --- a/vendor/automattic/jetpack-mu-wpcom/CHANGELOG.md +++ b/vendor/automattic/jetpack-mu-wpcom/CHANGELOG.md @@ -9,6 +9,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 This is an alpha version! The changes listed here are not final. +### Added +- Sync Calypso locale to Atomic Classic + ### Changed - Replace language selector with a link to WPCOM - Updated package dependencies. diff --git a/vendor/automattic/jetpack-mu-wpcom/composer.json b/vendor/automattic/jetpack-mu-wpcom/composer.json index 464ca6e1..880544d9 100644 --- a/vendor/automattic/jetpack-mu-wpcom/composer.json +++ b/vendor/automattic/jetpack-mu-wpcom/composer.json @@ -10,7 +10,7 @@ "automattic/jetpack-calypsoify": "^0.1.4-alpha", "automattic/jetpack-classic-theme-helper": "^0.5.2-alpha", "automattic/jetpack-connection": "^2.12.4-alpha", - "automattic/jetpack-masterbar": "^0.7.1-alpha", + "automattic/jetpack-masterbar": "^0.8.0-alpha", "automattic/jetpack-redirect": "^2.0.3-alpha", "automattic/jetpack-stats-admin": "^0.21.1-alpha", "automattic/jetpack-status": "^3.3.4-alpha", diff --git a/vendor/automattic/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php b/vendor/automattic/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php index d0df81f5..8b400ac5 100644 --- a/vendor/automattic/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php +++ b/vendor/automattic/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php @@ -109,8 +109,6 @@ public static function load_features() { require_once __DIR__ . '/features/wpcom-block-editor/class-jetpack-wpcom-block-editor.php'; require_once __DIR__ . '/features/wpcom-block-editor/functions.editor-type.php'; require_once __DIR__ . '/features/wpcom-logout/wpcom-logout.php'; - require_once __DIR__ . '/features/wpcom-profile-settings/profile-settings-link-to-wpcom.php'; - require_once __DIR__ . '/features/wpcom-profile-settings/profile-settings-notices.php'; require_once __DIR__ . '/features/wpcom-themes/wpcom-theme-fixes.php'; // Initializers, if needed. @@ -143,7 +141,10 @@ public static function load_wpcom_user_features() { require_once __DIR__ . '/features/wpcom-admin-interface/wpcom-admin-interface.php'; require_once __DIR__ . '/features/wpcom-admin-menu/wpcom-admin-menu.php'; require_once __DIR__ . '/features/wpcom-command-palette/wpcom-command-palette.php'; + require_once __DIR__ . '/features/wpcom-locale/sync-locale-from-calypso-to-atomic.php'; require_once __DIR__ . '/features/wpcom-plugins/wpcom-plugins.php'; + require_once __DIR__ . '/features/wpcom-profile-settings/profile-settings-link-to-wpcom.php'; + require_once __DIR__ . '/features/wpcom-profile-settings/profile-settings-notices.php'; require_once __DIR__ . '/features/wpcom-sidebar-notice/wpcom-sidebar-notice.php'; require_once __DIR__ . '/features/wpcom-site-management-widget/class-wpcom-site-management-widget.php'; require_once __DIR__ . '/features/wpcom-themes/wpcom-themes.php'; diff --git a/vendor/automattic/jetpack-mu-wpcom/src/features/wpcom-locale/sync-locale-from-calypso-to-atomic.php b/vendor/automattic/jetpack-mu-wpcom/src/features/wpcom-locale/sync-locale-from-calypso-to-atomic.php new file mode 100644 index 00000000..616be750 --- /dev/null +++ b/vendor/automattic/jetpack-mu-wpcom/src/features/wpcom-locale/sync-locale-from-calypso-to-atomic.php @@ -0,0 +1,110 @@ +wp_locale ? $jetpack_locale_object->wp_locale : 'en_US'; + } + } + + if ( isset( $jetpack_locale ) ) { + return $jetpack_locale; + } + + return 'en_US'; +} + +/** + * Install locale if not yet available. + * + * @param string $locale The new locale slug. + */ +function _install_locale( $locale = '' ) { + if ( ! in_array( $locale, get_available_languages(), true ) + && ! empty( $locale ) && current_user_can( 'install_languages' ) ) { + + if ( ! function_exists( 'wp_download_language_pack' ) ) { + require_once ABSPATH . 'wp-admin/includes/translation-install.php'; + } + + if ( ! function_exists( 'request_filesystem_credentials' ) ) { + require_once ABSPATH . 'wp-admin/includes/file.php'; + } + + if ( wp_can_install_language_pack() ) { + wp_download_language_pack( $locale ); + load_default_textdomain( $locale ); + } + } +} + +/** + * Trigger reloading of all non-default textdomains if the user just changed + * their locale on WordPress.com. + * + * @param string $wpcom_locale The user's detected WordPress.com locale. + */ +function _unload_non_default_textdomains_on_wpcom_user_locale_switch( $wpcom_locale ) { + $user_switched_locale = get_user_locale() !== $wpcom_locale; + if ( ! $user_switched_locale ) { + return; + } + + global $l10n; + $loaded_textdomains = array_keys( $l10n ); + $non_default_textdomains = array_diff( $loaded_textdomains, array( 'default' ) ); + foreach ( $non_default_textdomains as $textdomain ) { + // Using $reloadable = true makes sure the correct locale's + // translations are loaded just-in-time. + unload_textdomain( $textdomain, true ); + } +} + +/** + * Handles the locale setup for Atomic sites. + * + * @param string $user_locale The user's locale. + */ +function wpcom_sync_locale_from_calypso_to_atomic( $user_locale ) { + $is_atomic_site = ( new Automattic\Jetpack\Status\Host() )->is_woa_site(); + if ( ! $is_atomic_site ) { + return; + } + + $user_id = get_current_user_id(); + $connection_manager = new Connection_Manager( 'jetpack' ); + if ( ! $connection_manager->is_user_connected( $user_id ) ) { + return; + } + $user_data = $connection_manager->get_connected_user_data( $user_id ); + $user_locale = $user_data['user_locale'] ?? ''; + + $jetpack_locale = _get_jetpack_locale( $user_locale ); + _install_locale( $jetpack_locale ); + _unload_non_default_textdomains_on_wpcom_user_locale_switch( $jetpack_locale ); + + if ( get_user_option( 'locale', $user_id ) !== $jetpack_locale ) { + update_user_option( $user_id, 'locale', $jetpack_locale, true ); + } +} +add_filter( 'init', 'wpcom_sync_locale_from_calypso_to_atomic' ); diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index cfe5cfd1..eb16976d 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -7,7 +7,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-a8c-mc-stats", - "reference": "a050905bd3f6434af761db121695ddb2e1a5ed4f" + "reference": "9f0a10faa215f68e847487f4cb42aa9e7f898ea0" }, "require": { "php": ">=7.0" @@ -60,7 +60,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-admin-ui", - "reference": "61b1c2b520cddba7f78a9210eea347cf68fff495" + "reference": "eedaf71296e480fb290bbde41f5070755fdba4b3" }, "require": { "php": ">=7.0" @@ -125,7 +125,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-assets", - "reference": "0a531fc432002972b1b2fa1193591931f7a39b64" + "reference": "d529d32703103eb32670276d4aab2e794f8b1d52" }, "require": { "automattic/jetpack-constants": "^2.0.4-alpha", @@ -194,7 +194,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-blaze", - "reference": "7b6fd8cc4092957813179d3552e308e57649b3c6" + "reference": "9dfe59549c3bc5b04bec53fd8c605468d1831617" }, "require": { "automattic/jetpack-assets": "^2.3.4-alpha", @@ -275,7 +275,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-blocks", - "reference": "65ecdcb74801b58715503fd63ad03d623bd24f15" + "reference": "08645472bfe3b152fa9af0fe1f37f8b99e57973b" }, "require": { "automattic/jetpack-constants": "^2.0.4-alpha", @@ -337,7 +337,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-calypsoify", - "reference": "88bec13183a0efabd18968ce10b0ab5825cdf4fc" + "reference": "cffb1a40a825e8aff3ab1bdc68ac44547f0e8a6c" }, "require": { "automattic/jetpack-assets": "^2.3.4-alpha", @@ -402,7 +402,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-classic-theme-helper", - "reference": "7ed674168dde102821b4ad713fe3d457e5994b7c" + "reference": "087fd03956b47a1a45d64977fb55936175b5f37c" }, "require": { "automattic/jetpack-assets": "^2.3.4-alpha", @@ -473,7 +473,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-compat", - "reference": "4befc618df27e6f3dce9ee790f21a1d706ad1cd6" + "reference": "bc69b9e552e4f225699e5b81dfcbfb450168a239" }, "require": { "php": ">=7.0" @@ -513,7 +513,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-connection", - "reference": "ea86fc9c9a723c39f13d818a01883a40ad146f75" + "reference": "8f28b33ff89361c901716ae6dcbb288db73bd608" }, "require": { "automattic/jetpack-a8c-mc-stats": "^2.0.2-alpha", @@ -600,7 +600,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-constants", - "reference": "08abb23b7a4d5db0062c825e02eac1cafd84c1ee" + "reference": "3b1af44743cac0e20eee7eb02cf869c1daace8ed" }, "require": { "php": ">=7.0" @@ -654,7 +654,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-device-detection", - "reference": "3ae1968cd9e23ad9ee7f5ad3cd0d64cb8dda6744" + "reference": "7379841dc986b986ec0653d980cdd5a5b565df00" }, "require": { "php": ">=7.0" @@ -707,7 +707,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-google-analytics", - "reference": "912a37757977e8eda41924c9d0e1bc4d584bc30b" + "reference": "24112b3cab0a30001e00749a6cba4399f40e0f3f" }, "require": { "automattic/jetpack-status": "^3.3.4-alpha", @@ -778,7 +778,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-ip", - "reference": "9f84e5c8cfbe78eaf6cbc6485e199adf8a516e05" + "reference": "d5acb9a82aad06ed68bf96492c2f58ebb3c347b7" }, "require": { "php": ">=7.0" @@ -836,7 +836,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-jitm", - "reference": "5744b4daa09247681283f781f6be8f58c00c1458" + "reference": "de4ec5b33cd3cbff121c5accbb3082b58da23a4b" }, "require": { "automattic/jetpack-a8c-mc-stats": "^2.0.2-alpha", @@ -911,7 +911,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-logo", - "reference": "0d37546a824a2497f477b0721c8301330521d86f" + "reference": "d857313e62938a3a88479c800f1b02e87a732b51" }, "require": { "php": ">=7.0" @@ -959,12 +959,12 @@ }, { "name": "automattic/jetpack-masterbar", - "version": "0.7.1-alpha.1724273335", - "version_normalized": "0.7.1.0-alpha1724273335", + "version": "0.8.0-alpha.1724313227", + "version_normalized": "0.8.0.0-alpha1724313227", "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-masterbar", - "reference": "0ed7982c766f3bf62c31a9ed9593436c035285a3" + "reference": "b282ff286e932042c5ceb93ac02caf8859e25db2" }, "require": { "automattic/jetpack-assets": "^2.3.4-alpha", @@ -992,7 +992,7 @@ "extra": { "autotagger": true, "branch-alias": { - "dev-trunk": "0.7.x-dev" + "dev-trunk": "0.8.x-dev" }, "changelogger": { "link-template": "https://github.com/Automattic/jetpack-masterbar/compare/v${old}...v${new}" @@ -1041,12 +1041,12 @@ }, { "name": "automattic/jetpack-mu-wpcom", - "version": "5.58.0-alpha.1724308680", - "version_normalized": "5.58.0.0-alpha1724308680", + "version": "5.58.0-alpha.1724313227", + "version_normalized": "5.58.0.0-alpha1724313227", "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-mu-wpcom", - "reference": "15949dc819985b926b8cbc3ea80259008b1c100e" + "reference": "6df8674c1c40c9409057f4926120b3be86a9cdf9" }, "require": { "automattic/jetpack-assets": "^2.3.4-alpha", @@ -1056,7 +1056,7 @@ "automattic/jetpack-compat": "^3.0.2", "automattic/jetpack-connection": "^2.12.4-alpha", "automattic/jetpack-google-analytics": "^0.2.3-alpha", - "automattic/jetpack-masterbar": "^0.7.1-alpha", + "automattic/jetpack-masterbar": "^0.8.0-alpha", "automattic/jetpack-redirect": "^2.0.3-alpha", "automattic/jetpack-stats-admin": "^0.21.1-alpha", "automattic/jetpack-status": "^3.3.4-alpha", @@ -1129,7 +1129,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-password-checker", - "reference": "c7a9f6b27185ad362bb3bd30da656daec0439251" + "reference": "a52a289c98b78665101fda807fd48b854a728e63" }, "require": { "php": ">=7.0" @@ -1190,7 +1190,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-plans", - "reference": "7f94d790d2d0c3d5f1db15c9e27b35fc65b9ab35" + "reference": "6f3a6f80aab818dd7e51e9bbe05272c634044d04" }, "require": { "automattic/jetpack-connection": "^2.12.4-alpha", @@ -1258,7 +1258,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-redirect", - "reference": "09fe9d566a58b63e44155677d9eb441bb8c19f2b" + "reference": "559d4864661c969ea060a2b055c7386f2d2a5aa9" }, "require": { "automattic/jetpack-status": "^3.3.4-alpha", @@ -1313,7 +1313,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-roles", - "reference": "b8a4cc6c762e12320c0d662d009eafefcef06b5a" + "reference": "f157fd7d15e4319f4ba86ad39495abad05881ec3" }, "require": { "php": ">=7.0" @@ -1367,7 +1367,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-stats", - "reference": "c8c9fd9a792028c8a0b0390a97f6ce7cb5560e1a" + "reference": "edaf68094ed5615db3ee0b84c47bc8cedb7c6797" }, "require": { "automattic/jetpack-connection": "^2.12.4-alpha", @@ -1434,7 +1434,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-stats-admin", - "reference": "58500633878b0a36c4ea7bca06a2335d1a19d9f3" + "reference": "8d818c8069362e43921f1441537f5e46e3e39c54" }, "require": { "automattic/jetpack-connection": "^2.12.4-alpha", @@ -1507,7 +1507,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-status", - "reference": "2c65be59185ac7dc3064d8fabc74c835a9fa8c0a" + "reference": "cc90687ed9b7a9414007ceaea2ce8ab1185405bb" }, "require": { "automattic/jetpack-constants": "^2.0.4-alpha", @@ -1571,7 +1571,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-sync", - "reference": "a7e2e606dc9bce5b0bc13a85fec0decd7ad967d8" + "reference": "5a51eb0a4314fe882087eba420a628946d5b5573" }, "require": { "automattic/jetpack-connection": "^2.12.4-alpha", @@ -1649,7 +1649,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/scheduled-updates", - "reference": "9811bd2b11c6e64091d2803c4fa8cf61fc86e003" + "reference": "a2c2d12561ba69cfe0cae729dd7c287174559f35" }, "require": { "automattic/jetpack-connection": "^2.12.4-alpha", diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php index e83ae1c4..cc142f09 100644 --- a/vendor/composer/installed.php +++ b/vendor/composer/installed.php @@ -13,7 +13,7 @@ 'automattic/jetpack-a8c-mc-stats' => array( 'pretty_version' => '2.0.2-alpha.1724273335', 'version' => '2.0.2.0-alpha1724273335', - 'reference' => 'a050905bd3f6434af761db121695ddb2e1a5ed4f', + 'reference' => '9f0a10faa215f68e847487f4cb42aa9e7f898ea0', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-a8c-mc-stats', 'aliases' => array(), @@ -22,7 +22,7 @@ 'automattic/jetpack-admin-ui' => array( 'pretty_version' => '0.4.3-alpha.1724273335', 'version' => '0.4.3.0-alpha1724273335', - 'reference' => '61b1c2b520cddba7f78a9210eea347cf68fff495', + 'reference' => 'eedaf71296e480fb290bbde41f5070755fdba4b3', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-admin-ui', 'aliases' => array(), @@ -31,7 +31,7 @@ 'automattic/jetpack-assets' => array( 'pretty_version' => '2.3.4-alpha.1724273335', 'version' => '2.3.4.0-alpha1724273335', - 'reference' => '0a531fc432002972b1b2fa1193591931f7a39b64', + 'reference' => 'd529d32703103eb32670276d4aab2e794f8b1d52', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-assets', 'aliases' => array(), @@ -40,7 +40,7 @@ 'automattic/jetpack-blaze' => array( 'pretty_version' => '0.22.7-alpha.1724273335', 'version' => '0.22.7.0-alpha1724273335', - 'reference' => '7b6fd8cc4092957813179d3552e308e57649b3c6', + 'reference' => '9dfe59549c3bc5b04bec53fd8c605468d1831617', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-blaze', 'aliases' => array(), @@ -49,7 +49,7 @@ 'automattic/jetpack-blocks' => array( 'pretty_version' => '2.0.5-alpha.1724273335', 'version' => '2.0.5.0-alpha1724273335', - 'reference' => '65ecdcb74801b58715503fd63ad03d623bd24f15', + 'reference' => '08645472bfe3b152fa9af0fe1f37f8b99e57973b', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-blocks', 'aliases' => array(), @@ -58,7 +58,7 @@ 'automattic/jetpack-calypsoify' => array( 'pretty_version' => '0.1.4-alpha.1724273335', 'version' => '0.1.4.0-alpha1724273335', - 'reference' => '88bec13183a0efabd18968ce10b0ab5825cdf4fc', + 'reference' => 'cffb1a40a825e8aff3ab1bdc68ac44547f0e8a6c', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-calypsoify', 'aliases' => array(), @@ -67,7 +67,7 @@ 'automattic/jetpack-classic-theme-helper' => array( 'pretty_version' => '0.5.2-alpha.1724273335', 'version' => '0.5.2.0-alpha1724273335', - 'reference' => '7ed674168dde102821b4ad713fe3d457e5994b7c', + 'reference' => '087fd03956b47a1a45d64977fb55936175b5f37c', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-classic-theme-helper', 'aliases' => array(), @@ -76,7 +76,7 @@ 'automattic/jetpack-compat' => array( 'pretty_version' => '3.0.2', 'version' => '3.0.2.0', - 'reference' => '4befc618df27e6f3dce9ee790f21a1d706ad1cd6', + 'reference' => 'bc69b9e552e4f225699e5b81dfcbfb450168a239', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-compat', 'aliases' => array(), @@ -85,7 +85,7 @@ 'automattic/jetpack-connection' => array( 'pretty_version' => '2.12.4-alpha.1724273335', 'version' => '2.12.4.0-alpha1724273335', - 'reference' => 'ea86fc9c9a723c39f13d818a01883a40ad146f75', + 'reference' => '8f28b33ff89361c901716ae6dcbb288db73bd608', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-connection', 'aliases' => array(), @@ -94,7 +94,7 @@ 'automattic/jetpack-constants' => array( 'pretty_version' => '2.0.4-alpha.1724273335', 'version' => '2.0.4.0-alpha1724273335', - 'reference' => '08abb23b7a4d5db0062c825e02eac1cafd84c1ee', + 'reference' => '3b1af44743cac0e20eee7eb02cf869c1daace8ed', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-constants', 'aliases' => array(), @@ -103,7 +103,7 @@ 'automattic/jetpack-device-detection' => array( 'pretty_version' => '2.1.4-alpha.1724273335', 'version' => '2.1.4.0-alpha1724273335', - 'reference' => '3ae1968cd9e23ad9ee7f5ad3cd0d64cb8dda6744', + 'reference' => '7379841dc986b986ec0653d980cdd5a5b565df00', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-device-detection', 'aliases' => array(), @@ -112,7 +112,7 @@ 'automattic/jetpack-google-analytics' => array( 'pretty_version' => '0.2.3-alpha.1724273335', 'version' => '0.2.3.0-alpha1724273335', - 'reference' => '912a37757977e8eda41924c9d0e1bc4d584bc30b', + 'reference' => '24112b3cab0a30001e00749a6cba4399f40e0f3f', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-google-analytics', 'aliases' => array(), @@ -121,7 +121,7 @@ 'automattic/jetpack-ip' => array( 'pretty_version' => '0.2.3-alpha.1724273335', 'version' => '0.2.3.0-alpha1724273335', - 'reference' => '9f84e5c8cfbe78eaf6cbc6485e199adf8a516e05', + 'reference' => 'd5acb9a82aad06ed68bf96492c2f58ebb3c347b7', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-ip', 'aliases' => array(), @@ -130,7 +130,7 @@ 'automattic/jetpack-jitm' => array( 'pretty_version' => '3.1.18-alpha.1724273335', 'version' => '3.1.18.0-alpha1724273335', - 'reference' => '5744b4daa09247681283f781f6be8f58c00c1458', + 'reference' => 'de4ec5b33cd3cbff121c5accbb3082b58da23a4b', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-jitm', 'aliases' => array(), @@ -139,25 +139,25 @@ 'automattic/jetpack-logo' => array( 'pretty_version' => '2.0.4-alpha.1724273335', 'version' => '2.0.4.0-alpha1724273335', - 'reference' => '0d37546a824a2497f477b0721c8301330521d86f', + 'reference' => 'd857313e62938a3a88479c800f1b02e87a732b51', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-logo', 'aliases' => array(), 'dev_requirement' => false, ), 'automattic/jetpack-masterbar' => array( - 'pretty_version' => '0.7.1-alpha.1724273335', - 'version' => '0.7.1.0-alpha1724273335', - 'reference' => '0ed7982c766f3bf62c31a9ed9593436c035285a3', + 'pretty_version' => '0.8.0-alpha.1724313227', + 'version' => '0.8.0.0-alpha1724313227', + 'reference' => 'b282ff286e932042c5ceb93ac02caf8859e25db2', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-masterbar', 'aliases' => array(), 'dev_requirement' => false, ), 'automattic/jetpack-mu-wpcom' => array( - 'pretty_version' => '5.58.0-alpha.1724308680', - 'version' => '5.58.0.0-alpha1724308680', - 'reference' => '15949dc819985b926b8cbc3ea80259008b1c100e', + 'pretty_version' => '5.58.0-alpha.1724313227', + 'version' => '5.58.0.0-alpha1724313227', + 'reference' => '6df8674c1c40c9409057f4926120b3be86a9cdf9', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-mu-wpcom', 'aliases' => array(), @@ -175,7 +175,7 @@ 'automattic/jetpack-password-checker' => array( 'pretty_version' => '0.3.2-alpha.1724273335', 'version' => '0.3.2.0-alpha1724273335', - 'reference' => 'c7a9f6b27185ad362bb3bd30da656daec0439251', + 'reference' => 'a52a289c98b78665101fda807fd48b854a728e63', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-password-checker', 'aliases' => array(), @@ -184,7 +184,7 @@ 'automattic/jetpack-plans' => array( 'pretty_version' => '0.4.8-alpha.1724273335', 'version' => '0.4.8.0-alpha1724273335', - 'reference' => '7f94d790d2d0c3d5f1db15c9e27b35fc65b9ab35', + 'reference' => '6f3a6f80aab818dd7e51e9bbe05272c634044d04', 'type' => 'library', 'install_path' => __DIR__ . '/../automattic/jetpack-plans', 'aliases' => array(), @@ -193,7 +193,7 @@ 'automattic/jetpack-redirect' => array( 'pretty_version' => '2.0.3-alpha.1724273335', 'version' => '2.0.3.0-alpha1724273335', - 'reference' => '09fe9d566a58b63e44155677d9eb441bb8c19f2b', + 'reference' => '559d4864661c969ea060a2b055c7386f2d2a5aa9', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-redirect', 'aliases' => array(), @@ -202,7 +202,7 @@ 'automattic/jetpack-roles' => array( 'pretty_version' => '2.0.3-alpha.1724273335', 'version' => '2.0.3.0-alpha1724273335', - 'reference' => 'b8a4cc6c762e12320c0d662d009eafefcef06b5a', + 'reference' => 'f157fd7d15e4319f4ba86ad39495abad05881ec3', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-roles', 'aliases' => array(), @@ -211,7 +211,7 @@ 'automattic/jetpack-stats' => array( 'pretty_version' => '0.13.1-alpha.1724273335', 'version' => '0.13.1.0-alpha1724273335', - 'reference' => 'c8c9fd9a792028c8a0b0390a97f6ce7cb5560e1a', + 'reference' => 'edaf68094ed5615db3ee0b84c47bc8cedb7c6797', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-stats', 'aliases' => array(), @@ -220,7 +220,7 @@ 'automattic/jetpack-stats-admin' => array( 'pretty_version' => '0.21.1-alpha.1724273335', 'version' => '0.21.1.0-alpha1724273335', - 'reference' => '58500633878b0a36c4ea7bca06a2335d1a19d9f3', + 'reference' => '8d818c8069362e43921f1441537f5e46e3e39c54', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-stats-admin', 'aliases' => array(), @@ -229,7 +229,7 @@ 'automattic/jetpack-status' => array( 'pretty_version' => '3.3.4-alpha.1724273335', 'version' => '3.3.4.0-alpha1724273335', - 'reference' => '2c65be59185ac7dc3064d8fabc74c835a9fa8c0a', + 'reference' => 'cc90687ed9b7a9414007ceaea2ce8ab1185405bb', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-status', 'aliases' => array(), @@ -238,7 +238,7 @@ 'automattic/jetpack-sync' => array( 'pretty_version' => '3.7.1-alpha.1724273335', 'version' => '3.7.1.0-alpha1724273335', - 'reference' => 'a7e2e606dc9bce5b0bc13a85fec0decd7ad967d8', + 'reference' => '5a51eb0a4314fe882087eba420a628946d5b5573', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-sync', 'aliases' => array(), @@ -247,7 +247,7 @@ 'automattic/scheduled-updates' => array( 'pretty_version' => '0.13.2-alpha.1724273335', 'version' => '0.13.2.0-alpha1724273335', - 'reference' => '9811bd2b11c6e64091d2803c4fa8cf61fc86e003', + 'reference' => 'a2c2d12561ba69cfe0cae729dd7c287174559f35', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/scheduled-updates', 'aliases' => array(),