Dev: Only one WordPress (#41057)

Co-authored-by: Brad Jorsch <[email protected]> Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/13075594008 Upstream-Ref: Automattic/jetpack@4597864
Automattic · Jan 31, 2025 · 17bfacb · 17bfacb
1 parent a8e8e94
commit 17bfacb
Show file tree

Hide file tree

Showing 22 changed files with 369 additions and 424 deletions.
diff --git a/jetpack_vendor/automattic/jetpack-admin-ui/composer.json b/jetpack_vendor/automattic/jetpack-admin-ui/composer.json
@@ -10,7 +10,7 @@
 		"yoast/phpunit-polyfills": "^1.1.1",
 		"automattic/jetpack-changelogger": "^5.1.0",
 		"automattic/jetpack-logo": "^3.0.0",
-		"automattic/wordbless": "^0.4.2"
+		"automattic/jetpack-test-environment": "@dev"
 	},
 	"suggest": {
 		"automattic/jetpack-autoloader": "Allow for better interoperability with other plugins that use this package."
@@ -29,9 +29,7 @@
 		],
 		"test-php": [
 			"@composer phpunit"
-		],
-		"post-install-cmd": "WorDBless\\Composer\\InstallDropin::copy",
-		"post-update-cmd": "WorDBless\\Composer\\InstallDropin::copy"
+		]
 	},
 	"minimum-stability": "dev",
 	"prefer-stable": true,

diff --git a/jetpack_vendor/automattic/jetpack-connection/composer.json b/jetpack_vendor/automattic/jetpack-connection/composer.json
@@ -14,7 +14,7 @@
 		"automattic/jetpack-redirect": "^3.0.1"
 	},
 	"require-dev": {
-		"automattic/wordbless": "^0.4.2",
+		"automattic/jetpack-test-environment": "@dev",
 		"yoast/phpunit-polyfills": "^1.1.1",
 		"brain/monkey": "^2.6.2",
 		"automattic/jetpack-changelogger": "^5.1.0"
@@ -43,8 +43,6 @@
 		"phpunit": [
 			"./vendor/phpunit/phpunit/phpunit --colors=always"
 		],
-		"post-install-cmd": "WorDBless\\Composer\\InstallDropin::copy",
-		"post-update-cmd": "WorDBless\\Composer\\InstallDropin::copy",
 		"test-coverage": [
 			"php -dpcov.directory=. ./vendor/bin/phpunit --coverage-php \"$COVERAGE_DIR/php.cov\""
 		],

diff --git a/jetpack_vendor/automattic/jetpack-licensing/CHANGELOG.md b/jetpack_vendor/automattic/jetpack-licensing/CHANGELOG.md
@@ -5,6 +5,10 @@ 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.0.4-alpha] - unreleased
+
+This is an alpha version! The changes listed here are not final.
+
 ## [3.0.3] - 2025-01-20
 ### Changed
 - Code: Use function-style exit() and die() with a default status code of 0. [#41167]
@@ -316,6 +320,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Licensing: Add support for Jetpack licenses
 
+[3.0.4-alpha]: https://github.com/Automattic/jetpack-licensing/compare/v3.0.3...v3.0.4-alpha
 [3.0.3]: https://github.com/Automattic/jetpack-licensing/compare/v3.0.2...v3.0.3
 [3.0.2]: https://github.com/Automattic/jetpack-licensing/compare/v3.0.1...v3.0.2
 [3.0.1]: https://github.com/Automattic/jetpack-licensing/compare/v3.0.0...v3.0.1

diff --git a/jetpack_vendor/automattic/jetpack-licensing/composer.json b/jetpack_vendor/automattic/jetpack-licensing/composer.json
@@ -8,7 +8,7 @@
 		"automattic/jetpack-connection": "^6.3.2-alpha"
 	},
 	"require-dev": {
-		"automattic/wordbless": "^0.4.2",
+		"automattic/jetpack-test-environment": "@dev",
 		"yoast/phpunit-polyfills": "^1.1.1",
 		"automattic/jetpack-changelogger": "^5.1.0"
 	},
@@ -24,8 +24,6 @@
 		"phpunit": [
 			"./vendor/phpunit/phpunit/phpunit --colors=always"
 		],
-		"post-install-cmd": "WorDBless\\Composer\\InstallDropin::copy",
-		"post-update-cmd": "WorDBless\\Composer\\InstallDropin::copy",
 		"test-coverage": [
 			"php -dpcov.directory=. ./vendor/bin/phpunit --coverage-php \"$COVERAGE_DIR/php.cov\""
 		],

diff --git a/jetpack_vendor/automattic/jetpack-my-jetpack/composer.json b/jetpack_vendor/automattic/jetpack-my-jetpack/composer.json
@@ -11,19 +11,19 @@
 		"automattic/jetpack-connection": "^6.3.2-alpha",
 		"automattic/jetpack-explat": "^0.2.5-alpha",
 		"automattic/jetpack-jitm": "^4.0.5-alpha",
-		"automattic/jetpack-licensing": "^3.0.3",
+		"automattic/jetpack-licensing": "^3.0.4-alpha",
 		"automattic/jetpack-plugins-installer": "^0.5.0",
 		"automattic/jetpack-redirect": "^3.0.1",
 		"automattic/jetpack-constants": "^3.0.1",
-		"automattic/jetpack-plans": "^0.5.1",
+		"automattic/jetpack-plans": "^0.5.2-alpha",
 		"automattic/jetpack-status": "^5.0.2",
 		"automattic/jetpack-sync": "^4.6.0-alpha",
-		"automattic/jetpack-protect-status": "^0.4.2"
+		"automattic/jetpack-protect-status": "^0.4.3-alpha"
 	},
 	"require-dev": {
 		"yoast/phpunit-polyfills": "^1.1.1",
 		"automattic/jetpack-changelogger": "^5.1.0",
-		"automattic/wordbless": "^0.4.2"
+		"automattic/jetpack-test-environment": "@dev"
 	},
 	"suggest": {
 		"automattic/jetpack-autoloader": "Allow for better interoperability with other plugins that use this package."
@@ -58,9 +58,7 @@
 		"watch": [
 			"Composer\\Config::disableProcessTimeout",
 			"pnpm run watch"
-		],
-		"post-install-cmd": "WorDBless\\Composer\\InstallDropin::copy",
-		"post-update-cmd": "WorDBless\\Composer\\InstallDropin::copy"
+		]
 	},
 	"minimum-stability": "dev",
 	"prefer-stable": true,

diff --git a/jetpack_vendor/automattic/jetpack-password-checker/CHANGELOG.md b/jetpack_vendor/automattic/jetpack-password-checker/CHANGELOG.md
@@ -5,6 +5,10 @@ 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.4.2-alpha] - unreleased
+
+This is an alpha version! The changes listed here are not final.
+
 ## [0.4.1] - 2024-11-25
 ### Changed
 - Updated dependencies. [#40286]
@@ -132,6 +136,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 - Use `composer update` rather than `install` in scripts, as composer.lock isn't checked in.
 
+[0.4.2-alpha]: https://github.com/Automattic/jetpack-password-checker/compare/v0.4.1...v0.4.2-alpha
 [0.4.1]: https://github.com/Automattic/jetpack-password-checker/compare/v0.4.0...v0.4.1
 [0.4.0]: https://github.com/Automattic/jetpack-password-checker/compare/v0.3.3...v0.4.0
 [0.3.3]: https://github.com/Automattic/jetpack-password-checker/compare/v0.3.2...v0.3.3

diff --git a/jetpack_vendor/automattic/jetpack-password-checker/composer.json b/jetpack_vendor/automattic/jetpack-password-checker/composer.json
@@ -8,7 +8,7 @@
 	},
 	"require-dev": {
 		"automattic/jetpack-changelogger": "^5.1.0",
-		"automattic/wordbless": "^0.4.2",
+		"automattic/jetpack-test-environment": "@dev",
 		"yoast/phpunit-polyfills": "^1.1.1"
 	},
 	"suggest": {
@@ -28,9 +28,7 @@
 		],
 		"test-php": [
 			"@composer phpunit"
-		],
-		"post-install-cmd": "WorDBless\\Composer\\InstallDropin::copy",
-		"post-update-cmd": "WorDBless\\Composer\\InstallDropin::copy"
+		]
 	},
 	"minimum-stability": "dev",
 	"prefer-stable": true,

diff --git a/jetpack_vendor/automattic/jetpack-protect-models/CHANGELOG.md b/jetpack_vendor/automattic/jetpack-protect-models/CHANGELOG.md
@@ -5,6 +5,10 @@ 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.4.2-alpha] - unreleased
+
+This is an alpha version! The changes listed here are not final.
+
 ## [0.4.1] - 2024-11-25
 ### Changed
 - Updated dependencies. [#40286]
@@ -36,6 +40,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - Initial version. [#37864]
 
+[0.4.2-alpha]: https://github.com/Automattic/jetpack-protect-models/compare/v0.4.1...v0.4.2-alpha
 [0.4.1]: https://github.com/Automattic/jetpack-protect-models/compare/v0.4.0...v0.4.1
 [0.4.0]: https://github.com/Automattic/jetpack-protect-models/compare/v0.3.1...v0.4.0
 [0.3.1]: https://github.com/Automattic/jetpack-protect-models/compare/v0.3.0...v0.3.1

diff --git a/jetpack_vendor/automattic/jetpack-protect-models/composer.json b/jetpack_vendor/automattic/jetpack-protect-models/composer.json
@@ -9,7 +9,7 @@
 	"require-dev": {
 		"yoast/phpunit-polyfills": "^1.1.1",
 		"automattic/jetpack-changelogger": "^5.1.0",
-		"automattic/wordbless": "^0.4.2"
+		"automattic/jetpack-test-environment": "@dev"
 	},
 	"autoload": {
 		"classmap": [
@@ -27,9 +27,7 @@
 		],
 		"test-php": [
 			"@composer phpunit"
-		],
-		"post-install-cmd": "WorDBless\\Composer\\InstallDropin::copy",
-		"post-update-cmd": "WorDBless\\Composer\\InstallDropin::copy"
+		]
 	},
 	"minimum-stability": "dev",
 	"prefer-stable": true,

diff --git a/jetpack_vendor/automattic/jetpack-protect-models/src/class-protect-models.php b/jetpack_vendor/automattic/jetpack-protect-models/src/class-protect-models.php
@@ -12,5 +12,5 @@
  */
 class Protect_Models {
 
-	const PACKAGE_VERSION = '0.4.1';
+	const PACKAGE_VERSION = '0.4.2-alpha';
 }
diff --git a/jetpack_vendor/automattic/jetpack-protect-status/CHANGELOG.md b/jetpack_vendor/automattic/jetpack-protect-status/CHANGELOG.md
@@ -5,6 +5,10 @@ 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.4.3-alpha] - unreleased
+
+This is an alpha version! The changes listed here are not final.
+
 ## [0.4.2] - 2025-01-20
 ### Fixed
 - Fix Current_Plan::supports() call from breaking cache on every call. [#41010]
@@ -67,6 +71,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 - Updated package dependencies. [#37894]
 
+[0.4.3-alpha]: https://github.com/Automattic/jetpack-protect-status/compare/v0.4.2...v0.4.3-alpha
 [0.4.2]: https://github.com/Automattic/jetpack-protect-status/compare/v0.4.1...v0.4.2
 [0.4.1]: https://github.com/Automattic/jetpack-protect-status/compare/v0.4.0...v0.4.1
 [0.4.0]: https://github.com/Automattic/jetpack-protect-status/compare/v0.3.1...v0.4.0

diff --git a/jetpack_vendor/automattic/jetpack-protect-status/composer.json b/jetpack_vendor/automattic/jetpack-protect-status/composer.json
@@ -8,13 +8,13 @@
 		"automattic/jetpack-connection": "^6.3.2-alpha",
 		"automattic/jetpack-plugins-installer": "^0.5.0",
 		"automattic/jetpack-sync": "^4.6.0-alpha",
-		"automattic/jetpack-protect-models": "^0.4.1",
-		"automattic/jetpack-plans": "^0.5.1"
+		"automattic/jetpack-protect-models": "^0.4.2-alpha",
+		"automattic/jetpack-plans": "^0.5.2-alpha"
 	},
 	"require-dev": {
 		"yoast/phpunit-polyfills": "^1.1.1",
 		"automattic/jetpack-changelogger": "^5.1.0",
-		"automattic/wordbless": "^0.4.2"
+		"automattic/jetpack-test-environment": "@dev"
 	},
 	"autoload": {
 		"classmap": [
@@ -27,8 +27,6 @@
 		"phpunit": [
 			"./vendor/phpunit/phpunit/phpunit --colors=always"
 		],
-		"post-install-cmd": "WorDBless\\Composer\\InstallDropin::copy",
-		"post-update-cmd": "WorDBless\\Composer\\InstallDropin::copy",
 		"test-coverage": [
 			"php -dpcov.directory=. ./vendor/bin/phpunit --coverage-php \"$COVERAGE_DIR/php.cov\""
 		],

diff --git a/jetpack_vendor/automattic/jetpack-protect-status/src/class-status.php b/jetpack_vendor/automattic/jetpack-protect-status/src/class-status.php
@@ -14,7 +14,7 @@
  */
 class Status {
 
-	const PACKAGE_VERSION = '0.4.2';
+	const PACKAGE_VERSION = '0.4.3-alpha';
 	/**
 	 * Name of the option where status is stored
 	 *

diff --git a/jetpack_vendor/automattic/jetpack-sync/composer.json b/jetpack_vendor/automattic/jetpack-sync/composer.json
@@ -7,7 +7,7 @@
 		"php": ">=7.2",
 		"automattic/jetpack-connection": "^6.3.2-alpha",
 		"automattic/jetpack-constants": "^3.0.1",
-		"automattic/jetpack-password-checker": "^0.4.1",
+		"automattic/jetpack-password-checker": "^0.4.2-alpha",
 		"automattic/jetpack-ip": "^0.4.1",
 		"automattic/jetpack-roles": "^3.0.1",
 		"automattic/jetpack-status": "^5.0.2"
@@ -16,8 +16,8 @@
 		"automattic/jetpack-changelogger": "^5.1.0",
 		"yoast/phpunit-polyfills": "^1.1.1",
 		"automattic/jetpack-search": "@dev",
-		"automattic/jetpack-waf": "^0.23.2",
-		"automattic/wordbless": "^0.4.2"
+		"automattic/jetpack-waf": "^0.23.3-alpha",
+		"automattic/jetpack-test-environment": "@dev"
 	},
 	"suggest": {
 		"automattic/jetpack-autoloader": "Allow for better interoperability with other plugins that use this package."
@@ -36,9 +36,7 @@
 		],
 		"test-php": [
 			"@composer phpunit"
-		],
-		"post-install-cmd": "WorDBless\\Composer\\InstallDropin::copy",
-		"post-update-cmd": "WorDBless\\Composer\\InstallDropin::copy"
+		]
 	},
 	"minimum-stability": "dev",
 	"prefer-stable": true,

diff --git a/jetpack_vendor/automattic/jetpack-videopress/composer.json b/jetpack_vendor/automattic/jetpack-videopress/composer.json
@@ -9,13 +9,13 @@
 		"automattic/jetpack-assets": "^4.0.4-alpha",
 		"automattic/jetpack-connection": "^6.3.2-alpha",
 		"automattic/jetpack-my-jetpack": "^5.4.1-alpha",
-		"automattic/jetpack-plans": "^0.5.1"
+		"automattic/jetpack-plans": "^0.5.2-alpha"
 	},
 	"require-dev": {
 		"yoast/phpunit-polyfills": "^1.1.1",
 		"automattic/jetpack-changelogger": "^5.1.0",
-		"automattic/wordbless": "^0.4.2",
-		"brain/monkey": "^2.6.2"
+		"automattic/jetpack-test-environment": "@dev",
+		"brain/monkey": "2.6.2"
 	},
 	"suggest": {
 		"automattic/jetpack-autoloader": "Allow for better interoperability with other plugins that use this package."
@@ -45,9 +45,7 @@
 		"watch": [
 			"Composer\\Config::disableProcessTimeout",
 			"pnpm run watch"
-		],
-		"post-install-cmd": "WorDBless\\Composer\\InstallDropin::copy",
-		"post-update-cmd": "WorDBless\\Composer\\InstallDropin::copy"
+		]
 	},
 	"minimum-stability": "dev",
 	"prefer-stable": true,

diff --git a/jetpack_vendor/i18n-map.php b/jetpack_vendor/i18n-map.php
@@ -6,7 +6,7 @@
   'packages' => array(
     'jetpack-admin-ui' => array(
       'path' => 'jetpack_vendor/automattic/jetpack-admin-ui',
-      'ver' => '0.5.2-alpha1738230497',
+      'ver' => '0.5.2-alpha1738336718',
     ),
     'jetpack-assets' => array(
       'path' => 'jetpack_vendor/automattic/jetpack-assets',
@@ -26,7 +26,7 @@
     ),
     'jetpack-connection' => array(
       'path' => 'jetpack_vendor/automattic/jetpack-connection',
-      'ver' => '6.3.2-alpha1737997918',
+      'ver' => '6.3.2-alpha1738336718',
     ),
     'jetpack-explat' => array(
       'path' => 'jetpack_vendor/automattic/jetpack-explat',
@@ -42,35 +42,35 @@
     ),
     'jetpack-licensing' => array(
       'path' => 'jetpack_vendor/automattic/jetpack-licensing',
-      'ver' => '3.0.3',
+      'ver' => '3.0.4-alpha1738336718',
     ),
     'jetpack-my-jetpack' => array(
       'path' => 'jetpack_vendor/automattic/jetpack-my-jetpack',
-      'ver' => '5.4.1-alpha1738331609',
+      'ver' => '5.4.1-alpha1738336718',
     ),
     'jetpack-password-checker' => array(
       'path' => 'jetpack_vendor/automattic/jetpack-password-checker',
-      'ver' => '0.4.1',
+      'ver' => '0.4.2-alpha1738336718',
     ),
     'jetpack-plugins-installer' => array(
       'path' => 'jetpack_vendor/automattic/jetpack-plugins-installer',
       'ver' => '0.5.0',
     ),
     'jetpack-protect-models' => array(
       'path' => 'jetpack_vendor/automattic/jetpack-protect-models',
-      'ver' => '0.4.1',
+      'ver' => '0.4.2-alpha1738336718',
     ),
     'jetpack-protect-status' => array(
       'path' => 'jetpack_vendor/automattic/jetpack-protect-status',
-      'ver' => '0.4.2',
+      'ver' => '0.4.3-alpha1738336718',
     ),
     'jetpack-sync' => array(
       'path' => 'jetpack_vendor/automattic/jetpack-sync',
-      'ver' => '4.6.0-alpha1738231842',
+      'ver' => '4.6.0-alpha1738336718',
     ),
     'jetpack-videopress-pkg' => array(
       'path' => 'jetpack_vendor/automattic/jetpack-videopress',
-      'ver' => '0.25.9-alpha1737997918',
+      'ver' => '0.25.9-alpha1738336718',
     ),
   ),
 );
diff --git a/vendor/automattic/jetpack-plans/CHANGELOG.md b/vendor/automattic/jetpack-plans/CHANGELOG.md
@@ -5,6 +5,10 @@ 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.5.2-alpha] - unreleased
+
+This is an alpha version! The changes listed here are not final.
+
 ## [0.5.1] - 2024-11-25
 ### Changed
 - Updated dependencies. [#40286]
@@ -170,6 +174,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Deprecated
 - Moved the options class into Connection. [#24095]
 
+[0.5.2-alpha]: https://github.com/Automattic/jetpack-plans/compare/v0.5.1...v0.5.2-alpha
 [0.5.1]: https://github.com/Automattic/jetpack-plans/compare/v0.5.0...v0.5.1
 [0.5.0]: https://github.com/Automattic/jetpack-plans/compare/v0.4.13...v0.5.0
 [0.4.13]: https://github.com/Automattic/jetpack-plans/compare/v0.4.12...v0.4.13