Skip to content

Commit

Permalink
Full sync config modules order dictates order of execution (#40100)
Browse files Browse the repository at this point in the history
* Updated remaining modules code to return the modules based on full sync config order

* Added test

* changelog

* Phan

* Updated defaults to have order as before

* Wrong auto fixes

* Used array_keys to make phan happy

* Phan changes

* Update to have constants options and callables first

Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/11742882006

Upstream-Ref: Automattic/jetpack@076ee8e
  • Loading branch information
darssen authored and matticbot committed Nov 8, 2024
1 parent 416adae commit 4f5bf17
Show file tree
Hide file tree
Showing 10 changed files with 122 additions and 127 deletions.
64 changes: 32 additions & 32 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/automattic/jetpack-blaze/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"automattic/jetpack-plans": "^0.4.13",
"automattic/jetpack-redirect": "^2.0.5",
"automattic/jetpack-status": "^4.0.3",
"automattic/jetpack-sync": "^3.14.5-alpha"
"automattic/jetpack-sync": "^3.15.0-alpha"
},
"require-dev": {
"yoast/phpunit-polyfills": "^1.1.1",
Expand Down
7 changes: 5 additions & 2 deletions vendor/automattic/jetpack-sync/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +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).

## [3.14.5-alpha] - unreleased
## [3.15.0-alpha] - unreleased

This is an alpha version! The changes listed here are not final.

### Changed
- Sync: Modules in Full Sync are now sent in the order the config is set.

### Fixed
- Jetpack Sync: Add missing handlers for removing or trashing shop_subscription orders

Expand Down Expand Up @@ -1333,7 +1336,7 @@ This is an alpha version! The changes listed here are not final.

- Packages: Move sync to a classmapped package

[3.14.5-alpha]: https://github.com/Automattic/jetpack-sync/compare/v3.14.4...v3.14.5-alpha
[3.15.0-alpha]: https://github.com/Automattic/jetpack-sync/compare/v3.14.4...v3.15.0-alpha
[3.14.4]: https://github.com/Automattic/jetpack-sync/compare/v3.14.3...v3.14.4
[3.14.3]: https://github.com/Automattic/jetpack-sync/compare/v3.14.2...v3.14.3
[3.14.2]: https://github.com/Automattic/jetpack-sync/compare/v3.14.1...v3.14.2
Expand Down
2 changes: 1 addition & 1 deletion vendor/automattic/jetpack-sync/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"link-template": "https://github.com/Automattic/jetpack-sync/compare/v${old}...v${new}"
},
"branch-alias": {
"dev-trunk": "3.14.x-dev"
"dev-trunk": "3.15.x-dev"
},
"dependencies": {
"test-only": [
Expand Down
8 changes: 4 additions & 4 deletions vendor/automattic/jetpack-sync/src/class-defaults.php
Original file line number Diff line number Diff line change
Expand Up @@ -1295,16 +1295,16 @@ public static function is_multi_network() {
* @var array list of module names.
*/
public static $default_full_sync_config = array(
'comments' => 1,
'constants' => 1,
'functions' => 1,
'options' => 1,
'posts' => 1,
'term_relationships' => 1,
'terms' => 1,
'themes' => 1,
'updates' => 1,
'users' => 1,
'posts' => 1,
'comments' => 1,
'updates' => 1,
'term_relationships' => 1,
);

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*/
class Package_Version {

const PACKAGE_VERSION = '3.14.5-alpha';
const PACKAGE_VERSION = '3.15.0-alpha';

const PACKAGE_SLUG = 'sync';

Expand Down
Loading

0 comments on commit 4f5bf17

Please sign in to comment.