From 73355ed6baf61f68efbc4588c79b8be35486baa5 Mon Sep 17 00:00:00 2001 From: fgiannar Date: Mon, 25 Nov 2024 12:14:07 +0000 Subject: [PATCH] Sync Checksums: Refactor checksum logic to allow 'jetpack_sync_checksum_allowed_tables' filter to work with audits (#40307) * Sync Checksums: Refactor checksum logic to allow 'jetpack_sync_checksum_allowed_tables' filter to work with audits Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/12009531617 Upstream-Ref: Automattic/jetpack@3c72eef1b98a58fcca9249dbd746195a1f79f6ce --- composer.lock | 58 ++++++------- .../jetpack-sync/src/class-replicastore.php | 85 +++---------------- .../src/replicastore/class-table-checksum.php | 29 ++++--- vendor/composer/installed.json | 56 ++++++------ vendor/composer/installed.php | 56 ++++++------ 5 files changed, 115 insertions(+), 169 deletions(-) diff --git a/composer.lock b/composer.lock index 732fb5e25..8e31869bc 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": "de629f0fe8e1a53f6ba6fd2b8003a33b", + "content-hash": "f60c37894d76efd31a9be7e193df5dc2", "packages": [ { "name": "automattic/jetpack-a8c-mc-stats", @@ -12,7 +12,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-a8c-mc-stats", - "reference": "65f6afaa79acbeeaaab6e79623d269568ea15c13" + "reference": "de55bbd1710be779df374c92eb83dd5ee6ad8c92" }, "require": { "php": ">=7.2" @@ -65,7 +65,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-admin-ui", - "reference": "8f8ee8bbee93561dd3ef2d4d499d4bf66970675d" + "reference": "c9e912d4782a8b508792dc439b7f7b16f6543eb4" }, "require": { "php": ">=7.2" @@ -130,7 +130,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-assets", - "reference": "a767533f1e10bc9fc801b76890000b21a6d4cd29" + "reference": "434d2e6f597acaab62d6f049ea5400030e7a4c04" }, "require": { "automattic/jetpack-constants": "^3.0.1-alpha", @@ -199,7 +199,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-blaze", - "reference": "fcc8fbbd6d0c01e3c6233cf1646deb253f59316a" + "reference": "d8c7f266b2c0645418f4fa50204e92f177b15507" }, "require": { "automattic/jetpack-assets": "^4.0.0-alpha", @@ -280,7 +280,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-blocks", - "reference": "6218512848bb2c1ff404026112767060c1be1deb" + "reference": "701ccd6a4b2ed6db490052f80eeca72b8c029c44" }, "require": { "automattic/jetpack-constants": "^3.0.1-alpha", @@ -342,7 +342,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-calypsoify", - "reference": "c812ce545f7bcebf3a8421e674405ace85958b4a" + "reference": "777db007a8ca18a27b86fb63acb495d44e10ef3e" }, "require": { "automattic/jetpack-assets": "^4.0.0-alpha", @@ -407,7 +407,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-classic-theme-helper", - "reference": "4d4d615b5dc5e4bff5ec0adbb52ce9320c249512" + "reference": "3e2343e6e03df83ff422bac8612868a3e3e8c86e" }, "require": { "automattic/jetpack-assets": "^4.0.0-alpha", @@ -478,7 +478,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-compat", - "reference": "c53965d030299b549b2be7d82651129a285926a6" + "reference": "c983dde3949f9c2c679e3311a478436eee70adb0" }, "require": { "php": ">=7.2" @@ -515,7 +515,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-connection", - "reference": "207dd9967a83ec34dde3cb4cd52683cff99a6c8b" + "reference": "806f4a0e54b12ac3994bc3c0aa23cb3eaef979b0" }, "require": { "automattic/jetpack-a8c-mc-stats": "^3.0.0", @@ -605,7 +605,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-constants", - "reference": "1a8ad4442d4cbe6a05d77dfc7424f64c541fad6e" + "reference": "d3fa2869657361307215892d5acf66bf2a9319b4" }, "require": { "php": ">=7.2" @@ -659,7 +659,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-device-detection", - "reference": "07165f734667445f371bc1f8c66514de5ad9a288" + "reference": "d15e6d06cd114afdfb36497d1f1eabebc419f5af" }, "require": { "php": ">=7.2" @@ -712,7 +712,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-google-analytics", - "reference": "bb1d8f99d56b92906be0e83110e63edd1d737832" + "reference": "c6d9752c4e5e82908efbe82aa37131652c915dca" }, "require": { "automattic/jetpack-status": "^5.0.1-alpha", @@ -783,7 +783,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-ip", - "reference": "1dae22442ddd9f4e7a83513546694c833a0a7f83" + "reference": "55c9e8cbfc7c5ab4ef4899b4643a5f94e38372e9" }, "require": { "php": ">=7.2" @@ -841,7 +841,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-jitm", - "reference": "016a382cb9cfab4c65b782dbb32feb4f001d0406" + "reference": "a2008417dbdd0bd64601c49812de073a6539eb51" }, "require": { "automattic/jetpack-a8c-mc-stats": "^3.0.0", @@ -916,7 +916,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-logo", - "reference": "7027ef425ac92fd4710cf07c25e71d88a2009c22" + "reference": "69270950337a69eae6ebfa871fa31a461e0f48da" }, "require": { "php": ">=7.2" @@ -969,7 +969,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-masterbar", - "reference": "66c71c9024f821cf286c443ab0d2b6081af7ebdc" + "reference": "4a2d7a76d79b0dc6c92190346b19ab2075a16f28" }, "require": { "automattic/jetpack-assets": "^4.0.0-alpha", @@ -1052,7 +1052,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-mu-wpcom", - "reference": "acd3cd49ad8fd61c1f463aae6211dae2238cbb5d" + "reference": "4a3f3b32fe717ae2c4b0e0096fc18aec62a6fc83" }, "require": { "automattic/jetpack-assets": "^4.0.0-alpha", @@ -1135,7 +1135,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-password-checker", - "reference": "e6b641ddb06c7f0637b2a6c6666d4ead3bc4fd01" + "reference": "d71e69d8c2343647fe1e2a5f0a7dc46f716bb012" }, "require": { "php": ">=7.2" @@ -1196,7 +1196,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-plans", - "reference": "e107eda703b10881de44a8f655b28d19ac2ed9c4" + "reference": "076b9821551259f1fb3c4b8d081f0c6145d3dfb9" }, "require": { "automattic/jetpack-connection": "^6.1.0-alpha", @@ -1264,7 +1264,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-redirect", - "reference": "e6905cbd7fb92e4eb9747d97172e2c35cd052b5a" + "reference": "867f235f75ea47a57f7ee7207bc541bfddb7860a" }, "require": { "automattic/jetpack-status": "^5.0.1-alpha", @@ -1319,7 +1319,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-roles", - "reference": "dd148c611c949b84bdc1d2a6574e821930d4ec10" + "reference": "176848b03fc881550e4ffef1fb1f43715753050e" }, "require": { "php": ">=7.2" @@ -1373,7 +1373,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-stats", - "reference": "348ab1a2dccfd4245b590377398d7c2bae3438af" + "reference": "277b74589867152801771fef84f485e16260ba03" }, "require": { "automattic/jetpack-connection": "^6.1.0-alpha", @@ -1440,7 +1440,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-stats-admin", - "reference": "54460bc5c61b49bab932bd0ab0e0b6f1306713c9" + "reference": "a207eba1cd483bc901091115609a82e1a1d4ff06" }, "require": { "automattic/jetpack-connection": "^6.1.0-alpha", @@ -1513,7 +1513,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-status", - "reference": "141ed6337f110207f0fa84924b6aa20dbc37220d" + "reference": "61b6a6ca17ad844a19270c1a26ad7dd9cd89731c" }, "require": { "automattic/jetpack-constants": "^3.0.1-alpha", @@ -1573,11 +1573,11 @@ }, { "name": "automattic/jetpack-sync", - "version": "4.0.1-alpha.1732217150", + "version": "4.0.1-alpha.1732535946", "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-sync", - "reference": "4aa51eed539d3088a3e0aed51d31a473b588c1f4" + "reference": "04a85859acc1abf1a5dce57dc2aa905b49f27ea9" }, "require": { "automattic/jetpack-connection": "^6.1.0-alpha", @@ -1655,7 +1655,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/scheduled-updates", - "reference": "d7dc154fab6f4d266c13e68fd536e69e2d7c2c66" + "reference": "6944c66c821956def98cc8ec5d820a96aff3e9f7" }, "require": { "automattic/jetpack-connection": "^6.1.0-alpha", @@ -1807,7 +1807,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-changelogger", - "reference": "4ab946b9659b44feb8e657130cf8ca7592d2a3be" + "reference": "da96a684ead638c1fd9f8af54225bdbf62f24622" }, "require": { "php": ">=7.2", diff --git a/vendor/automattic/jetpack-sync/src/class-replicastore.php b/vendor/automattic/jetpack-sync/src/class-replicastore.php index 06c0188a8..7f227cdcd 100644 --- a/vendor/automattic/jetpack-sync/src/class-replicastore.php +++ b/vendor/automattic/jetpack-sync/src/class-replicastore.php @@ -1183,82 +1183,25 @@ public function get_allowed_mime_types( $user_id ) { // phpcs:ignore VariableAna * @return array Checksums. */ public function checksum_all( $perform_text_conversion = false ) { - $post_checksum = $this->checksum_histogram( 'posts', null, null, null, null, true, '', false, false, $perform_text_conversion ); - $comments_checksum = $this->checksum_histogram( 'comments', null, null, null, null, true, '', false, false, $perform_text_conversion ); - $post_meta_checksum = $this->checksum_histogram( 'postmeta', null, null, null, null, true, '', false, false, $perform_text_conversion ); - $comment_meta_checksum = $this->checksum_histogram( 'commentmeta', null, null, null, null, true, '', false, false, $perform_text_conversion ); - $terms_checksum = $this->checksum_histogram( 'terms', null, null, null, null, true, '', false, false, $perform_text_conversion ); - $term_relationships_checksum = $this->checksum_histogram( 'term_relationships', null, null, null, null, true, '', false, false, $perform_text_conversion ); - $term_taxonomy_checksum = $this->checksum_histogram( 'term_taxonomy', null, null, null, null, true, '', false, false, $perform_text_conversion ); - - $result = array( - 'posts' => $this->summarize_checksum_histogram( $post_checksum ), - 'comments' => $this->summarize_checksum_histogram( $comments_checksum ), - 'post_meta' => $this->summarize_checksum_histogram( $post_meta_checksum ), - 'comment_meta' => $this->summarize_checksum_histogram( $comment_meta_checksum ), - 'terms' => $this->summarize_checksum_histogram( $terms_checksum ), - 'term_relationships' => $this->summarize_checksum_histogram( $term_relationships_checksum ), - 'term_taxonomy' => $this->summarize_checksum_histogram( $term_taxonomy_checksum ), - ); + $all_checksum_tables = Table_Checksum::get_allowed_tables(); - /** - * WooCommerce tables - */ - - /** - * On WordPress.com, we can't directly check if the site has support for WooCommerce. - * Having the option to override the functionality here helps with syncing WooCommerce tables. - * - * @since 10.1 - * - * @param bool If we should we force-enable WooCommerce tables support. - */ - $force_woocommerce_support = apply_filters( 'jetpack_table_checksum_force_enable_woocommerce', false ); - - if ( $force_woocommerce_support || class_exists( 'WooCommerce' ) ) { - /** - * Guard in Try/Catch as it's possible for the WooCommerce class to exist, but - * the tables to not. If we don't do this, the response will be just the exception, without - * returning any valid data. This will prevent us from ever performing a checksum/fix - * for sites like this. - * It's better to just skip the tables in the response, instead of completely failing. - */ + unset( $all_checksum_tables['users'] ); // Handled separately - TODO. + unset( $all_checksum_tables['usermeta'] ); // Handled separately - TODO. + unset( $all_checksum_tables['termmeta'] ); // Handled separately - TODO. + unset( $all_checksum_tables['links'] ); // Not supported yet. Consider removing from default config. + unset( $all_checksum_tables['options'] ); // Not supported yet. Consider removing from default config. - try { - $woocommerce_order_items_checksum = $this->checksum_histogram( 'woocommerce_order_items' ); - $result['woocommerce_order_items'] = $this->summarize_checksum_histogram( $woocommerce_order_items_checksum ); - } catch ( Exception $ex ) { - $result['woocommerce_order_items'] = null; - } + $all_checksum_tables = array_unique( array_keys( $all_checksum_tables ) ); + + $result = array(); + foreach ( $all_checksum_tables as $table ) { + $result_key = in_array( $table, array( 'postmeta', 'commentmeta' ), true ) ? str_replace( 'meta', '_meta', $table ) : $table; try { - $woocommerce_order_itemmeta_checksum = $this->checksum_histogram( 'woocommerce_order_itemmeta' ); - $result['woocommerce_order_itemmeta'] = $this->summarize_checksum_histogram( $woocommerce_order_itemmeta_checksum ); + $checksum = $this->checksum_histogram( $table, null, null, null, null, true, '', false, false, $perform_text_conversion ); + $result[ $result_key ] = $this->summarize_checksum_histogram( $checksum ); } catch ( Exception $ex ) { - $result['woocommerce_order_itemmeta'] = null; - } - - if ( Table_Checksum::enable_woocommerce_hpos_tables() ) { - try { - $woocommerce_hpos_orders_checksum = $this->checksum_histogram( 'wc_orders' ); - $result['wc_orders'] = $this->summarize_checksum_histogram( $woocommerce_hpos_orders_checksum ); - } catch ( Exception $ex ) { - $result['wc_orders'] = null; - } - - try { - $woocommerce_hpos_order_addresses_checksum = $this->checksum_histogram( 'wc_order_addresses' ); - $result['wc_order_addresses'] = $this->summarize_checksum_histogram( $woocommerce_hpos_order_addresses_checksum ); - } catch ( Exception $ex ) { - $result['wc_order_addresses'] = null; - } - - try { - $woocommerce_hpos_order_operational_data_checksum = $this->checksum_histogram( 'wc_order_operational_data' ); - $result['wc_order_operational_data'] = $this->summarize_checksum_histogram( $woocommerce_hpos_order_operational_data_checksum ); - } catch ( Exception $ex ) { - $result['wc_order_operational_data'] = null; - } + $result[ $result_key ] = null; } } diff --git a/vendor/automattic/jetpack-sync/src/replicastore/class-table-checksum.php b/vendor/automattic/jetpack-sync/src/replicastore/class-table-checksum.php index 30d0bc1ca..3118c6a2c 100644 --- a/vendor/automattic/jetpack-sync/src/replicastore/class-table-checksum.php +++ b/vendor/automattic/jetpack-sync/src/replicastore/class-table-checksum.php @@ -148,7 +148,7 @@ public function __construct( $table, $salt = null, $perform_text_conversion = fa $this->salt = $salt; - $this->default_tables = $this->get_default_tables(); + $this->default_tables = static::get_default_tables(); $this->perform_text_conversion = $perform_text_conversion; @@ -181,7 +181,7 @@ public function __construct( $table, $salt = null, $perform_text_conversion = fa * * @return array */ - protected function get_default_tables() { + protected static function get_default_tables() { global $wpdb; return array( @@ -295,7 +295,7 @@ protected function get_default_tables() { 'key_fields' => array( 'order_item_id' ), 'checksum_fields' => array( 'order_id' ), 'checksum_text_fields' => array( 'order_item_name', 'order_item_type' ), - 'is_table_enabled_callback' => array( $this, 'enable_woocommerce_tables' ), + 'is_table_enabled_callback' => 'Automattic\Jetpack\Sync\Replicastore\Table_Checksum::enable_woocommerce_tables', ), 'woocommerce_order_itemmeta' => array( 'table' => "{$wpdb->prefix}woocommerce_order_itemmeta", @@ -306,7 +306,7 @@ protected function get_default_tables() { 'parent_table' => 'woocommerce_order_items', 'parent_join_field' => 'order_item_id', 'table_join_field' => 'order_item_id', - 'is_table_enabled_callback' => array( $this, 'enable_woocommerce_tables' ), + 'is_table_enabled_callback' => 'Automattic\Jetpack\Sync\Replicastore\Table_Checksum::enable_woocommerce_tables', ), 'wc_orders' => array( 'table' => "{$wpdb->prefix}wc_orders", @@ -381,6 +381,15 @@ protected function get_default_tables() { ); } + /** + * Get allowed table configurations. + * + * @return array + */ + public static function get_allowed_tables() { + return apply_filters( 'jetpack_sync_checksum_allowed_tables', static::get_default_tables() ); + } + /** * Prepare field params based off provided configuration. * @@ -872,7 +881,7 @@ public function calculate_checksum( $range_from = null, $range_to = null, $filte * * @return bool */ - protected function enable_woocommerce_tables() { + public static function enable_woocommerce_tables() { /** * On WordPress.com, we can't directly check if the site has support for WooCommerce. * Having the option to override the functionality here helps with syncing WooCommerce tables. @@ -889,14 +898,8 @@ protected function enable_woocommerce_tables() { return true; } - // No need to proceed if WooCommerce is not available. - if ( ! class_exists( 'WooCommerce' ) ) { - return false; - } - - // TODO more checks if needed. Probably query the DB to make sure the tables exist. - - return true; + // If the 'woocommerce' module is enabled, this means that WooCommerce class exists. + return false !== Sync\Modules::get_module( 'woocommerce' ); } /** diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index c76a542a1..6c4ce54db 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": "65f6afaa79acbeeaaab6e79623d269568ea15c13" + "reference": "de55bbd1710be779df374c92eb83dd5ee6ad8c92" }, "require": { "php": ">=7.2" @@ -63,7 +63,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-admin-ui", - "reference": "8f8ee8bbee93561dd3ef2d4d499d4bf66970675d" + "reference": "c9e912d4782a8b508792dc439b7f7b16f6543eb4" }, "require": { "php": ">=7.2" @@ -131,7 +131,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-assets", - "reference": "a767533f1e10bc9fc801b76890000b21a6d4cd29" + "reference": "434d2e6f597acaab62d6f049ea5400030e7a4c04" }, "require": { "automattic/jetpack-constants": "^3.0.1-alpha", @@ -203,7 +203,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-blaze", - "reference": "fcc8fbbd6d0c01e3c6233cf1646deb253f59316a" + "reference": "d8c7f266b2c0645418f4fa50204e92f177b15507" }, "require": { "automattic/jetpack-assets": "^4.0.0-alpha", @@ -287,7 +287,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-blocks", - "reference": "6218512848bb2c1ff404026112767060c1be1deb" + "reference": "701ccd6a4b2ed6db490052f80eeca72b8c029c44" }, "require": { "automattic/jetpack-constants": "^3.0.1-alpha", @@ -352,7 +352,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-calypsoify", - "reference": "c812ce545f7bcebf3a8421e674405ace85958b4a" + "reference": "777db007a8ca18a27b86fb63acb495d44e10ef3e" }, "require": { "automattic/jetpack-assets": "^4.0.0-alpha", @@ -420,7 +420,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-classic-theme-helper", - "reference": "4d4d615b5dc5e4bff5ec0adbb52ce9320c249512" + "reference": "3e2343e6e03df83ff422bac8612868a3e3e8c86e" }, "require": { "automattic/jetpack-assets": "^4.0.0-alpha", @@ -494,7 +494,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-compat", - "reference": "c53965d030299b549b2be7d82651129a285926a6" + "reference": "c983dde3949f9c2c679e3311a478436eee70adb0" }, "require": { "php": ">=7.2" @@ -534,7 +534,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-connection", - "reference": "207dd9967a83ec34dde3cb4cd52683cff99a6c8b" + "reference": "806f4a0e54b12ac3994bc3c0aa23cb3eaef979b0" }, "require": { "automattic/jetpack-a8c-mc-stats": "^3.0.0", @@ -627,7 +627,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-constants", - "reference": "1a8ad4442d4cbe6a05d77dfc7424f64c541fad6e" + "reference": "d3fa2869657361307215892d5acf66bf2a9319b4" }, "require": { "php": ">=7.2" @@ -684,7 +684,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-device-detection", - "reference": "07165f734667445f371bc1f8c66514de5ad9a288" + "reference": "d15e6d06cd114afdfb36497d1f1eabebc419f5af" }, "require": { "php": ">=7.2" @@ -740,7 +740,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-google-analytics", - "reference": "bb1d8f99d56b92906be0e83110e63edd1d737832" + "reference": "c6d9752c4e5e82908efbe82aa37131652c915dca" }, "require": { "automattic/jetpack-status": "^5.0.1-alpha", @@ -814,7 +814,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-ip", - "reference": "1dae22442ddd9f4e7a83513546694c833a0a7f83" + "reference": "55c9e8cbfc7c5ab4ef4899b4643a5f94e38372e9" }, "require": { "php": ">=7.2" @@ -875,7 +875,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-jitm", - "reference": "016a382cb9cfab4c65b782dbb32feb4f001d0406" + "reference": "a2008417dbdd0bd64601c49812de073a6539eb51" }, "require": { "automattic/jetpack-a8c-mc-stats": "^3.0.0", @@ -953,7 +953,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-logo", - "reference": "7027ef425ac92fd4710cf07c25e71d88a2009c22" + "reference": "69270950337a69eae6ebfa871fa31a461e0f48da" }, "require": { "php": ">=7.2" @@ -1009,7 +1009,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-masterbar", - "reference": "66c71c9024f821cf286c443ab0d2b6081af7ebdc" + "reference": "4a2d7a76d79b0dc6c92190346b19ab2075a16f28" }, "require": { "automattic/jetpack-assets": "^4.0.0-alpha", @@ -1095,7 +1095,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-mu-wpcom", - "reference": "acd3cd49ad8fd61c1f463aae6211dae2238cbb5d" + "reference": "4a3f3b32fe717ae2c4b0e0096fc18aec62a6fc83" }, "require": { "automattic/jetpack-assets": "^4.0.0-alpha", @@ -1181,7 +1181,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-password-checker", - "reference": "e6b641ddb06c7f0637b2a6c6666d4ead3bc4fd01" + "reference": "d71e69d8c2343647fe1e2a5f0a7dc46f716bb012" }, "require": { "php": ">=7.2" @@ -1245,7 +1245,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-plans", - "reference": "e107eda703b10881de44a8f655b28d19ac2ed9c4" + "reference": "076b9821551259f1fb3c4b8d081f0c6145d3dfb9" }, "require": { "automattic/jetpack-connection": "^6.1.0-alpha", @@ -1316,7 +1316,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-redirect", - "reference": "e6905cbd7fb92e4eb9747d97172e2c35cd052b5a" + "reference": "867f235f75ea47a57f7ee7207bc541bfddb7860a" }, "require": { "automattic/jetpack-status": "^5.0.1-alpha", @@ -1374,7 +1374,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-roles", - "reference": "dd148c611c949b84bdc1d2a6574e821930d4ec10" + "reference": "176848b03fc881550e4ffef1fb1f43715753050e" }, "require": { "php": ">=7.2" @@ -1431,7 +1431,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-stats", - "reference": "348ab1a2dccfd4245b590377398d7c2bae3438af" + "reference": "277b74589867152801771fef84f485e16260ba03" }, "require": { "automattic/jetpack-connection": "^6.1.0-alpha", @@ -1501,7 +1501,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-stats-admin", - "reference": "54460bc5c61b49bab932bd0ab0e0b6f1306713c9" + "reference": "a207eba1cd483bc901091115609a82e1a1d4ff06" }, "require": { "automattic/jetpack-connection": "^6.1.0-alpha", @@ -1577,7 +1577,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-status", - "reference": "141ed6337f110207f0fa84924b6aa20dbc37220d" + "reference": "61b6a6ca17ad844a19270c1a26ad7dd9cd89731c" }, "require": { "automattic/jetpack-constants": "^3.0.1-alpha", @@ -1639,12 +1639,12 @@ }, { "name": "automattic/jetpack-sync", - "version": "4.0.1-alpha.1732217150", - "version_normalized": "4.0.1.0-alpha1732217150", + "version": "4.0.1-alpha.1732535946", + "version_normalized": "4.0.1.0-alpha1732535946", "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-sync", - "reference": "4aa51eed539d3088a3e0aed51d31a473b588c1f4" + "reference": "04a85859acc1abf1a5dce57dc2aa905b49f27ea9" }, "require": { "automattic/jetpack-connection": "^6.1.0-alpha", @@ -1725,7 +1725,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/scheduled-updates", - "reference": "d7dc154fab6f4d266c13e68fd536e69e2d7c2c66" + "reference": "6944c66c821956def98cc8ec5d820a96aff3e9f7" }, "require": { "automattic/jetpack-connection": "^6.1.0-alpha", diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php index e3104f74a..f57819100 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' => '65f6afaa79acbeeaaab6e79623d269568ea15c13', + 'reference' => 'de55bbd1710be779df374c92eb83dd5ee6ad8c92', '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-alpha.1732217150', 'version' => '0.5.1.0-alpha1732217150', - 'reference' => '8f8ee8bbee93561dd3ef2d4d499d4bf66970675d', + 'reference' => 'c9e912d4782a8b508792dc439b7f7b16f6543eb4', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-admin-ui', 'aliases' => array(), @@ -31,7 +31,7 @@ 'automattic/jetpack-assets' => array( 'pretty_version' => '4.0.0-alpha.1732205217', 'version' => '4.0.0.0-alpha1732205217', - 'reference' => 'a767533f1e10bc9fc801b76890000b21a6d4cd29', + 'reference' => '434d2e6f597acaab62d6f049ea5400030e7a4c04', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-assets', 'aliases' => array(), @@ -40,7 +40,7 @@ 'automattic/jetpack-blaze' => array( 'pretty_version' => '0.25.1-alpha.1732217150', 'version' => '0.25.1.0-alpha1732217150', - 'reference' => 'fcc8fbbd6d0c01e3c6233cf1646deb253f59316a', + 'reference' => 'd8c7f266b2c0645418f4fa50204e92f177b15507', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-blaze', 'aliases' => array(), @@ -49,7 +49,7 @@ 'automattic/jetpack-blocks' => array( 'pretty_version' => '3.0.1-alpha.1732217150', 'version' => '3.0.1.0-alpha1732217150', - 'reference' => '6218512848bb2c1ff404026112767060c1be1deb', + 'reference' => '701ccd6a4b2ed6db490052f80eeca72b8c029c44', '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.1732205217', 'version' => '0.2.0.0-alpha1732205217', - 'reference' => 'c812ce545f7bcebf3a8421e674405ace85958b4a', + 'reference' => '777db007a8ca18a27b86fb63acb495d44e10ef3e', '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.1-alpha.1732217150', 'version' => '0.7.1.0-alpha1732217150', - 'reference' => '4d4d615b5dc5e4bff5ec0adbb52ce9320c249512', + 'reference' => '3e2343e6e03df83ff422bac8612868a3e3e8c86e', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-classic-theme-helper', 'aliases' => array(), @@ -76,7 +76,7 @@ 'automattic/jetpack-compat' => array( 'pretty_version' => '4.0.0', 'version' => '4.0.0.0', - 'reference' => 'c53965d030299b549b2be7d82651129a285926a6', + 'reference' => 'c983dde3949f9c2c679e3311a478436eee70adb0', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-compat', 'aliases' => array(), @@ -85,7 +85,7 @@ 'automattic/jetpack-connection' => array( 'pretty_version' => '6.1.0-alpha.1732217150', 'version' => '6.1.0.0-alpha1732217150', - 'reference' => '207dd9967a83ec34dde3cb4cd52683cff99a6c8b', + 'reference' => '806f4a0e54b12ac3994bc3c0aa23cb3eaef979b0', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-connection', 'aliases' => array(), @@ -94,7 +94,7 @@ 'automattic/jetpack-constants' => array( 'pretty_version' => '3.0.1-alpha.1732046180', 'version' => '3.0.1.0-alpha1732046180', - 'reference' => '1a8ad4442d4cbe6a05d77dfc7424f64c541fad6e', + 'reference' => 'd3fa2869657361307215892d5acf66bf2a9319b4', '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' => '07165f734667445f371bc1f8c66514de5ad9a288', + 'reference' => 'd15e6d06cd114afdfb36497d1f1eabebc419f5af', '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' => 'bb1d8f99d56b92906be0e83110e63edd1d737832', + 'reference' => 'c6d9752c4e5e82908efbe82aa37131652c915dca', '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-alpha.1732046180', 'version' => '0.4.1.0-alpha1732046180', - 'reference' => '1dae22442ddd9f4e7a83513546694c833a0a7f83', + 'reference' => '55c9e8cbfc7c5ab4ef4899b4643a5f94e38372e9', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-ip', 'aliases' => array(), @@ -130,7 +130,7 @@ 'automattic/jetpack-jitm' => array( 'pretty_version' => '4.0.1-alpha.1732205217', 'version' => '4.0.1.0-alpha1732205217', - 'reference' => '016a382cb9cfab4c65b782dbb32feb4f001d0406', + 'reference' => 'a2008417dbdd0bd64601c49812de073a6539eb51', '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' => '7027ef425ac92fd4710cf07c25e71d88a2009c22', + 'reference' => '69270950337a69eae6ebfa871fa31a461e0f48da', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-logo', 'aliases' => array(), @@ -148,7 +148,7 @@ 'automattic/jetpack-masterbar' => array( 'pretty_version' => '0.10.1-alpha.1732217150', 'version' => '0.10.1.0-alpha1732217150', - 'reference' => '66c71c9024f821cf286c443ab0d2b6081af7ebdc', + 'reference' => '4a2d7a76d79b0dc6c92190346b19ab2075a16f28', '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.1732217150', 'version' => '6.0.0.0-alpha1732217150', - 'reference' => 'acd3cd49ad8fd61c1f463aae6211dae2238cbb5d', + 'reference' => '4a3f3b32fe717ae2c4b0e0096fc18aec62a6fc83', '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-alpha.1732217150', 'version' => '0.4.1.0-alpha1732217150', - 'reference' => 'e6b641ddb06c7f0637b2a6c6666d4ead3bc4fd01', + 'reference' => 'd71e69d8c2343647fe1e2a5f0a7dc46f716bb012', '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-alpha.1732217150', 'version' => '0.5.1.0-alpha1732217150', - 'reference' => 'e107eda703b10881de44a8f655b28d19ac2ed9c4', + 'reference' => '076b9821551259f1fb3c4b8d081f0c6145d3dfb9', 'type' => 'library', 'install_path' => __DIR__ . '/../automattic/jetpack-plans', 'aliases' => array(), @@ -193,7 +193,7 @@ 'automattic/jetpack-redirect' => array( 'pretty_version' => '3.0.1-alpha.1732046180', 'version' => '3.0.1.0-alpha1732046180', - 'reference' => 'e6905cbd7fb92e4eb9747d97172e2c35cd052b5a', + 'reference' => '867f235f75ea47a57f7ee7207bc541bfddb7860a', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-redirect', 'aliases' => array(), @@ -202,7 +202,7 @@ 'automattic/jetpack-roles' => array( 'pretty_version' => '3.0.1-alpha.1732046180', 'version' => '3.0.1.0-alpha1732046180', - 'reference' => 'dd148c611c949b84bdc1d2a6574e821930d4ec10', + 'reference' => '176848b03fc881550e4ffef1fb1f43715753050e', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-roles', 'aliases' => array(), @@ -211,7 +211,7 @@ 'automattic/jetpack-stats' => array( 'pretty_version' => '0.14.1-alpha.1732217150', 'version' => '0.14.1.0-alpha1732217150', - 'reference' => '348ab1a2dccfd4245b590377398d7c2bae3438af', + 'reference' => '277b74589867152801771fef84f485e16260ba03', '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-alpha.1732501351', 'version' => '0.23.1.0-alpha1732501351', - 'reference' => '54460bc5c61b49bab932bd0ab0e0b6f1306713c9', + 'reference' => 'a207eba1cd483bc901091115609a82e1a1d4ff06', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-stats-admin', 'aliases' => array(), @@ -229,16 +229,16 @@ 'automattic/jetpack-status' => array( 'pretty_version' => '5.0.1-alpha.1732046180', 'version' => '5.0.1.0-alpha1732046180', - 'reference' => '141ed6337f110207f0fa84924b6aa20dbc37220d', + 'reference' => '61b6a6ca17ad844a19270c1a26ad7dd9cd89731c', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-status', 'aliases' => array(), 'dev_requirement' => false, ), 'automattic/jetpack-sync' => array( - 'pretty_version' => '4.0.1-alpha.1732217150', - 'version' => '4.0.1.0-alpha1732217150', - 'reference' => '4aa51eed539d3088a3e0aed51d31a473b588c1f4', + 'pretty_version' => '4.0.1-alpha.1732535946', + 'version' => '4.0.1.0-alpha1732535946', + 'reference' => '04a85859acc1abf1a5dce57dc2aa905b49f27ea9', '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.1732217150', 'version' => '0.14.0.0-alpha1732217150', - 'reference' => 'd7dc154fab6f4d266c13e68fd536e69e2d7c2c66', + 'reference' => '6944c66c821956def98cc8ec5d820a96aff3e9f7', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/scheduled-updates', 'aliases' => array(),