diff --git a/composer.lock b/composer.lock index e28f5b5a..b0fa58d3 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": "2a812eba0bd7f4e26795f31108a72792", + "content-hash": "b807a04319005aab552f51dc37d79742", "packages": [ { "name": "automattic/jetpack-a8c-mc-stats", @@ -12,7 +12,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-a8c-mc-stats", - "reference": "7c2f9fb72b6f75fe2ab1de8ef8eb0f45956c67d9" + "reference": "c0169c23e4c21755a138efac391ed3d2fc26c5e2" }, "require": { "php": ">=7.2" @@ -65,7 +65,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-admin-ui", - "reference": "83f23ca1a1b1ef31223b4e569c3b446b93564a04" + "reference": "179a25d3c8552b6d66da81975db0f744d959a47d" }, "require": { "php": ">=7.2" @@ -130,7 +130,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-assets", - "reference": "2c07813259092b972d94c28d82a4198e9b92d73b" + "reference": "6e730270be8dd9b5cbced1f171403ea3794ab246" }, "require": { "automattic/jetpack-constants": "^3.0.1", @@ -199,11 +199,11 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-blaze", - "reference": "e7cfb0def8a1c3b480c8ccdd600a4deedf893dd6" + "reference": "95408b824658ddc439cb4cd0ac97b5df5c16dccf" }, "require": { "automattic/jetpack-assets": "^4.0.1", - "automattic/jetpack-connection": "^6.1.1", + "automattic/jetpack-connection": "^6.2.0-alpha", "automattic/jetpack-constants": "^3.0.1", "automattic/jetpack-plans": "^0.5.1", "automattic/jetpack-redirect": "^3.0.1", @@ -280,7 +280,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-blocks", - "reference": "e72ba57209d6e5bb41440cdff3769d043d1c080f" + "reference": "a4c1051c6f84c319b7f2ea536e8c2c4fd76e8ae3" }, "require": { "automattic/jetpack-constants": "^3.0.1", @@ -342,7 +342,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-calypsoify", - "reference": "4e3c05cc21d47f0ca75e198569d82a0a2f924067" + "reference": "dd9a74102b013abe64919213660237b693f8e20b" }, "require": { "automattic/jetpack-assets": "^4.0.1", @@ -407,7 +407,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-classic-theme-helper", - "reference": "68142c0e08497d1afffd46e5026e01b17a86f2f1" + "reference": "c82ceddf2f9c002b552194de46db67af10ce0cc6" }, "require": { "automattic/jetpack-assets": "^4.0.1", @@ -478,7 +478,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-compat", - "reference": "9ee104e74b127e13e3cd5096de9c3ea3de82dd7f" + "reference": "38aed27bb346772bb454eb1b764f2cfb211efb15" }, "require": { "php": ">=7.2" @@ -511,11 +511,11 @@ }, { "name": "automattic/jetpack-connection", - "version": "6.1.1", + "version": "6.2.0-alpha.1733428152", "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-connection", - "reference": "9d078c81af2c46c5cd1360b3684ea783e4e890f2" + "reference": "f5c321d85494b4bdf3aa31d2610040f9ffc07244" }, "require": { "automattic/jetpack-a8c-mc-stats": "^3.0.0", @@ -548,7 +548,7 @@ "link-template": "https://github.com/Automattic/jetpack-connection/compare/v${old}...v${new}" }, "branch-alias": { - "dev-trunk": "6.1.x-dev" + "dev-trunk": "6.2.x-dev" }, "dependencies": { "test-only": [ @@ -605,7 +605,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-constants", - "reference": "6723563658991bc9ef6065c01d032278baf7c503" + "reference": "d04731a8a4cbaaa339bd2003f8679a5fccf24fd7" }, "require": { "php": ">=7.2" @@ -659,7 +659,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-device-detection", - "reference": "005d54c53bdb8bae49979f7b1e4926b979a1a118" + "reference": "e5bb6d4bf12e815e0cf481ac06c518003c2fbc6d" }, "require": { "php": ">=7.2" @@ -712,7 +712,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-google-analytics", - "reference": "7937d1c23cbe01472118a0810dadd55ca529290d" + "reference": "ae3cbbfad32eecb29bc53f624f3227d2d6ef2e7b" }, "require": { "automattic/jetpack-status": "^5.0.1", @@ -783,7 +783,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-ip", - "reference": "b235e186c96c7d8d570043e1e96b848866382e3c" + "reference": "cd2b781cb05ce281deea5ee1dc67356d6f3dac64" }, "require": { "php": ">=7.2" @@ -841,12 +841,12 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-jitm", - "reference": "4a486df49714411f25a669669304d3bf2c6141a8" + "reference": "cd35bedd992efe2275cc94bc0e1accbc3a89c8e1" }, "require": { "automattic/jetpack-a8c-mc-stats": "^3.0.0", "automattic/jetpack-assets": "^4.0.1", - "automattic/jetpack-connection": "^6.1.1", + "automattic/jetpack-connection": "^6.2.0-alpha", "automattic/jetpack-device-detection": "^3.0.0", "automattic/jetpack-logo": "^3.0.0", "automattic/jetpack-redirect": "^3.0.1", @@ -916,7 +916,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-logo", - "reference": "a42aa640babc91f5fbf9f5f6afbc152bb4645e9b" + "reference": "54d31f11d08501efa36fda3df40116485e373218" }, "require": { "php": ">=7.2" @@ -969,13 +969,13 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-masterbar", - "reference": "d1d7f51977c9c09a2f96124a229c713cd1f83b5d" + "reference": "41b5a410af7644d5b0b55ca27660efdd0889f8d6" }, "require": { "automattic/jetpack-assets": "^4.0.1", "automattic/jetpack-blaze": "^0.25.3", "automattic/jetpack-compat": "^4.0.0", - "automattic/jetpack-connection": "^6.1.1", + "automattic/jetpack-connection": "^6.2.0-alpha", "automattic/jetpack-device-detection": "^3.0.0", "automattic/jetpack-jitm": "^4.0.2", "automattic/jetpack-logo": "^3.0.0", @@ -1052,7 +1052,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-mu-wpcom", - "reference": "e1703107f39dcad1eb33c16f0433628c263f2432" + "reference": "6dd5c202b8e57540419dac122626113e9157b1c3" }, "require": { "automattic/jetpack-assets": "^4.0.1", @@ -1060,7 +1060,7 @@ "automattic/jetpack-calypsoify": "^0.2.0", "automattic/jetpack-classic-theme-helper": "^0.7.3", "automattic/jetpack-compat": "^4.0.0", - "automattic/jetpack-connection": "^6.1.1", + "automattic/jetpack-connection": "^6.2.0-alpha", "automattic/jetpack-google-analytics": "^0.3.0", "automattic/jetpack-masterbar": "^0.10.2", "automattic/jetpack-redirect": "^3.0.1", @@ -1135,7 +1135,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-password-checker", - "reference": "485b0317a790253dda16042160fca5cc51f2c04e" + "reference": "d128ff6dd3ac134df48f5112a0b981ca0e7f0199" }, "require": { "php": ">=7.2" @@ -1196,10 +1196,10 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-plans", - "reference": "6f1bbf9dda5dafdc85943467e5359a34da27d9c8" + "reference": "821cde09524fda53aa1e5fde394f112a1f83abeb" }, "require": { - "automattic/jetpack-connection": "^6.1.1", + "automattic/jetpack-connection": "^6.2.0-alpha", "php": ">=7.2" }, "require-dev": { @@ -1264,7 +1264,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-redirect", - "reference": "3d5938af9bdd1dd7e2ec6898ba6f004d843cd87f" + "reference": "8700dfa0de741d3081c1b12790327c05b3bc9566" }, "require": { "automattic/jetpack-status": "^5.0.1", @@ -1319,7 +1319,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-roles", - "reference": "519c89097fe40365928b1fbaaf5aa202e8019cee" + "reference": "83483153144838f453f660692fc23541068c8bda" }, "require": { "php": ">=7.2" @@ -1373,10 +1373,10 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-stats", - "reference": "750a0de8bf73f4a85c0b250d52952cf5e01c56a4" + "reference": "6829daa833bdf5e9380008e887c01ddfc2e7eb3f" }, "require": { - "automattic/jetpack-connection": "^6.1.1", + "automattic/jetpack-connection": "^6.2.0-alpha", "automattic/jetpack-constants": "^3.0.1", "automattic/jetpack-status": "^5.0.1", "php": ">=7.2" @@ -1440,10 +1440,10 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-stats-admin", - "reference": "aec61fe00130103d51df985d147e6c7a04c824f4" + "reference": "1ba3a684ec6f34dd2486a9ffca9acb65ac92eaa9" }, "require": { - "automattic/jetpack-connection": "^6.1.1", + "automattic/jetpack-connection": "^6.2.0-alpha", "automattic/jetpack-constants": "^3.0.1", "automattic/jetpack-jitm": "^4.0.2", "automattic/jetpack-plans": "^0.5.1", @@ -1513,7 +1513,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-status", - "reference": "c6849975dfbbaf419a9d1507879f2ef059a086d0" + "reference": "e20128cce903f0ac0f4d8da33d8992b1ba3e1956" }, "require": { "automattic/jetpack-constants": "^3.0.1", @@ -1577,10 +1577,10 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-sync", - "reference": "474dfb8b3759981ac686b77ffc89ab8ac1e26ef8" + "reference": "090c528d9ac9dfcbff93730f705f588960925ecc" }, "require": { - "automattic/jetpack-connection": "^6.1.1", + "automattic/jetpack-connection": "^6.2.0-alpha", "automattic/jetpack-constants": "^3.0.1", "automattic/jetpack-ip": "^0.4.1", "automattic/jetpack-password-checker": "^0.4.1", @@ -1655,10 +1655,10 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/scheduled-updates", - "reference": "59663e5d3561848c65f4bef10f51e61a9a5fb509" + "reference": "a65bc8da41584e5e4b5c1ecd58cc9217ccc53489" }, "require": { - "automattic/jetpack-connection": "^6.1.1", + "automattic/jetpack-connection": "^6.2.0-alpha", "automattic/jetpack-constants": "^3.0.1", "automattic/jetpack-plans": "^0.5.1", "automattic/jetpack-status": "^5.0.1", @@ -1807,7 +1807,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-changelogger", - "reference": "65fd3614ba60a74f28e590220eb9b6f6633bf817" + "reference": "27905e4670e2118940d4df5041b2d4fa148f28f0" }, "require": { "php": ">=7.2.5", diff --git a/vendor/automattic/jetpack-blaze/composer.json b/vendor/automattic/jetpack-blaze/composer.json index 9ea14a1d..d0b643b3 100644 --- a/vendor/automattic/jetpack-blaze/composer.json +++ b/vendor/automattic/jetpack-blaze/composer.json @@ -6,7 +6,7 @@ "require": { "php": ">=7.2", "automattic/jetpack-assets": "^4.0.1", - "automattic/jetpack-connection": "^6.1.1", + "automattic/jetpack-connection": "^6.2.0-alpha", "automattic/jetpack-constants": "^3.0.1", "automattic/jetpack-plans": "^0.5.1", "automattic/jetpack-redirect": "^3.0.1", diff --git a/vendor/automattic/jetpack-connection/CHANGELOG.md b/vendor/automattic/jetpack-connection/CHANGELOG.md index 901342a9..bf775b5e 100644 --- a/vendor/automattic/jetpack-connection/CHANGELOG.md +++ b/vendor/automattic/jetpack-connection/CHANGELOG.md @@ -5,6 +5,13 @@ 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). +## [6.2.0-alpha] - unreleased + +This is an alpha version! The changes listed here are not final. + +### Added +- REST user provisioning with an app password. + ## [6.1.1] - 2024-12-04 ### Changed - Updated package dependencies. [#40363] @@ -1262,6 +1269,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Separate the connection library into its own package. +[6.2.0-alpha]: https://github.com/Automattic/jetpack-connection/compare/v6.1.1...v6.2.0-alpha [6.1.1]: https://github.com/Automattic/jetpack-connection/compare/v6.1.0...v6.1.1 [6.1.0]: https://github.com/Automattic/jetpack-connection/compare/v6.0.1...v6.1.0 [6.0.1]: https://github.com/Automattic/jetpack-connection/compare/v6.0.0...v6.0.1 diff --git a/vendor/automattic/jetpack-connection/composer.json b/vendor/automattic/jetpack-connection/composer.json index 3d9d102c..f08b9da7 100644 --- a/vendor/automattic/jetpack-connection/composer.json +++ b/vendor/automattic/jetpack-connection/composer.json @@ -65,7 +65,7 @@ "link-template": "https://github.com/Automattic/jetpack-connection/compare/v${old}...v${new}" }, "branch-alias": { - "dev-trunk": "6.1.x-dev" + "dev-trunk": "6.2.x-dev" }, "dependencies": { "test-only": [ diff --git a/vendor/automattic/jetpack-connection/src/class-package-version.php b/vendor/automattic/jetpack-connection/src/class-package-version.php index 45cf2221..67cd87b0 100644 --- a/vendor/automattic/jetpack-connection/src/class-package-version.php +++ b/vendor/automattic/jetpack-connection/src/class-package-version.php @@ -12,7 +12,7 @@ */ class Package_Version { - const PACKAGE_VERSION = '6.1.1'; + const PACKAGE_VERSION = '6.2.0-alpha'; const PACKAGE_SLUG = 'connection'; diff --git a/vendor/automattic/jetpack-connection/src/class-rest-connector.php b/vendor/automattic/jetpack-connection/src/class-rest-connector.php index 2e43d5c8..475e3203 100644 --- a/vendor/automattic/jetpack-connection/src/class-rest-connector.php +++ b/vendor/automattic/jetpack-connection/src/class-rest-connector.php @@ -339,9 +339,15 @@ public static function remote_authorize( $request ) { * * @return WP_Error|array */ - public static function remote_provision( WP_REST_Request $request ) { + public function remote_provision( WP_REST_Request $request ) { + $request_data = $request->get_params(); + + if ( did_action( 'application_password_did_authenticate' ) && current_user_can( 'jetpack_connect_user' ) ) { + $request_data['local_user'] = get_current_user_id(); + } + $xmlrpc_server = new Jetpack_XMLRPC_Server(); - $result = $xmlrpc_server->remote_provision( $request ); + $result = $xmlrpc_server->remote_provision( $request_data ); if ( is_a( $result, 'IXR_Error' ) ) { $result = new WP_Error( $result->code, $result->message ); @@ -393,9 +399,20 @@ public function remote_register( WP_REST_Request $request ) { /** * Remote provision endpoint permission check. * + * @param WP_REST_Request $request The request object. + * * @return true|WP_Error */ - public function remote_provision_permission_check() { + public function remote_provision_permission_check( WP_REST_Request $request ) { + // We allow the app password authentication only if 'local_user' is empty for security reasons. + if ( empty( $request['local_user'] ) && did_action( 'application_password_did_authenticate' ) ) { + if ( current_user_can( 'jetpack_connect_user' ) ) { + return true; + } + + return new WP_Error( 'invalid_user_permission_remote_provision', self::get_user_permissions_error_msg(), array( 'status' => rest_authorization_required_code() ) ); + } + return Rest_Authentication::is_signed_with_blog_token() ? true : new WP_Error( 'invalid_permission_remote_provision', self::get_user_permissions_error_msg(), array( 'status' => rest_authorization_required_code() ) ); diff --git a/vendor/automattic/jetpack-jitm/composer.json b/vendor/automattic/jetpack-jitm/composer.json index cf183c03..b1bc8942 100644 --- a/vendor/automattic/jetpack-jitm/composer.json +++ b/vendor/automattic/jetpack-jitm/composer.json @@ -7,7 +7,7 @@ "php": ">=7.2", "automattic/jetpack-a8c-mc-stats": "^3.0.0", "automattic/jetpack-assets": "^4.0.1", - "automattic/jetpack-connection": "^6.1.1", + "automattic/jetpack-connection": "^6.2.0-alpha", "automattic/jetpack-device-detection": "^3.0.0", "automattic/jetpack-logo": "^3.0.0", "automattic/jetpack-redirect": "^3.0.1", diff --git a/vendor/automattic/jetpack-masterbar/composer.json b/vendor/automattic/jetpack-masterbar/composer.json index 3b03ad14..b01bcd4c 100644 --- a/vendor/automattic/jetpack-masterbar/composer.json +++ b/vendor/automattic/jetpack-masterbar/composer.json @@ -9,7 +9,7 @@ "automattic/jetpack-blaze": "^0.25.3", "automattic/jetpack-compat": "^4.0.0", "automattic/jetpack-device-detection": "^3.0.0", - "automattic/jetpack-connection": "^6.1.1", + "automattic/jetpack-connection": "^6.2.0-alpha", "automattic/jetpack-jitm": "^4.0.2", "automattic/jetpack-logo": "^3.0.0", "automattic/jetpack-plans": "^0.5.1", diff --git a/vendor/automattic/jetpack-mu-wpcom/composer.json b/vendor/automattic/jetpack-mu-wpcom/composer.json index 5a77380b..b1b0071b 100644 --- a/vendor/automattic/jetpack-mu-wpcom/composer.json +++ b/vendor/automattic/jetpack-mu-wpcom/composer.json @@ -9,7 +9,7 @@ "automattic/jetpack-blocks": "^3.0.1", "automattic/jetpack-calypsoify": "^0.2.0", "automattic/jetpack-classic-theme-helper": "^0.7.3", - "automattic/jetpack-connection": "^6.1.1", + "automattic/jetpack-connection": "^6.2.0-alpha", "automattic/jetpack-masterbar": "^0.10.2", "automattic/jetpack-redirect": "^3.0.1", "automattic/jetpack-stats-admin": "^0.23.1", diff --git a/vendor/automattic/jetpack-plans/composer.json b/vendor/automattic/jetpack-plans/composer.json index e20ea952..7092da43 100644 --- a/vendor/automattic/jetpack-plans/composer.json +++ b/vendor/automattic/jetpack-plans/composer.json @@ -5,7 +5,7 @@ "license": "GPL-2.0-or-later", "require": { "php": ">=7.2", - "automattic/jetpack-connection": "^6.1.1" + "automattic/jetpack-connection": "^6.2.0-alpha" }, "require-dev": { "yoast/phpunit-polyfills": "^1.1.1", diff --git a/vendor/automattic/jetpack-stats-admin/composer.json b/vendor/automattic/jetpack-stats-admin/composer.json index 4923c062..cff2d1cd 100644 --- a/vendor/automattic/jetpack-stats-admin/composer.json +++ b/vendor/automattic/jetpack-stats-admin/composer.json @@ -5,7 +5,7 @@ "license": "GPL-2.0-or-later", "require": { "php": ">=7.2", - "automattic/jetpack-connection": "^6.1.1", + "automattic/jetpack-connection": "^6.2.0-alpha", "automattic/jetpack-constants": "^3.0.1", "automattic/jetpack-plans": "^0.5.1", "automattic/jetpack-stats": "^0.14.1", diff --git a/vendor/automattic/jetpack-stats/composer.json b/vendor/automattic/jetpack-stats/composer.json index ae63f745..ebd3f679 100644 --- a/vendor/automattic/jetpack-stats/composer.json +++ b/vendor/automattic/jetpack-stats/composer.json @@ -5,7 +5,7 @@ "license": "GPL-2.0-or-later", "require": { "php": ">=7.2", - "automattic/jetpack-connection": "^6.1.1", + "automattic/jetpack-connection": "^6.2.0-alpha", "automattic/jetpack-constants": "^3.0.1", "automattic/jetpack-status": "^5.0.1" }, diff --git a/vendor/automattic/jetpack-sync/composer.json b/vendor/automattic/jetpack-sync/composer.json index bae463ac..d9922901 100644 --- a/vendor/automattic/jetpack-sync/composer.json +++ b/vendor/automattic/jetpack-sync/composer.json @@ -5,7 +5,7 @@ "license": "GPL-2.0-or-later", "require": { "php": ">=7.2", - "automattic/jetpack-connection": "^6.1.1", + "automattic/jetpack-connection": "^6.2.0-alpha", "automattic/jetpack-constants": "^3.0.1", "automattic/jetpack-password-checker": "^0.4.1", "automattic/jetpack-ip": "^0.4.1", diff --git a/vendor/automattic/scheduled-updates/composer.json b/vendor/automattic/scheduled-updates/composer.json index d17f2bea..05446bf6 100644 --- a/vendor/automattic/scheduled-updates/composer.json +++ b/vendor/automattic/scheduled-updates/composer.json @@ -9,7 +9,7 @@ "automattic/jetpack-sync": "^4.0.2", "automattic/jetpack-plans": "^0.5.1", "automattic/jetpack-constants": "^3.0.1", - "automattic/jetpack-connection": "^6.1.1" + "automattic/jetpack-connection": "^6.2.0-alpha" }, "require-dev": { "yoast/phpunit-polyfills": "^1.1.1", diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 3c94b368..2bd428d0 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": "7c2f9fb72b6f75fe2ab1de8ef8eb0f45956c67d9" + "reference": "c0169c23e4c21755a138efac391ed3d2fc26c5e2" }, "require": { "php": ">=7.2" @@ -63,7 +63,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-admin-ui", - "reference": "83f23ca1a1b1ef31223b4e569c3b446b93564a04" + "reference": "179a25d3c8552b6d66da81975db0f744d959a47d" }, "require": { "php": ">=7.2" @@ -131,7 +131,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-assets", - "reference": "2c07813259092b972d94c28d82a4198e9b92d73b" + "reference": "6e730270be8dd9b5cbced1f171403ea3794ab246" }, "require": { "automattic/jetpack-constants": "^3.0.1", @@ -203,11 +203,11 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-blaze", - "reference": "e7cfb0def8a1c3b480c8ccdd600a4deedf893dd6" + "reference": "95408b824658ddc439cb4cd0ac97b5df5c16dccf" }, "require": { "automattic/jetpack-assets": "^4.0.1", - "automattic/jetpack-connection": "^6.1.1", + "automattic/jetpack-connection": "^6.2.0-alpha", "automattic/jetpack-constants": "^3.0.1", "automattic/jetpack-plans": "^0.5.1", "automattic/jetpack-redirect": "^3.0.1", @@ -287,7 +287,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-blocks", - "reference": "e72ba57209d6e5bb41440cdff3769d043d1c080f" + "reference": "a4c1051c6f84c319b7f2ea536e8c2c4fd76e8ae3" }, "require": { "automattic/jetpack-constants": "^3.0.1", @@ -352,7 +352,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-calypsoify", - "reference": "4e3c05cc21d47f0ca75e198569d82a0a2f924067" + "reference": "dd9a74102b013abe64919213660237b693f8e20b" }, "require": { "automattic/jetpack-assets": "^4.0.1", @@ -420,7 +420,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-classic-theme-helper", - "reference": "68142c0e08497d1afffd46e5026e01b17a86f2f1" + "reference": "c82ceddf2f9c002b552194de46db67af10ce0cc6" }, "require": { "automattic/jetpack-assets": "^4.0.1", @@ -494,7 +494,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-compat", - "reference": "9ee104e74b127e13e3cd5096de9c3ea3de82dd7f" + "reference": "38aed27bb346772bb454eb1b764f2cfb211efb15" }, "require": { "php": ">=7.2" @@ -529,12 +529,12 @@ }, { "name": "automattic/jetpack-connection", - "version": "6.1.1", - "version_normalized": "6.1.1.0", + "version": "6.2.0-alpha.1733428152", + "version_normalized": "6.2.0.0-alpha1733428152", "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-connection", - "reference": "9d078c81af2c46c5cd1360b3684ea783e4e890f2" + "reference": "f5c321d85494b4bdf3aa31d2610040f9ffc07244" }, "require": { "automattic/jetpack-a8c-mc-stats": "^3.0.0", @@ -567,7 +567,7 @@ "link-template": "https://github.com/Automattic/jetpack-connection/compare/v${old}...v${new}" }, "branch-alias": { - "dev-trunk": "6.1.x-dev" + "dev-trunk": "6.2.x-dev" }, "dependencies": { "test-only": [ @@ -627,7 +627,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-constants", - "reference": "6723563658991bc9ef6065c01d032278baf7c503" + "reference": "d04731a8a4cbaaa339bd2003f8679a5fccf24fd7" }, "require": { "php": ">=7.2" @@ -684,7 +684,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-device-detection", - "reference": "005d54c53bdb8bae49979f7b1e4926b979a1a118" + "reference": "e5bb6d4bf12e815e0cf481ac06c518003c2fbc6d" }, "require": { "php": ">=7.2" @@ -740,7 +740,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-google-analytics", - "reference": "7937d1c23cbe01472118a0810dadd55ca529290d" + "reference": "ae3cbbfad32eecb29bc53f624f3227d2d6ef2e7b" }, "require": { "automattic/jetpack-status": "^5.0.1", @@ -814,7 +814,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-ip", - "reference": "b235e186c96c7d8d570043e1e96b848866382e3c" + "reference": "cd2b781cb05ce281deea5ee1dc67356d6f3dac64" }, "require": { "php": ">=7.2" @@ -875,12 +875,12 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-jitm", - "reference": "4a486df49714411f25a669669304d3bf2c6141a8" + "reference": "cd35bedd992efe2275cc94bc0e1accbc3a89c8e1" }, "require": { "automattic/jetpack-a8c-mc-stats": "^3.0.0", "automattic/jetpack-assets": "^4.0.1", - "automattic/jetpack-connection": "^6.1.1", + "automattic/jetpack-connection": "^6.2.0-alpha", "automattic/jetpack-device-detection": "^3.0.0", "automattic/jetpack-logo": "^3.0.0", "automattic/jetpack-redirect": "^3.0.1", @@ -953,7 +953,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-logo", - "reference": "a42aa640babc91f5fbf9f5f6afbc152bb4645e9b" + "reference": "54d31f11d08501efa36fda3df40116485e373218" }, "require": { "php": ">=7.2" @@ -1009,13 +1009,13 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-masterbar", - "reference": "d1d7f51977c9c09a2f96124a229c713cd1f83b5d" + "reference": "41b5a410af7644d5b0b55ca27660efdd0889f8d6" }, "require": { "automattic/jetpack-assets": "^4.0.1", "automattic/jetpack-blaze": "^0.25.3", "automattic/jetpack-compat": "^4.0.0", - "automattic/jetpack-connection": "^6.1.1", + "automattic/jetpack-connection": "^6.2.0-alpha", "automattic/jetpack-device-detection": "^3.0.0", "automattic/jetpack-jitm": "^4.0.2", "automattic/jetpack-logo": "^3.0.0", @@ -1095,7 +1095,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-mu-wpcom", - "reference": "e1703107f39dcad1eb33c16f0433628c263f2432" + "reference": "6dd5c202b8e57540419dac122626113e9157b1c3" }, "require": { "automattic/jetpack-assets": "^4.0.1", @@ -1103,7 +1103,7 @@ "automattic/jetpack-calypsoify": "^0.2.0", "automattic/jetpack-classic-theme-helper": "^0.7.3", "automattic/jetpack-compat": "^4.0.0", - "automattic/jetpack-connection": "^6.1.1", + "automattic/jetpack-connection": "^6.2.0-alpha", "automattic/jetpack-google-analytics": "^0.3.0", "automattic/jetpack-masterbar": "^0.10.2", "automattic/jetpack-redirect": "^3.0.1", @@ -1181,7 +1181,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-password-checker", - "reference": "485b0317a790253dda16042160fca5cc51f2c04e" + "reference": "d128ff6dd3ac134df48f5112a0b981ca0e7f0199" }, "require": { "php": ">=7.2" @@ -1245,10 +1245,10 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-plans", - "reference": "6f1bbf9dda5dafdc85943467e5359a34da27d9c8" + "reference": "821cde09524fda53aa1e5fde394f112a1f83abeb" }, "require": { - "automattic/jetpack-connection": "^6.1.1", + "automattic/jetpack-connection": "^6.2.0-alpha", "php": ">=7.2" }, "require-dev": { @@ -1316,7 +1316,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-redirect", - "reference": "3d5938af9bdd1dd7e2ec6898ba6f004d843cd87f" + "reference": "8700dfa0de741d3081c1b12790327c05b3bc9566" }, "require": { "automattic/jetpack-status": "^5.0.1", @@ -1374,7 +1374,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-roles", - "reference": "519c89097fe40365928b1fbaaf5aa202e8019cee" + "reference": "83483153144838f453f660692fc23541068c8bda" }, "require": { "php": ">=7.2" @@ -1431,10 +1431,10 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-stats", - "reference": "750a0de8bf73f4a85c0b250d52952cf5e01c56a4" + "reference": "6829daa833bdf5e9380008e887c01ddfc2e7eb3f" }, "require": { - "automattic/jetpack-connection": "^6.1.1", + "automattic/jetpack-connection": "^6.2.0-alpha", "automattic/jetpack-constants": "^3.0.1", "automattic/jetpack-status": "^5.0.1", "php": ">=7.2" @@ -1501,10 +1501,10 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-stats-admin", - "reference": "aec61fe00130103d51df985d147e6c7a04c824f4" + "reference": "1ba3a684ec6f34dd2486a9ffca9acb65ac92eaa9" }, "require": { - "automattic/jetpack-connection": "^6.1.1", + "automattic/jetpack-connection": "^6.2.0-alpha", "automattic/jetpack-constants": "^3.0.1", "automattic/jetpack-jitm": "^4.0.2", "automattic/jetpack-plans": "^0.5.1", @@ -1577,7 +1577,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-status", - "reference": "c6849975dfbbaf419a9d1507879f2ef059a086d0" + "reference": "e20128cce903f0ac0f4d8da33d8992b1ba3e1956" }, "require": { "automattic/jetpack-constants": "^3.0.1", @@ -1644,10 +1644,10 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-sync", - "reference": "474dfb8b3759981ac686b77ffc89ab8ac1e26ef8" + "reference": "090c528d9ac9dfcbff93730f705f588960925ecc" }, "require": { - "automattic/jetpack-connection": "^6.1.1", + "automattic/jetpack-connection": "^6.2.0-alpha", "automattic/jetpack-constants": "^3.0.1", "automattic/jetpack-ip": "^0.4.1", "automattic/jetpack-password-checker": "^0.4.1", @@ -1725,10 +1725,10 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/scheduled-updates", - "reference": "59663e5d3561848c65f4bef10f51e61a9a5fb509" + "reference": "a65bc8da41584e5e4b5c1ecd58cc9217ccc53489" }, "require": { - "automattic/jetpack-connection": "^6.1.1", + "automattic/jetpack-connection": "^6.2.0-alpha", "automattic/jetpack-constants": "^3.0.1", "automattic/jetpack-plans": "^0.5.1", "automattic/jetpack-status": "^5.0.1", diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php index 9c0c80d9..67e7d645 100644 --- a/vendor/composer/installed.php +++ b/vendor/composer/installed.php @@ -13,7 +13,7 @@ 'automattic/jetpack-a8c-mc-stats' => array( 'pretty_version' => '3.0.0', 'version' => '3.0.0.0', - 'reference' => '7c2f9fb72b6f75fe2ab1de8ef8eb0f45956c67d9', + 'reference' => 'c0169c23e4c21755a138efac391ed3d2fc26c5e2', '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.5.1', 'version' => '0.5.1.0', - 'reference' => '83f23ca1a1b1ef31223b4e569c3b446b93564a04', + 'reference' => '179a25d3c8552b6d66da81975db0f744d959a47d', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-admin-ui', 'aliases' => array(), @@ -31,7 +31,7 @@ 'automattic/jetpack-assets' => array( 'pretty_version' => '4.0.1', 'version' => '4.0.1.0', - 'reference' => '2c07813259092b972d94c28d82a4198e9b92d73b', + 'reference' => '6e730270be8dd9b5cbced1f171403ea3794ab246', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-assets', 'aliases' => array(), @@ -40,7 +40,7 @@ 'automattic/jetpack-blaze' => array( 'pretty_version' => '0.25.3', 'version' => '0.25.3.0', - 'reference' => 'e7cfb0def8a1c3b480c8ccdd600a4deedf893dd6', + 'reference' => '95408b824658ddc439cb4cd0ac97b5df5c16dccf', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-blaze', 'aliases' => array(), @@ -49,7 +49,7 @@ 'automattic/jetpack-blocks' => array( 'pretty_version' => '3.0.1', 'version' => '3.0.1.0', - 'reference' => 'e72ba57209d6e5bb41440cdff3769d043d1c080f', + 'reference' => 'a4c1051c6f84c319b7f2ea536e8c2c4fd76e8ae3', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-blocks', 'aliases' => array(), @@ -58,7 +58,7 @@ 'automattic/jetpack-calypsoify' => array( 'pretty_version' => '0.2.0', 'version' => '0.2.0.0', - 'reference' => '4e3c05cc21d47f0ca75e198569d82a0a2f924067', + 'reference' => 'dd9a74102b013abe64919213660237b693f8e20b', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-calypsoify', 'aliases' => array(), @@ -67,7 +67,7 @@ 'automattic/jetpack-classic-theme-helper' => array( 'pretty_version' => '0.7.3', 'version' => '0.7.3.0', - 'reference' => '68142c0e08497d1afffd46e5026e01b17a86f2f1', + 'reference' => 'c82ceddf2f9c002b552194de46db67af10ce0cc6', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-classic-theme-helper', 'aliases' => array(), @@ -76,16 +76,16 @@ 'automattic/jetpack-compat' => array( 'pretty_version' => '4.0.0', 'version' => '4.0.0.0', - 'reference' => '9ee104e74b127e13e3cd5096de9c3ea3de82dd7f', + 'reference' => '38aed27bb346772bb454eb1b764f2cfb211efb15', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-compat', 'aliases' => array(), 'dev_requirement' => false, ), 'automattic/jetpack-connection' => array( - 'pretty_version' => '6.1.1', - 'version' => '6.1.1.0', - 'reference' => '9d078c81af2c46c5cd1360b3684ea783e4e890f2', + 'pretty_version' => '6.2.0-alpha.1733428152', + 'version' => '6.2.0.0-alpha1733428152', + 'reference' => 'f5c321d85494b4bdf3aa31d2610040f9ffc07244', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-connection', 'aliases' => array(), @@ -94,7 +94,7 @@ 'automattic/jetpack-constants' => array( 'pretty_version' => '3.0.1', 'version' => '3.0.1.0', - 'reference' => '6723563658991bc9ef6065c01d032278baf7c503', + 'reference' => 'd04731a8a4cbaaa339bd2003f8679a5fccf24fd7', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-constants', 'aliases' => array(), @@ -103,7 +103,7 @@ 'automattic/jetpack-device-detection' => array( 'pretty_version' => '3.0.0', 'version' => '3.0.0.0', - 'reference' => '005d54c53bdb8bae49979f7b1e4926b979a1a118', + 'reference' => 'e5bb6d4bf12e815e0cf481ac06c518003c2fbc6d', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-device-detection', 'aliases' => array(), @@ -112,7 +112,7 @@ 'automattic/jetpack-google-analytics' => array( 'pretty_version' => '0.3.0', 'version' => '0.3.0.0', - 'reference' => '7937d1c23cbe01472118a0810dadd55ca529290d', + 'reference' => 'ae3cbbfad32eecb29bc53f624f3227d2d6ef2e7b', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-google-analytics', 'aliases' => array(), @@ -121,7 +121,7 @@ 'automattic/jetpack-ip' => array( 'pretty_version' => '0.4.1', 'version' => '0.4.1.0', - 'reference' => 'b235e186c96c7d8d570043e1e96b848866382e3c', + 'reference' => 'cd2b781cb05ce281deea5ee1dc67356d6f3dac64', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-ip', 'aliases' => array(), @@ -130,7 +130,7 @@ 'automattic/jetpack-jitm' => array( 'pretty_version' => '4.0.2', 'version' => '4.0.2.0', - 'reference' => '4a486df49714411f25a669669304d3bf2c6141a8', + 'reference' => 'cd35bedd992efe2275cc94bc0e1accbc3a89c8e1', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-jitm', 'aliases' => array(), @@ -139,7 +139,7 @@ 'automattic/jetpack-logo' => array( 'pretty_version' => '3.0.0', 'version' => '3.0.0.0', - 'reference' => 'a42aa640babc91f5fbf9f5f6afbc152bb4645e9b', + 'reference' => '54d31f11d08501efa36fda3df40116485e373218', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-logo', 'aliases' => array(), @@ -148,7 +148,7 @@ 'automattic/jetpack-masterbar' => array( 'pretty_version' => '0.10.2', 'version' => '0.10.2.0', - 'reference' => 'd1d7f51977c9c09a2f96124a229c713cd1f83b5d', + 'reference' => '41b5a410af7644d5b0b55ca27660efdd0889f8d6', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-masterbar', 'aliases' => array(), @@ -157,7 +157,7 @@ 'automattic/jetpack-mu-wpcom' => array( 'pretty_version' => '6.0.1-alpha.1733412256', 'version' => '6.0.1.0-alpha1733412256', - 'reference' => 'e1703107f39dcad1eb33c16f0433628c263f2432', + 'reference' => '6dd5c202b8e57540419dac122626113e9157b1c3', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-mu-wpcom', 'aliases' => array(), @@ -175,7 +175,7 @@ 'automattic/jetpack-password-checker' => array( 'pretty_version' => '0.4.1', 'version' => '0.4.1.0', - 'reference' => '485b0317a790253dda16042160fca5cc51f2c04e', + 'reference' => 'd128ff6dd3ac134df48f5112a0b981ca0e7f0199', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-password-checker', 'aliases' => array(), @@ -184,7 +184,7 @@ 'automattic/jetpack-plans' => array( 'pretty_version' => '0.5.1', 'version' => '0.5.1.0', - 'reference' => '6f1bbf9dda5dafdc85943467e5359a34da27d9c8', + 'reference' => '821cde09524fda53aa1e5fde394f112a1f83abeb', 'type' => 'library', 'install_path' => __DIR__ . '/../automattic/jetpack-plans', 'aliases' => array(), @@ -193,7 +193,7 @@ 'automattic/jetpack-redirect' => array( 'pretty_version' => '3.0.1', 'version' => '3.0.1.0', - 'reference' => '3d5938af9bdd1dd7e2ec6898ba6f004d843cd87f', + 'reference' => '8700dfa0de741d3081c1b12790327c05b3bc9566', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-redirect', 'aliases' => array(), @@ -202,7 +202,7 @@ 'automattic/jetpack-roles' => array( 'pretty_version' => '3.0.1', 'version' => '3.0.1.0', - 'reference' => '519c89097fe40365928b1fbaaf5aa202e8019cee', + 'reference' => '83483153144838f453f660692fc23541068c8bda', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-roles', 'aliases' => array(), @@ -211,7 +211,7 @@ 'automattic/jetpack-stats' => array( 'pretty_version' => '0.14.1', 'version' => '0.14.1.0', - 'reference' => '750a0de8bf73f4a85c0b250d52952cf5e01c56a4', + 'reference' => '6829daa833bdf5e9380008e887c01ddfc2e7eb3f', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-stats', 'aliases' => array(), @@ -220,7 +220,7 @@ 'automattic/jetpack-stats-admin' => array( 'pretty_version' => '0.23.1', 'version' => '0.23.1.0', - 'reference' => 'aec61fe00130103d51df985d147e6c7a04c824f4', + 'reference' => '1ba3a684ec6f34dd2486a9ffca9acb65ac92eaa9', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-stats-admin', 'aliases' => array(), @@ -229,7 +229,7 @@ 'automattic/jetpack-status' => array( 'pretty_version' => '5.0.1', 'version' => '5.0.1.0', - 'reference' => 'c6849975dfbbaf419a9d1507879f2ef059a086d0', + 'reference' => 'e20128cce903f0ac0f4d8da33d8992b1ba3e1956', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-status', 'aliases' => array(), @@ -238,7 +238,7 @@ 'automattic/jetpack-sync' => array( 'pretty_version' => '4.0.2', 'version' => '4.0.2.0', - 'reference' => '474dfb8b3759981ac686b77ffc89ab8ac1e26ef8', + 'reference' => '090c528d9ac9dfcbff93730f705f588960925ecc', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-sync', 'aliases' => array(), @@ -247,7 +247,7 @@ 'automattic/scheduled-updates' => array( 'pretty_version' => '0.14.0', 'version' => '0.14.0.0', - 'reference' => '59663e5d3561848c65f4bef10f51e61a9a5fb509', + 'reference' => 'a65bc8da41584e5e4b5c1ecd58cc9217ccc53489', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/scheduled-updates', 'aliases' => array(),