Skip to content

Commit

Permalink
Backport mu-wpcom-plugin 2.0.0, jetpack 12.9-a.7 Changes (#34213)
Browse files Browse the repository at this point in the history
* Add changelogs

* Changelog edits.

* Fix project versions

Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/6935801739
  • Loading branch information
anomiex authored and matticbot committed Nov 20, 2023
1 parent 8df4127 commit ca7ee2f
Show file tree
Hide file tree
Showing 75 changed files with 644 additions and 710 deletions.
24 changes: 12 additions & 12 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,20 @@
"type": "wordpress-plugin",
"license": "GPL-2.0-or-later",
"require": {
"automattic/jetpack-autoloader": "^3.0.0-alpha",
"automattic/jetpack-composer-plugin": "^2.0.0-alpha",
"automattic/jetpack-config": "^2.0.0-alpha",
"automattic/jetpack-connection": "^2.0.0-alpha",
"automattic/jetpack-identity-crisis": "^0.12.0-alpha",
"automattic/jetpack-my-jetpack": "^4.0.0-alpha",
"automattic/jetpack-search": "^0.40.0-alpha",
"automattic/jetpack-stats": "^0.7.0-alpha",
"automattic/jetpack-status": "^2.0.0-alpha",
"automattic/jetpack-sync": "^2.0.0-alpha",
"automattic/jetpack-plugins-installer": "^0.3.0-alpha"
"automattic/jetpack-autoloader": "^3.0.0",
"automattic/jetpack-composer-plugin": "^2.0.0",
"automattic/jetpack-config": "^2.0.0",
"automattic/jetpack-connection": "^2.0.0",
"automattic/jetpack-identity-crisis": "^0.12.0",
"automattic/jetpack-my-jetpack": "^4.0.0",
"automattic/jetpack-search": "^0.40.0",
"automattic/jetpack-stats": "^0.7.0",
"automattic/jetpack-status": "^2.0.0",
"automattic/jetpack-sync": "^2.0.0",
"automattic/jetpack-plugins-installer": "^0.3.0"
},
"require-dev": {
"automattic/jetpack-changelogger": "^4.0.0-alpha",
"automattic/jetpack-changelogger": "^4.0.0",
"yoast/phpunit-polyfills": "1.1.0"
},
"autoload": {
Expand Down
9 changes: 3 additions & 6 deletions jetpack_vendor/automattic/jetpack-a8c-mc-stats/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,9 @@ 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).

## [2.0.0-alpha] - unreleased

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

## [2.0.0] - 2023-11-20
### Changed
- The package now requires PHP >= 7.0.
- Updated required PHP version to >= 7.0. [#34192]

## [1.4.22] - 2023-09-19

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

- Creates the MC Stats package

[2.0.0-alpha]: https://github.com/Automattic/jetpack-a8c-mc-stats/compare/v1.4.22...v2.0.0-alpha
[2.0.0]: https://github.com/Automattic/jetpack-a8c-mc-stats/compare/v1.4.22...v2.0.0
[1.4.22]: https://github.com/Automattic/jetpack-a8c-mc-stats/compare/v1.4.21...v1.4.22
[1.4.21]: https://github.com/Automattic/jetpack-a8c-mc-stats/compare/v1.4.20...v1.4.21
[1.4.20]: https://github.com/Automattic/jetpack-a8c-mc-stats/compare/v1.4.19...v1.4.20
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"require-dev": {
"yoast/phpunit-polyfills": "1.1.0",
"automattic/jetpack-changelogger": "^4.0.0-alpha"
"automattic/jetpack-changelogger": "^4.0.0"
},
"suggest": {
"automattic/jetpack-autoloader": "Allow for better interoperability with other plugins that use this package."
Expand Down
9 changes: 3 additions & 6 deletions jetpack_vendor/automattic/jetpack-admin-ui/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,9 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [0.3.0-alpha] - unreleased

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

## [0.3.0] - 2023-11-20
### Changed
- The package now requires PHP >= 7.0.
- Updated required PHP version to >= 7.0. [#34192]

## [0.2.25] - 2023-11-14

Expand Down Expand Up @@ -133,7 +130,7 @@ This is an alpha version! The changes listed here are not final.
### Fixed
- Fixing menu visibility issues.

[0.3.0-alpha]: https://github.com/Automattic/jetpack-admin-ui/compare/0.2.25...0.3.0-alpha
[0.3.0]: https://github.com/Automattic/jetpack-admin-ui/compare/0.2.25...0.3.0
[0.2.25]: https://github.com/Automattic/jetpack-admin-ui/compare/0.2.24...0.2.25
[0.2.24]: https://github.com/Automattic/jetpack-admin-ui/compare/0.2.23...0.2.24
[0.2.23]: https://github.com/Automattic/jetpack-admin-ui/compare/0.2.22...0.2.23
Expand Down
4 changes: 2 additions & 2 deletions jetpack_vendor/automattic/jetpack-admin-ui/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
},
"require-dev": {
"yoast/phpunit-polyfills": "1.1.0",
"automattic/jetpack-changelogger": "^4.0.0-alpha",
"automattic/jetpack-logo": "^2.0.0-alpha",
"automattic/jetpack-changelogger": "^4.0.0",
"automattic/jetpack-logo": "^2.0.0",
"automattic/wordbless": "dev-master"
},
"suggest": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
*/
class Admin_Menu {

const PACKAGE_VERSION = '0.3.0-alpha';
const PACKAGE_VERSION = '0.3.0';

/**
* Whether this class has been initialized
Expand Down
9 changes: 3 additions & 6 deletions jetpack_vendor/automattic/jetpack-assets/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,9 @@ 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).

## [2.0.0-alpha] - unreleased

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

## [2.0.0] - 2023-11-20
### Changed
- The package now requires PHP >= 7.0.
- Updated required PHP version to >= 7.0. [#34192]

## [1.18.15] - 2023-11-14
### Changed
Expand Down Expand Up @@ -385,7 +382,7 @@ This is an alpha version! The changes listed here are not final.

- Statically access asset tools

[2.0.0-alpha]: https://github.com/Automattic/jetpack-assets/compare/v1.18.15...v2.0.0-alpha
[2.0.0]: https://github.com/Automattic/jetpack-assets/compare/v1.18.15...v2.0.0
[1.18.15]: https://github.com/Automattic/jetpack-assets/compare/v1.18.14...v1.18.15
[1.18.14]: https://github.com/Automattic/jetpack-assets/compare/v1.18.13...v1.18.14
[1.18.13]: https://github.com/Automattic/jetpack-assets/compare/v1.18.12...v1.18.13
Expand Down
4 changes: 2 additions & 2 deletions jetpack_vendor/automattic/jetpack-assets/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
"license": "GPL-2.0-or-later",
"require": {
"php": ">=7.0",
"automattic/jetpack-constants": "^2.0.0-alpha"
"automattic/jetpack-constants": "^2.0.0"
},
"require-dev": {
"brain/monkey": "2.6.1",
"yoast/phpunit-polyfills": "1.1.0",
"automattic/jetpack-changelogger": "^4.0.0-alpha",
"automattic/jetpack-changelogger": "^4.0.0",
"wikimedia/testing-access-wrapper": "^1.0 || ^2.0"
},
"suggest": {
Expand Down
9 changes: 3 additions & 6 deletions jetpack_vendor/automattic/jetpack-config/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,9 @@ 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).

## [2.0.0-alpha] - unreleased

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

## [2.0.0] - 2023-11-20
### Changed
- The package now requires PHP >= 7.0.
- Updated required PHP version to >= 7.0. [#34192]

## [1.15.4] - 2023-09-19

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

- Trying to add deterministic initialization.

[2.0.0-alpha]: https://github.com/Automattic/jetpack-config/compare/v1.15.4...v2.0.0-alpha
[2.0.0]: https://github.com/Automattic/jetpack-config/compare/v1.15.4...v2.0.0
[1.15.4]: https://github.com/Automattic/jetpack-config/compare/v1.15.3...v1.15.4
[1.15.3]: https://github.com/Automattic/jetpack-config/compare/v1.15.2...v1.15.3
[1.15.2]: https://github.com/Automattic/jetpack-config/compare/v1.15.1...v1.15.2
Expand Down
2 changes: 1 addition & 1 deletion jetpack_vendor/automattic/jetpack-config/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"php": ">=7.0"
},
"require-dev": {
"automattic/jetpack-changelogger": "^4.0.0-alpha"
"automattic/jetpack-changelogger": "^4.0.0"
},
"suggest": {
"automattic/jetpack-autoloader": "Allow for better interoperability with other plugins that use this package."
Expand Down
15 changes: 6 additions & 9 deletions jetpack_vendor/automattic/jetpack-connection/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,16 @@ 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).

## [2.0.0-alpha] - unreleased

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

## [2.0.0] - 2023-11-20
### Added
- Confirm blog ID and access token were saved before proceeding with connection flow.
- Confirm blog ID and access token were saved before proceeding with connection flow. [#34136]

### Changed
- Code Modernization: Replace usage of strpos() with str_starts_with().
- The package now requires PHP >= 7.0.
- Replace usage of strpos() with str_starts_with(). [#34135]
- Updated required PHP version to >= 7.0. [#34192]

### Fixed
- Connection: ensure that partner partners are passed on during the connection process, regardless of the plugin you use to connect.
- Ensured that partner partners are passed on during the connection process, regardless of the plugin you use to connect. [#33832]

## [1.60.1] - 2023-11-14
### Changed
Expand Down Expand Up @@ -926,7 +923,7 @@ This is an alpha version! The changes listed here are not final.

- Separate the connection library into its own package.

[2.0.0-alpha]: https://github.com/Automattic/jetpack-connection/compare/v1.60.1...v2.0.0-alpha
[2.0.0]: https://github.com/Automattic/jetpack-connection/compare/v1.60.1...v2.0.0
[1.60.1]: https://github.com/Automattic/jetpack-connection/compare/v1.60.0...v1.60.1
[1.60.0]: https://github.com/Automattic/jetpack-connection/compare/v1.59.0...v1.60.0
[1.59.0]: https://github.com/Automattic/jetpack-connection/compare/v1.58.3...v1.59.0
Expand Down
14 changes: 7 additions & 7 deletions jetpack_vendor/automattic/jetpack-connection/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@
"license": "GPL-2.0-or-later",
"require": {
"php": ">=7.0",
"automattic/jetpack-a8c-mc-stats": "^2.0.0-alpha",
"automattic/jetpack-admin-ui": "^0.3.0-alpha",
"automattic/jetpack-constants": "^2.0.0-alpha",
"automattic/jetpack-roles": "^2.0.0-alpha",
"automattic/jetpack-status": "^2.0.0-alpha",
"automattic/jetpack-redirect": "^2.0.0-alpha"
"automattic/jetpack-a8c-mc-stats": "^2.0.0",
"automattic/jetpack-admin-ui": "^0.3.0",
"automattic/jetpack-constants": "^2.0.0",
"automattic/jetpack-roles": "^2.0.0",
"automattic/jetpack-status": "^2.0.0",
"automattic/jetpack-redirect": "^2.0.0"
},
"require-dev": {
"automattic/wordbless": "@dev",
"yoast/phpunit-polyfills": "1.1.0",
"brain/monkey": "2.6.1",
"automattic/jetpack-changelogger": "^4.0.0-alpha"
"automattic/jetpack-changelogger": "^4.0.0"
},
"suggest": {
"automattic/jetpack-autoloader": "Allow for better interoperability with other plugins that use this package."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*/
class Package_Version {

const PACKAGE_VERSION = '2.0.0-alpha';
const PACKAGE_VERSION = '2.0.0';

const PACKAGE_SLUG = 'connection';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
* Class Jetpack_Partner_Coupon
*
* @since partner-1.6.0
* @since 2.0.0-alpha
* @since 2.0.0
*/
class Partner_Coupon {

Expand Down Expand Up @@ -438,7 +438,7 @@ private function get_supported_partners() {
* Allow external code to add additional supported partners.
*
* @since partner-1.6.0
* @since 2.0.0-alpha
* @since 2.0.0
*
* @param array $supported_partners A list of supported partners.
* @return array
Expand All @@ -456,7 +456,7 @@ private function get_supported_presets() {
* Allow external code to add additional supported presets.
*
* @since partner-1.6.0
* @since 2.0.0-alpha
* @since 2.0.0
*
* @param array $supported_presets A list of supported presets.
* @return array
Expand Down
20 changes: 10 additions & 10 deletions jetpack_vendor/automattic/jetpack-connection/src/class-partner.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* This class introduces functionality used by Jetpack hosting partners.
*
* @since partner-1.0.0
* @since 2.0.0-alpha
* @since 2.0.0
*/
class Partner {

Expand All @@ -29,7 +29,7 @@ class Partner {
* Singleton instance.
*
* @since partner-1.0.0
* @since 2.0.0-alpha
* @since 2.0.0
*
* @var Partner This class instance.
*/
Expand All @@ -45,7 +45,7 @@ private function __construct() {
* Initializes the class or returns the singleton.
*
* @since partner-1.0.0
* @since 2.0.0-alpha
* @since 2.0.0
*
* @return Partner | false
*/
Expand Down Expand Up @@ -90,7 +90,7 @@ public function add_affiliate_code_as_query_arg( $url ) {
* Adds the partner subsidiary code to the passed array.
*
* @since partner-1.5.0
* @since 2.0.0-alpha
* @since 2.0.0
*
* @param array $params The parameters array.
*
Expand All @@ -107,7 +107,7 @@ public function add_subsidiary_id_to_params_array( $params ) {
* Adds the affiliate code to the passed array.
*
* @since partner-1.5.0
* @since 2.0.0-alpha
* @since 2.0.0
*
* @param array $params The parameters array.
*
Expand All @@ -124,7 +124,7 @@ public function add_affiliate_code_to_params_array( $params ) {
* Returns the passed URL with the partner code added as a URL query arg.
*
* @since partner-1.0.0
* @since 2.0.0-alpha
* @since 2.0.0
*
* @param string $type The partner code.
* @param string $url The URL where the partner subsidiary id will be added.
Expand All @@ -139,7 +139,7 @@ public function add_code_as_query_arg( $type, $url ) {
* Gets the partner code in an associative array format
*
* @since partner-1.5.0
* @since 2.0.0-alpha
* @since 2.0.0
*
* @param string $type The partner code.
* @return array
Expand Down Expand Up @@ -169,7 +169,7 @@ private function get_code_as_array( $type ) {
* Returns a partner code.
*
* @since partner-1.0.0
* @since 2.0.0-alpha
* @since 2.0.0
*
* @param string $type This can be either 'affiliate' or 'subsidiary'. Returns empty string when code is unknown.
*
Expand All @@ -183,7 +183,7 @@ public function get_partner_code( $type ) {
*
* @since partner-1.0.0
* @since-jetpack 6.9.0
* @since 2.0.0-alpha
* @since 2.0.0
*
* @param string $affiliate_code The affiliate code, blank by default.
*/
Expand All @@ -193,7 +193,7 @@ public function get_partner_code( $type ) {
* Allow to filter the partner subsidiary id.
*
* @since partner-1.0.0
* @since 2.0.0-alpha
* @since 2.0.0
*
* @param string $subsidiary_id The partner subsidiary id, blank by default.
*/
Expand Down
9 changes: 3 additions & 6 deletions jetpack_vendor/automattic/jetpack-constants/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,9 @@ 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).

## [2.0.0-alpha] - unreleased

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

## [2.0.0] - 2023-11-20
### Changed
- The package now requires PHP >= 7.0.
- Updated required PHP version to >= 7.0. [#34192]

## [1.6.23] - 2023-08-23
### Changed
Expand Down Expand Up @@ -161,7 +158,7 @@ This is an alpha version! The changes listed here are not final.

- Packages: Finish the constants package

[2.0.0-alpha]: https://github.com/Automattic/jetpack-constants/compare/v1.6.23...v2.0.0-alpha
[2.0.0]: https://github.com/Automattic/jetpack-constants/compare/v1.6.23...v2.0.0
[1.6.23]: https://github.com/Automattic/jetpack-constants/compare/v1.6.22...v1.6.23
[1.6.22]: https://github.com/Automattic/jetpack-constants/compare/v1.6.21...v1.6.22
[1.6.21]: https://github.com/Automattic/jetpack-constants/compare/v1.6.20...v1.6.21
Expand Down
Loading

0 comments on commit ca7ee2f

Please sign in to comment.