From 40e1a8e4a6c873149797028bd7f5e5097184f37e Mon Sep 17 00:00:00 2001 From: sergeymitr Date: Fri, 15 Nov 2024 16:10:32 +0000 Subject: [PATCH] Connection: work around a WP user caching bug (#40188) WP bug #62003 leads to inconsistent format of cached user data in certain circumstances. It happens if only one field gets fetched from the database, so we add ID to work around the issue. Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/11859369283 Upstream-Ref: Automattic/jetpack@cd03f868144b99ae0a8767bcd217630ba3e4da27 --- composer.lock | 76 +++++++++---------- vendor/automattic/jetpack-blaze/composer.json | 2 +- .../jetpack-connection/CHANGELOG.md | 8 ++ .../jetpack-connection/src/class-manager.php | 7 +- .../src/class-package-version.php | 2 +- vendor/automattic/jetpack-jitm/composer.json | 2 +- .../jetpack-masterbar/composer.json | 2 +- .../automattic/jetpack-mu-wpcom/composer.json | 2 +- vendor/automattic/jetpack-plans/composer.json | 2 +- .../jetpack-stats-admin/composer.json | 2 +- vendor/automattic/jetpack-stats/composer.json | 2 +- vendor/automattic/jetpack-sync/composer.json | 2 +- .../scheduled-updates/composer.json | 2 +- vendor/composer/installed.json | 74 +++++++++--------- vendor/composer/installed.php | 56 +++++++------- 15 files changed, 127 insertions(+), 114 deletions(-) diff --git a/composer.lock b/composer.lock index 37f0ba40..d5ab70a9 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": "a6b70f4bb1fd1d7812339b95ee551456", + "content-hash": "c449298eaea06a026ecd324c6c3ac2a3", "packages": [ { "name": "automattic/jetpack-a8c-mc-stats", @@ -12,7 +12,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-a8c-mc-stats", - "reference": "941f9c768648b27334225172595db1647cd7da68" + "reference": "ca3e2c2c4b93c2738cb32ef8b6f5939fb1de52f1" }, "require": { "php": ">=7.2" @@ -65,7 +65,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-admin-ui", - "reference": "3071691c3e32938298b85d2582ed5ca21147b262" + "reference": "6307633e2d67ac966f302c10f3300a444461cea3" }, "require": { "php": ">=7.2" @@ -130,7 +130,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-assets", - "reference": "e88f50b3fea9c7cd9fde8969b1e9148a6b70d752" + "reference": "4bbe7904311e7819bfbec67704af2e28f639b8cb" }, "require": { "automattic/jetpack-constants": "^3.0.0", @@ -199,11 +199,11 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-blaze", - "reference": "6ebb9b61c5c6b0cedd5f123f36453340aec5eb9c" + "reference": "0f0783ed4c18e27300fea8d2b85aa372a1ec6d15" }, "require": { "automattic/jetpack-assets": "^3.0.0", - "automattic/jetpack-connection": "^6.0.0", + "automattic/jetpack-connection": "^6.0.1-alpha", "automattic/jetpack-constants": "^3.0.0", "automattic/jetpack-plans": "^0.5.0", "automattic/jetpack-redirect": "^3.0.0", @@ -280,7 +280,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-blocks", - "reference": "fe6f20389f971ad52d31ba11d48d716fa3b6ab35" + "reference": "4a725380596b75ac60f077108bacfab099f0e8a4" }, "require": { "automattic/jetpack-constants": "^3.0.0", @@ -342,7 +342,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-calypsoify", - "reference": "c4fa6a69c93a47e05acd7404c07cb0d84053b22d" + "reference": "9089f4cab142cf66ced3d27f9b6bd611028b2a16" }, "require": { "automattic/jetpack-assets": "^3.0.0", @@ -407,7 +407,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-classic-theme-helper", - "reference": "1ce8afdbf52548eb31b7729e1bf267f2e6f12c0f" + "reference": "1a91322aa020188a2182841291862f4b5693e5c2" }, "require": { "automattic/jetpack-assets": "^3.0.0", @@ -478,7 +478,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-compat", - "reference": "2c0a4154c913f8591306cfbd5829cfca6ac4e7eb" + "reference": "3133155c5a5fc2b2be0c9448fd8c4377b54d5d35" }, "require": { "php": ">=7.2" @@ -511,11 +511,11 @@ }, { "name": "automattic/jetpack-connection", - "version": "6.0.0", + "version": "6.0.1-alpha.1731686094", "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-connection", - "reference": "9b1836f3902bf40fa17a616b691dd98276121308" + "reference": "b48578699932aa25b524f56249ec12f554730155" }, "require": { "automattic/jetpack-a8c-mc-stats": "^3.0.0", @@ -605,7 +605,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-constants", - "reference": "d40e286f482346751c09c87980300363ad70b821" + "reference": "3de7a1a7f10c6f12c2e183c4ed81b18fdb575239" }, "require": { "php": ">=7.2" @@ -659,7 +659,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-device-detection", - "reference": "77e28e07ed7d0252e60552d0299decd21a51fa86" + "reference": "66c7506a586dbe1bd8aa6a01b3220e766d4a9c94" }, "require": { "php": ">=7.2" @@ -712,7 +712,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-google-analytics", - "reference": "e702bf9750621096ce2717511113a83d1b45f4de" + "reference": "a589142e30490dd2864f87d4f0b22a17b1b5b82f" }, "require": { "automattic/jetpack-status": "^5.0.0", @@ -783,7 +783,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-ip", - "reference": "49220fdff9b3c8c5f03231f8df69c4496def8ea3" + "reference": "0a5cd702d1117e2d2dd9c2e9f2fa184badf504ac" }, "require": { "php": ">=7.2" @@ -841,12 +841,12 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-jitm", - "reference": "09b817fb8a82c9ffbe9214bf05af7ec020edac5a" + "reference": "84fbe4b1d76cb64ab2cf4f54c708518247d8ffc7" }, "require": { "automattic/jetpack-a8c-mc-stats": "^3.0.0", "automattic/jetpack-assets": "^3.0.0", - "automattic/jetpack-connection": "^6.0.0", + "automattic/jetpack-connection": "^6.0.1-alpha", "automattic/jetpack-device-detection": "^3.0.0", "automattic/jetpack-logo": "^3.0.0", "automattic/jetpack-redirect": "^3.0.0", @@ -916,7 +916,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-logo", - "reference": "8b19d9f384ce169c832ca71a5e8b5e5912964dbd" + "reference": "49daeadaa84c230b742f60aa41b2ed8448d47ff8" }, "require": { "php": ">=7.2" @@ -969,13 +969,13 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-masterbar", - "reference": "78bf26ea777482eb82f1681fa5d47f2fef07c134" + "reference": "9b2bd56ce4470ccef0368e016508613f98fbd0a0" }, "require": { "automattic/jetpack-assets": "^3.0.0", "automattic/jetpack-blaze": "^0.25.0-alpha", "automattic/jetpack-compat": "^4.0.0-alpha", - "automattic/jetpack-connection": "^6.0.0", + "automattic/jetpack-connection": "^6.0.1-alpha", "automattic/jetpack-device-detection": "^3.0.0", "automattic/jetpack-jitm": "^4.0.0", "automattic/jetpack-logo": "^3.0.0", @@ -1052,7 +1052,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-mu-wpcom", - "reference": "9ba52808ce94d6f564960f96f65f89b1ec193a4d" + "reference": "c91faa2aa4c4e5eb0279e5b092b3027a0749ca72" }, "require": { "automattic/jetpack-assets": "^3.0.0", @@ -1060,7 +1060,7 @@ "automattic/jetpack-calypsoify": "^0.2.0-alpha", "automattic/jetpack-classic-theme-helper": "^0.7.0-alpha", "automattic/jetpack-compat": "^4.0.0-alpha", - "automattic/jetpack-connection": "^6.0.0", + "automattic/jetpack-connection": "^6.0.1-alpha", "automattic/jetpack-google-analytics": "^0.3.0-alpha", "automattic/jetpack-masterbar": "^0.10.0-alpha", "automattic/jetpack-redirect": "^3.0.0", @@ -1135,7 +1135,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-password-checker", - "reference": "cd1b1f113f75189f7223a59fd96d5e6c85e6be97" + "reference": "57016ba041651e2f2dc1605e58bc44232fd0a0b1" }, "require": { "php": ">=7.2" @@ -1196,10 +1196,10 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-plans", - "reference": "5a0aa540583edfa596f77ad3acb5632af88947d0" + "reference": "0f973225ffc00d0f244163fe6680302ecfc71269" }, "require": { - "automattic/jetpack-connection": "^6.0.0", + "automattic/jetpack-connection": "^6.0.1-alpha", "php": ">=7.2" }, "require-dev": { @@ -1264,7 +1264,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-redirect", - "reference": "97f1dce869e8cf89c6361117120b457938c46efa" + "reference": "0111b8201fdd6b9bb1d64b7a935765f9d04216b4" }, "require": { "automattic/jetpack-status": "^5.0.0", @@ -1319,7 +1319,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-roles", - "reference": "99dc186b9c1c8c437794d4ff08f8509ffe3dc039" + "reference": "45d51c06f286dbbd017a08ab754d2e1420ef3e1c" }, "require": { "php": ">=7.2" @@ -1373,10 +1373,10 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-stats", - "reference": "496f7b5faeee86b0d1d48c385ace3e1541fc4571" + "reference": "63c1e12a0867e0fe9d46818cf29b5d9fdb4215c3" }, "require": { - "automattic/jetpack-connection": "^6.0.0", + "automattic/jetpack-connection": "^6.0.1-alpha", "automattic/jetpack-constants": "^3.0.0", "automattic/jetpack-status": "^5.0.0", "php": ">=7.2" @@ -1440,10 +1440,10 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-stats-admin", - "reference": "bca3eaa26c587343c166ebb88079bc358c1db246" + "reference": "4392cdeb4b9ae6968c65a4a3985cb5e30d6fe1ba" }, "require": { - "automattic/jetpack-connection": "^6.0.0", + "automattic/jetpack-connection": "^6.0.1-alpha", "automattic/jetpack-constants": "^3.0.0", "automattic/jetpack-jitm": "^4.0.0", "automattic/jetpack-plans": "^0.5.0", @@ -1513,7 +1513,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-status", - "reference": "097740403ba230d081e6edb7e2271d1c221d9527" + "reference": "f23558dca1003f21636a59b7fa7e4a0a1e608aa5" }, "require": { "automattic/jetpack-constants": "^3.0.0", @@ -1577,10 +1577,10 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-sync", - "reference": "e65230909793325323efdc0d33383dedecc83a3e" + "reference": "d28fc947ffbad6c521e77c4a5ee094328ae33dfb" }, "require": { - "automattic/jetpack-connection": "^6.0.0", + "automattic/jetpack-connection": "^6.0.1-alpha", "automattic/jetpack-constants": "^3.0.0", "automattic/jetpack-ip": "^0.4.0", "automattic/jetpack-password-checker": "^0.4.0", @@ -1655,10 +1655,10 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/scheduled-updates", - "reference": "9ff311cb25bd5ab4958706c6935359e8c221131d" + "reference": "0fccec1b75cf085a5f8a82e89c7c2f7a38ee708e" }, "require": { - "automattic/jetpack-connection": "^6.0.0", + "automattic/jetpack-connection": "^6.0.1-alpha", "automattic/jetpack-constants": "^3.0.0", "automattic/jetpack-plans": "^0.5.0", "automattic/jetpack-status": "^5.0.0", @@ -1807,7 +1807,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-changelogger", - "reference": "4c62867c98b06a20402e3c77cce247ca0f4143ee" + "reference": "2ccbbf2c09b652c47879db2ee897f4fda9a8d8f5" }, "require": { "php": ">=7.2", diff --git a/vendor/automattic/jetpack-blaze/composer.json b/vendor/automattic/jetpack-blaze/composer.json index 089061d7..8cc5881d 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": "^3.0.0", - "automattic/jetpack-connection": "^6.0.0", + "automattic/jetpack-connection": "^6.0.1-alpha", "automattic/jetpack-constants": "^3.0.0", "automattic/jetpack-plans": "^0.5.0", "automattic/jetpack-redirect": "^3.0.0", diff --git a/vendor/automattic/jetpack-connection/CHANGELOG.md b/vendor/automattic/jetpack-connection/CHANGELOG.md index 28c735fa..85475fbe 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.0.1-alpha] - unreleased + +This is an alpha version! The changes listed here are not final. + +### Fixed +- Work around a WP user caching bug (https://core.trac.wordpress.org/ticket/62003). + ## [6.0.0] - 2024-11-14 ### Removed - General: Update minimum PHP version to 7.2. [#40147] @@ -1247,6 +1254,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Separate the connection library into its own package. +[6.0.1-alpha]: https://github.com/Automattic/jetpack-connection/compare/v6.0.0...v6.0.1-alpha [6.0.0]: https://github.com/Automattic/jetpack-connection/compare/v5.1.7...v6.0.0 [5.1.7]: https://github.com/Automattic/jetpack-connection/compare/v5.1.6...v5.1.7 [5.1.6]: https://github.com/Automattic/jetpack-connection/compare/v5.1.5...v5.1.6 diff --git a/vendor/automattic/jetpack-connection/src/class-manager.php b/vendor/automattic/jetpack-connection/src/class-manager.php index 8783dbff..5d56946f 100644 --- a/vendor/automattic/jetpack-connection/src/class-manager.php +++ b/vendor/automattic/jetpack-connection/src/class-manager.php @@ -1620,12 +1620,17 @@ public function get_assumed_site_creation_date() { return $cached_date; } + /** + * We don't use the 'ID' field, but need it to overcome a WP caching bug: https://core.trac.wordpress.org/ticket/62003 + * + * @todo Remote the 'ID' field from users fetching when the issue is fixed and Jetpack-supported WP versions move beyond it. + */ $earliest_registered_users = get_users( array( 'role' => 'administrator', 'orderby' => 'user_registered', 'order' => 'ASC', - 'fields' => array( 'user_registered' ), + 'fields' => array( 'ID', 'user_registered' ), 'number' => 1, ) ); diff --git a/vendor/automattic/jetpack-connection/src/class-package-version.php b/vendor/automattic/jetpack-connection/src/class-package-version.php index eb7160bc..100faa96 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.0.0'; + const PACKAGE_VERSION = '6.0.1-alpha'; const PACKAGE_SLUG = 'connection'; diff --git a/vendor/automattic/jetpack-jitm/composer.json b/vendor/automattic/jetpack-jitm/composer.json index 080315c9..cbcdee35 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": "^3.0.0", - "automattic/jetpack-connection": "^6.0.0", + "automattic/jetpack-connection": "^6.0.1-alpha", "automattic/jetpack-device-detection": "^3.0.0", "automattic/jetpack-logo": "^3.0.0", "automattic/jetpack-redirect": "^3.0.0", diff --git a/vendor/automattic/jetpack-masterbar/composer.json b/vendor/automattic/jetpack-masterbar/composer.json index 954db786..362a2556 100644 --- a/vendor/automattic/jetpack-masterbar/composer.json +++ b/vendor/automattic/jetpack-masterbar/composer.json @@ -9,7 +9,7 @@ "automattic/jetpack-blaze": "^0.25.0-alpha", "automattic/jetpack-compat": "^4.0.0-alpha", "automattic/jetpack-device-detection": "^3.0.0", - "automattic/jetpack-connection": "^6.0.0", + "automattic/jetpack-connection": "^6.0.1-alpha", "automattic/jetpack-jitm": "^4.0.0", "automattic/jetpack-logo": "^3.0.0", "automattic/jetpack-plans": "^0.5.0", diff --git a/vendor/automattic/jetpack-mu-wpcom/composer.json b/vendor/automattic/jetpack-mu-wpcom/composer.json index 67d1d5ba..dec3c93c 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.0-alpha", "automattic/jetpack-calypsoify": "^0.2.0-alpha", "automattic/jetpack-classic-theme-helper": "^0.7.0-alpha", - "automattic/jetpack-connection": "^6.0.0", + "automattic/jetpack-connection": "^6.0.1-alpha", "automattic/jetpack-masterbar": "^0.10.0-alpha", "automattic/jetpack-redirect": "^3.0.0", "automattic/jetpack-stats-admin": "^0.23.0-alpha", diff --git a/vendor/automattic/jetpack-plans/composer.json b/vendor/automattic/jetpack-plans/composer.json index 2887da04..46449f88 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.0.0" + "automattic/jetpack-connection": "^6.0.1-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 7a9fa8dc..67324c22 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.0.0", + "automattic/jetpack-connection": "^6.0.1-alpha", "automattic/jetpack-constants": "^3.0.0", "automattic/jetpack-plans": "^0.5.0", "automattic/jetpack-stats": "^0.14.0-alpha", diff --git a/vendor/automattic/jetpack-stats/composer.json b/vendor/automattic/jetpack-stats/composer.json index 54b339c8..22c5360d 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.0.0", + "automattic/jetpack-connection": "^6.0.1-alpha", "automattic/jetpack-constants": "^3.0.0", "automattic/jetpack-status": "^5.0.0" }, diff --git a/vendor/automattic/jetpack-sync/composer.json b/vendor/automattic/jetpack-sync/composer.json index a847e90d..89beb0be 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.0.0", + "automattic/jetpack-connection": "^6.0.1-alpha", "automattic/jetpack-constants": "^3.0.0", "automattic/jetpack-password-checker": "^0.4.0", "automattic/jetpack-ip": "^0.4.0", diff --git a/vendor/automattic/scheduled-updates/composer.json b/vendor/automattic/scheduled-updates/composer.json index d844b09e..5cd854f3 100644 --- a/vendor/automattic/scheduled-updates/composer.json +++ b/vendor/automattic/scheduled-updates/composer.json @@ -9,7 +9,7 @@ "automattic/jetpack-sync": "^4.0.0", "automattic/jetpack-plans": "^0.5.0", "automattic/jetpack-constants": "^3.0.0", - "automattic/jetpack-connection": "^6.0.0" + "automattic/jetpack-connection": "^6.0.1-alpha" }, "require-dev": { "yoast/phpunit-polyfills": "^1.1.1", diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index ce2d36ad..7c991ad1 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": "941f9c768648b27334225172595db1647cd7da68" + "reference": "ca3e2c2c4b93c2738cb32ef8b6f5939fb1de52f1" }, "require": { "php": ">=7.2" @@ -63,7 +63,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-admin-ui", - "reference": "3071691c3e32938298b85d2582ed5ca21147b262" + "reference": "6307633e2d67ac966f302c10f3300a444461cea3" }, "require": { "php": ">=7.2" @@ -131,7 +131,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-assets", - "reference": "e88f50b3fea9c7cd9fde8969b1e9148a6b70d752" + "reference": "4bbe7904311e7819bfbec67704af2e28f639b8cb" }, "require": { "automattic/jetpack-constants": "^3.0.0", @@ -203,11 +203,11 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-blaze", - "reference": "6ebb9b61c5c6b0cedd5f123f36453340aec5eb9c" + "reference": "0f0783ed4c18e27300fea8d2b85aa372a1ec6d15" }, "require": { "automattic/jetpack-assets": "^3.0.0", - "automattic/jetpack-connection": "^6.0.0", + "automattic/jetpack-connection": "^6.0.1-alpha", "automattic/jetpack-constants": "^3.0.0", "automattic/jetpack-plans": "^0.5.0", "automattic/jetpack-redirect": "^3.0.0", @@ -287,7 +287,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-blocks", - "reference": "fe6f20389f971ad52d31ba11d48d716fa3b6ab35" + "reference": "4a725380596b75ac60f077108bacfab099f0e8a4" }, "require": { "automattic/jetpack-constants": "^3.0.0", @@ -352,7 +352,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-calypsoify", - "reference": "c4fa6a69c93a47e05acd7404c07cb0d84053b22d" + "reference": "9089f4cab142cf66ced3d27f9b6bd611028b2a16" }, "require": { "automattic/jetpack-assets": "^3.0.0", @@ -420,7 +420,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-classic-theme-helper", - "reference": "1ce8afdbf52548eb31b7729e1bf267f2e6f12c0f" + "reference": "1a91322aa020188a2182841291862f4b5693e5c2" }, "require": { "automattic/jetpack-assets": "^3.0.0", @@ -494,7 +494,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-compat", - "reference": "2c0a4154c913f8591306cfbd5829cfca6ac4e7eb" + "reference": "3133155c5a5fc2b2be0c9448fd8c4377b54d5d35" }, "require": { "php": ">=7.2" @@ -529,12 +529,12 @@ }, { "name": "automattic/jetpack-connection", - "version": "6.0.0", - "version_normalized": "6.0.0.0", + "version": "6.0.1-alpha.1731686094", + "version_normalized": "6.0.1.0-alpha1731686094", "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-connection", - "reference": "9b1836f3902bf40fa17a616b691dd98276121308" + "reference": "b48578699932aa25b524f56249ec12f554730155" }, "require": { "automattic/jetpack-a8c-mc-stats": "^3.0.0", @@ -627,7 +627,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-constants", - "reference": "d40e286f482346751c09c87980300363ad70b821" + "reference": "3de7a1a7f10c6f12c2e183c4ed81b18fdb575239" }, "require": { "php": ">=7.2" @@ -684,7 +684,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-device-detection", - "reference": "77e28e07ed7d0252e60552d0299decd21a51fa86" + "reference": "66c7506a586dbe1bd8aa6a01b3220e766d4a9c94" }, "require": { "php": ">=7.2" @@ -740,7 +740,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-google-analytics", - "reference": "e702bf9750621096ce2717511113a83d1b45f4de" + "reference": "a589142e30490dd2864f87d4f0b22a17b1b5b82f" }, "require": { "automattic/jetpack-status": "^5.0.0", @@ -814,7 +814,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-ip", - "reference": "49220fdff9b3c8c5f03231f8df69c4496def8ea3" + "reference": "0a5cd702d1117e2d2dd9c2e9f2fa184badf504ac" }, "require": { "php": ">=7.2" @@ -875,12 +875,12 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-jitm", - "reference": "09b817fb8a82c9ffbe9214bf05af7ec020edac5a" + "reference": "84fbe4b1d76cb64ab2cf4f54c708518247d8ffc7" }, "require": { "automattic/jetpack-a8c-mc-stats": "^3.0.0", "automattic/jetpack-assets": "^3.0.0", - "automattic/jetpack-connection": "^6.0.0", + "automattic/jetpack-connection": "^6.0.1-alpha", "automattic/jetpack-device-detection": "^3.0.0", "automattic/jetpack-logo": "^3.0.0", "automattic/jetpack-redirect": "^3.0.0", @@ -953,7 +953,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-logo", - "reference": "8b19d9f384ce169c832ca71a5e8b5e5912964dbd" + "reference": "49daeadaa84c230b742f60aa41b2ed8448d47ff8" }, "require": { "php": ">=7.2" @@ -1009,13 +1009,13 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-masterbar", - "reference": "78bf26ea777482eb82f1681fa5d47f2fef07c134" + "reference": "9b2bd56ce4470ccef0368e016508613f98fbd0a0" }, "require": { "automattic/jetpack-assets": "^3.0.0", "automattic/jetpack-blaze": "^0.25.0-alpha", "automattic/jetpack-compat": "^4.0.0-alpha", - "automattic/jetpack-connection": "^6.0.0", + "automattic/jetpack-connection": "^6.0.1-alpha", "automattic/jetpack-device-detection": "^3.0.0", "automattic/jetpack-jitm": "^4.0.0", "automattic/jetpack-logo": "^3.0.0", @@ -1095,7 +1095,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-mu-wpcom", - "reference": "9ba52808ce94d6f564960f96f65f89b1ec193a4d" + "reference": "c91faa2aa4c4e5eb0279e5b092b3027a0749ca72" }, "require": { "automattic/jetpack-assets": "^3.0.0", @@ -1103,7 +1103,7 @@ "automattic/jetpack-calypsoify": "^0.2.0-alpha", "automattic/jetpack-classic-theme-helper": "^0.7.0-alpha", "automattic/jetpack-compat": "^4.0.0-alpha", - "automattic/jetpack-connection": "^6.0.0", + "automattic/jetpack-connection": "^6.0.1-alpha", "automattic/jetpack-google-analytics": "^0.3.0-alpha", "automattic/jetpack-masterbar": "^0.10.0-alpha", "automattic/jetpack-redirect": "^3.0.0", @@ -1181,7 +1181,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-password-checker", - "reference": "cd1b1f113f75189f7223a59fd96d5e6c85e6be97" + "reference": "57016ba041651e2f2dc1605e58bc44232fd0a0b1" }, "require": { "php": ">=7.2" @@ -1245,10 +1245,10 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-plans", - "reference": "5a0aa540583edfa596f77ad3acb5632af88947d0" + "reference": "0f973225ffc00d0f244163fe6680302ecfc71269" }, "require": { - "automattic/jetpack-connection": "^6.0.0", + "automattic/jetpack-connection": "^6.0.1-alpha", "php": ">=7.2" }, "require-dev": { @@ -1316,7 +1316,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-redirect", - "reference": "97f1dce869e8cf89c6361117120b457938c46efa" + "reference": "0111b8201fdd6b9bb1d64b7a935765f9d04216b4" }, "require": { "automattic/jetpack-status": "^5.0.0", @@ -1374,7 +1374,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-roles", - "reference": "99dc186b9c1c8c437794d4ff08f8509ffe3dc039" + "reference": "45d51c06f286dbbd017a08ab754d2e1420ef3e1c" }, "require": { "php": ">=7.2" @@ -1431,10 +1431,10 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-stats", - "reference": "496f7b5faeee86b0d1d48c385ace3e1541fc4571" + "reference": "63c1e12a0867e0fe9d46818cf29b5d9fdb4215c3" }, "require": { - "automattic/jetpack-connection": "^6.0.0", + "automattic/jetpack-connection": "^6.0.1-alpha", "automattic/jetpack-constants": "^3.0.0", "automattic/jetpack-status": "^5.0.0", "php": ">=7.2" @@ -1501,10 +1501,10 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-stats-admin", - "reference": "bca3eaa26c587343c166ebb88079bc358c1db246" + "reference": "4392cdeb4b9ae6968c65a4a3985cb5e30d6fe1ba" }, "require": { - "automattic/jetpack-connection": "^6.0.0", + "automattic/jetpack-connection": "^6.0.1-alpha", "automattic/jetpack-constants": "^3.0.0", "automattic/jetpack-jitm": "^4.0.0", "automattic/jetpack-plans": "^0.5.0", @@ -1577,7 +1577,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-status", - "reference": "097740403ba230d081e6edb7e2271d1c221d9527" + "reference": "f23558dca1003f21636a59b7fa7e4a0a1e608aa5" }, "require": { "automattic/jetpack-constants": "^3.0.0", @@ -1644,10 +1644,10 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-sync", - "reference": "e65230909793325323efdc0d33383dedecc83a3e" + "reference": "d28fc947ffbad6c521e77c4a5ee094328ae33dfb" }, "require": { - "automattic/jetpack-connection": "^6.0.0", + "automattic/jetpack-connection": "^6.0.1-alpha", "automattic/jetpack-constants": "^3.0.0", "automattic/jetpack-ip": "^0.4.0", "automattic/jetpack-password-checker": "^0.4.0", @@ -1725,10 +1725,10 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/scheduled-updates", - "reference": "9ff311cb25bd5ab4958706c6935359e8c221131d" + "reference": "0fccec1b75cf085a5f8a82e89c7c2f7a38ee708e" }, "require": { - "automattic/jetpack-connection": "^6.0.0", + "automattic/jetpack-connection": "^6.0.1-alpha", "automattic/jetpack-constants": "^3.0.0", "automattic/jetpack-plans": "^0.5.0", "automattic/jetpack-status": "^5.0.0", diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php index 8f9196d2..c8e9b585 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' => '941f9c768648b27334225172595db1647cd7da68', + 'reference' => 'ca3e2c2c4b93c2738cb32ef8b6f5939fb1de52f1', '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.0', 'version' => '0.5.0.0', - 'reference' => '3071691c3e32938298b85d2582ed5ca21147b262', + 'reference' => '6307633e2d67ac966f302c10f3300a444461cea3', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-admin-ui', 'aliases' => array(), @@ -31,7 +31,7 @@ 'automattic/jetpack-assets' => array( 'pretty_version' => '3.0.0', 'version' => '3.0.0.0', - 'reference' => 'e88f50b3fea9c7cd9fde8969b1e9148a6b70d752', + 'reference' => '4bbe7904311e7819bfbec67704af2e28f639b8cb', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-assets', 'aliases' => array(), @@ -40,7 +40,7 @@ 'automattic/jetpack-blaze' => array( 'pretty_version' => '0.25.0-alpha.1731618182', 'version' => '0.25.0.0-alpha1731618182', - 'reference' => '6ebb9b61c5c6b0cedd5f123f36453340aec5eb9c', + 'reference' => '0f0783ed4c18e27300fea8d2b85aa372a1ec6d15', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-blaze', 'aliases' => array(), @@ -49,7 +49,7 @@ 'automattic/jetpack-blocks' => array( 'pretty_version' => '3.0.0-alpha.1731518828', 'version' => '3.0.0.0-alpha1731518828', - 'reference' => 'fe6f20389f971ad52d31ba11d48d716fa3b6ab35', + 'reference' => '4a725380596b75ac60f077108bacfab099f0e8a4', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-blocks', 'aliases' => array(), @@ -58,7 +58,7 @@ 'automattic/jetpack-calypsoify' => array( 'pretty_version' => '0.2.0-alpha.1731518828', 'version' => '0.2.0.0-alpha1731518828', - 'reference' => 'c4fa6a69c93a47e05acd7404c07cb0d84053b22d', + 'reference' => '9089f4cab142cf66ced3d27f9b6bd611028b2a16', '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.0-alpha.1731518828', 'version' => '0.7.0.0-alpha1731518828', - 'reference' => '1ce8afdbf52548eb31b7729e1bf267f2e6f12c0f', + 'reference' => '1a91322aa020188a2182841291862f4b5693e5c2', '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-alpha.1731518828', 'version' => '4.0.0.0-alpha1731518828', - 'reference' => '2c0a4154c913f8591306cfbd5829cfca6ac4e7eb', + 'reference' => '3133155c5a5fc2b2be0c9448fd8c4377b54d5d35', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-compat', 'aliases' => array(), 'dev_requirement' => false, ), 'automattic/jetpack-connection' => array( - 'pretty_version' => '6.0.0', - 'version' => '6.0.0.0', - 'reference' => '9b1836f3902bf40fa17a616b691dd98276121308', + 'pretty_version' => '6.0.1-alpha.1731686094', + 'version' => '6.0.1.0-alpha1731686094', + 'reference' => 'b48578699932aa25b524f56249ec12f554730155', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-connection', 'aliases' => array(), @@ -94,7 +94,7 @@ 'automattic/jetpack-constants' => array( 'pretty_version' => '3.0.0', 'version' => '3.0.0.0', - 'reference' => 'd40e286f482346751c09c87980300363ad70b821', + 'reference' => '3de7a1a7f10c6f12c2e183c4ed81b18fdb575239', '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' => '77e28e07ed7d0252e60552d0299decd21a51fa86', + 'reference' => '66c7506a586dbe1bd8aa6a01b3220e766d4a9c94', '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-alpha.1731518828', 'version' => '0.3.0.0-alpha1731518828', - 'reference' => 'e702bf9750621096ce2717511113a83d1b45f4de', + 'reference' => 'a589142e30490dd2864f87d4f0b22a17b1b5b82f', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-google-analytics', 'aliases' => array(), @@ -121,7 +121,7 @@ 'automattic/jetpack-ip' => array( 'pretty_version' => '0.4.0', 'version' => '0.4.0.0', - 'reference' => '49220fdff9b3c8c5f03231f8df69c4496def8ea3', + 'reference' => '0a5cd702d1117e2d2dd9c2e9f2fa184badf504ac', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-ip', 'aliases' => array(), @@ -130,7 +130,7 @@ 'automattic/jetpack-jitm' => array( 'pretty_version' => '4.0.0', 'version' => '4.0.0.0', - 'reference' => '09b817fb8a82c9ffbe9214bf05af7ec020edac5a', + 'reference' => '84fbe4b1d76cb64ab2cf4f54c708518247d8ffc7', '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' => '8b19d9f384ce169c832ca71a5e8b5e5912964dbd', + 'reference' => '49daeadaa84c230b742f60aa41b2ed8448d47ff8', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-logo', 'aliases' => array(), @@ -148,7 +148,7 @@ 'automattic/jetpack-masterbar' => array( 'pretty_version' => '0.10.0-alpha.1731518828', 'version' => '0.10.0.0-alpha1731518828', - 'reference' => '78bf26ea777482eb82f1681fa5d47f2fef07c134', + 'reference' => '9b2bd56ce4470ccef0368e016508613f98fbd0a0', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-masterbar', 'aliases' => array(), @@ -157,7 +157,7 @@ 'automattic/jetpack-mu-wpcom' => array( 'pretty_version' => '6.0.0-alpha.1731584637', 'version' => '6.0.0.0-alpha1731584637', - 'reference' => '9ba52808ce94d6f564960f96f65f89b1ec193a4d', + 'reference' => 'c91faa2aa4c4e5eb0279e5b092b3027a0749ca72', '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.0', 'version' => '0.4.0.0', - 'reference' => 'cd1b1f113f75189f7223a59fd96d5e6c85e6be97', + 'reference' => '57016ba041651e2f2dc1605e58bc44232fd0a0b1', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-password-checker', 'aliases' => array(), @@ -184,7 +184,7 @@ 'automattic/jetpack-plans' => array( 'pretty_version' => '0.5.0', 'version' => '0.5.0.0', - 'reference' => '5a0aa540583edfa596f77ad3acb5632af88947d0', + 'reference' => '0f973225ffc00d0f244163fe6680302ecfc71269', 'type' => 'library', 'install_path' => __DIR__ . '/../automattic/jetpack-plans', 'aliases' => array(), @@ -193,7 +193,7 @@ 'automattic/jetpack-redirect' => array( 'pretty_version' => '3.0.0', 'version' => '3.0.0.0', - 'reference' => '97f1dce869e8cf89c6361117120b457938c46efa', + 'reference' => '0111b8201fdd6b9bb1d64b7a935765f9d04216b4', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-redirect', 'aliases' => array(), @@ -202,7 +202,7 @@ 'automattic/jetpack-roles' => array( 'pretty_version' => '3.0.0', 'version' => '3.0.0.0', - 'reference' => '99dc186b9c1c8c437794d4ff08f8509ffe3dc039', + 'reference' => '45d51c06f286dbbd017a08ab754d2e1420ef3e1c', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-roles', 'aliases' => array(), @@ -211,7 +211,7 @@ 'automattic/jetpack-stats' => array( 'pretty_version' => '0.14.0-alpha.1731518828', 'version' => '0.14.0.0-alpha1731518828', - 'reference' => '496f7b5faeee86b0d1d48c385ace3e1541fc4571', + 'reference' => '63c1e12a0867e0fe9d46818cf29b5d9fdb4215c3', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-stats', 'aliases' => array(), @@ -220,7 +220,7 @@ 'automattic/jetpack-stats-admin' => array( 'pretty_version' => '0.23.0-alpha.1731518828', 'version' => '0.23.0.0-alpha1731518828', - 'reference' => 'bca3eaa26c587343c166ebb88079bc358c1db246', + 'reference' => '4392cdeb4b9ae6968c65a4a3985cb5e30d6fe1ba', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-stats-admin', 'aliases' => array(), @@ -229,7 +229,7 @@ 'automattic/jetpack-status' => array( 'pretty_version' => '5.0.0', 'version' => '5.0.0.0', - 'reference' => '097740403ba230d081e6edb7e2271d1c221d9527', + 'reference' => 'f23558dca1003f21636a59b7fa7e4a0a1e608aa5', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-status', 'aliases' => array(), @@ -238,7 +238,7 @@ 'automattic/jetpack-sync' => array( 'pretty_version' => '4.0.0', 'version' => '4.0.0.0', - 'reference' => 'e65230909793325323efdc0d33383dedecc83a3e', + 'reference' => 'd28fc947ffbad6c521e77c4a5ee094328ae33dfb', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-sync', 'aliases' => array(), @@ -247,7 +247,7 @@ 'automattic/scheduled-updates' => array( 'pretty_version' => '0.14.0-alpha.1731518828', 'version' => '0.14.0.0-alpha1731518828', - 'reference' => '9ff311cb25bd5ab4958706c6935359e8c221131d', + 'reference' => '0fccec1b75cf085a5f8a82e89c7c2f7a38ee708e', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/scheduled-updates', 'aliases' => array(),