Janitorial: Disparate cleanup tasks (#40200)

* Remove Phan suppression now that PHPDoc is correct in supported WP versions * Remove WP 6.5 polyfill (see #38428) * Remove is_callable check for wp_trigger_error() * setMethods → onlyMethods * static → const property * Add type hinting * Throw exception instead of triggering deprecation notice * Remove now-unneeded CSS * Updated comment * Add future todo * Remove fallbacks * Add changelogs * Remove composer downgrade logic * CRM requires PHP 7.4 already * Super Cache has previously required WP 6.5 * Vaultpress has previous required WP 5.2 * Get realpath of temp dir * Fix changelogger tests * Add changelogs * Fix typo * Adjust comment * Simplify logic * See if this sates tests * Jetpack::is_connection_ready has been around in its current state since JP 9.7 * Remove checks for more long-present calls * Clean up Phan suppressions * Update changelog Co-authored-by: Brad Jorsch <anomiex@users.noreply.github.com> * Update changelog Co-authored-by: Brad Jorsch <anomiex@users.noreply.github.com> * Remove old comment --------- Co-authored-by: Brad Jorsch <anomiex@users.noreply.github.com> Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/11897114078 Upstream-Ref: Automattic/jetpack@d4ff610
Automattic · Nov 18, 2024 · ec960af · ec960af
1 parent e24e90d
commit ec960af
Show file tree

Hide file tree

Showing 42 changed files with 267 additions and 282 deletions.
diff --git a/composer.json b/composer.json
@@ -8,7 +8,7 @@
 	},
 	"require-dev": {
 		"yoast/phpunit-polyfills": "^1.1.1",
-		"automattic/jetpack-changelogger": "^5.0.0"
+		"automattic/jetpack-changelogger": "^5.1.0-alpha"
 	},
 	"autoload": {
 		"classmap": [

diff --git a/composer.lock b/composer.lock
diff --git a/vendor/automattic/jetpack-a8c-mc-stats/composer.json b/vendor/automattic/jetpack-a8c-mc-stats/composer.json
@@ -8,7 +8,7 @@
 	},
 	"require-dev": {
 		"yoast/phpunit-polyfills": "^1.1.1",
-		"automattic/jetpack-changelogger": "^5.0.0"
+		"automattic/jetpack-changelogger": "^5.1.0-alpha"
 	},
 	"suggest": {
 		"automattic/jetpack-autoloader": "Allow for better interoperability with other plugins that use this package."

diff --git a/vendor/automattic/jetpack-admin-ui/composer.json b/vendor/automattic/jetpack-admin-ui/composer.json
@@ -8,7 +8,7 @@
 	},
 	"require-dev": {
 		"yoast/phpunit-polyfills": "^1.1.1",
-		"automattic/jetpack-changelogger": "^5.0.0",
+		"automattic/jetpack-changelogger": "^5.1.0-alpha",
 		"automattic/jetpack-logo": "^3.0.0",
 		"automattic/wordbless": "dev-master"
 	},

diff --git a/vendor/automattic/jetpack-assets/CHANGELOG.md b/vendor/automattic/jetpack-assets/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).
 
+## [4.0.0-alpha] - unreleased
+
+This is an alpha version! The changes listed here are not final.
+
+### Removed
+- Remove JSX runtime polyfill, now that we've dropped support for WordPress < 6.6.
+
 ## [3.0.0] - 2024-11-14
 ### Removed
 - General: Update minimum PHP version to 7.2. [#40147]
@@ -529,6 +536,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Statically access asset tools
 
+[4.0.0-alpha]: https://github.com/Automattic/jetpack-assets/compare/v3.0.0...v4.0.0-alpha
 [3.0.0]: https://github.com/Automattic/jetpack-assets/compare/v2.3.14...v3.0.0
 [2.3.14]: https://github.com/Automattic/jetpack-assets/compare/v2.3.13...v2.3.14
 [2.3.13]: https://github.com/Automattic/jetpack-assets/compare/v2.3.12...v2.3.13

diff --git a/vendor/automattic/jetpack-assets/build/react-jsx-runtime.js b/vendor/automattic/jetpack-assets/build/react-jsx-runtime.js
diff --git a/vendor/automattic/jetpack-assets/build/react-jsx-runtime.js.LICENSE.txt b/vendor/automattic/jetpack-assets/build/react-jsx-runtime.js.LICENSE.txt
diff --git a/vendor/automattic/jetpack-assets/composer.json b/vendor/automattic/jetpack-assets/composer.json
@@ -10,7 +10,7 @@
 	"require-dev": {
 		"brain/monkey": "2.6.1",
 		"yoast/phpunit-polyfills": "^1.1.1",
-		"automattic/jetpack-changelogger": "^5.0.0",
+		"automattic/jetpack-changelogger": "^5.1.0-alpha",
 		"wikimedia/testing-access-wrapper": "^1.0 || ^2.0 || ^3.0"
 	},
 	"suggest": {
@@ -52,7 +52,7 @@
 			"link-template": "https://github.com/Automattic/jetpack-assets/compare/v${old}...v${new}"
 		},
 		"branch-alias": {
-			"dev-trunk": "3.0.x-dev"
+			"dev-trunk": "4.0.x-dev"
 		}
 	}
 }
diff --git a/vendor/automattic/jetpack-assets/src/class-assets.php b/vendor/automattic/jetpack-assets/src/class-assets.php
@@ -537,12 +537,6 @@ public static function wp_default_scripts_hook( $wp_scripts ) {
 		$wp_scripts->add( 'wp-jp-i18n-state', false, array( 'wp-deprecated', $handle ) );
 		$wp_scripts->add_inline_script( 'wp-jp-i18n-state', 'wp.deprecated( "wp-jp-i18n-state", { alternative: "wp-jp-i18n-loader" } );' );
 		$wp_scripts->add_inline_script( 'wp-jp-i18n-state', 'wp.jpI18nState = wp.jpI18nLoader.state;' );
-
-		// Register the React JSX runtime script - used as a polyfill until we can update JSX transforms. See https://github.com/Automattic/jetpack/issues/38424.
-		// @todo Remove this when we drop support for WordPress 6.5, as well as the script inclusion in test_wp_default_scripts_hook.
-		$jsx_url = self::normalize_path( plugins_url( '../build/react-jsx-runtime.js', __FILE__ ) );
-		$wp_scripts->add( 'react-jsx-runtime', $jsx_url, array( 'react' ), '18.3.1', true );
-		$wp_scripts->add_data( 'react-jsx-runtime', 'group', 1 );
 	}
 
 	// endregion .

diff --git a/vendor/automattic/jetpack-blaze/composer.json b/vendor/automattic/jetpack-blaze/composer.json
@@ -5,17 +5,17 @@
 	"license": "GPL-2.0-or-later",
 	"require": {
 		"php": ">=7.2",
-		"automattic/jetpack-assets": "^3.0.0",
+		"automattic/jetpack-assets": "^4.0.0-alpha",
 		"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",
-		"automattic/jetpack-status": "^5.0.0",
+		"automattic/jetpack-status": "^5.0.1-alpha",
 		"automattic/jetpack-sync": "^4.0.0"
 	},
 	"require-dev": {
 		"yoast/phpunit-polyfills": "^1.1.1",
-		"automattic/jetpack-changelogger": "^5.0.0",
+		"automattic/jetpack-changelogger": "^5.1.0-alpha",
 		"automattic/wordbless": "@dev"
 	},
 	"suggest": {

diff --git a/vendor/automattic/jetpack-blocks/composer.json b/vendor/automattic/jetpack-blocks/composer.json
@@ -11,7 +11,7 @@
 		"automattic/wordbless": "dev-master",
 		"brain/monkey": "2.6.1",
 		"yoast/phpunit-polyfills": "^1.1.1",
-		"automattic/jetpack-changelogger": "^5.0.0"
+		"automattic/jetpack-changelogger": "^5.1.0-alpha"
 	},
 	"suggest": {
 		"automattic/jetpack-autoloader": "Allow for better interoperability with other plugins that use this package."

diff --git a/vendor/automattic/jetpack-calypsoify/composer.json b/vendor/automattic/jetpack-calypsoify/composer.json
@@ -5,12 +5,12 @@
 	"license": "GPL-2.0-or-later",
 	"require": {
 		"php": ">=7.2",
-		"automattic/jetpack-assets": "^3.0.0",
-		"automattic/jetpack-status": "^5.0.0"
+		"automattic/jetpack-assets": "^4.0.0-alpha",
+		"automattic/jetpack-status": "^5.0.1-alpha"
 	},
 	"require-dev": {
 		"yoast/phpunit-polyfills": "^1.1.1",
-		"automattic/jetpack-changelogger": "^5.0.0"
+		"automattic/jetpack-changelogger": "^5.1.0-alpha"
 	},
 	"autoload": {
 		"classmap": [

diff --git a/vendor/automattic/jetpack-classic-theme-helper/composer.json b/vendor/automattic/jetpack-classic-theme-helper/composer.json
@@ -5,11 +5,11 @@
 	"license": "GPL-2.0-or-later",
 	"require": {
 		"php": ">=7.2",
-		"automattic/jetpack-assets": "^3.0.0"
+		"automattic/jetpack-assets": "^4.0.0-alpha"
 	},
 	"require-dev": {
 		"yoast/phpunit-polyfills": "^1.1.1",
-		"automattic/jetpack-changelogger": "^5.0.0",
+		"automattic/jetpack-changelogger": "^5.1.0-alpha",
 		"automattic/wordbless": "dev-master"
 	},
 	"autoload": {

diff --git a/vendor/automattic/jetpack-compat/composer.json b/vendor/automattic/jetpack-compat/composer.json
@@ -7,7 +7,7 @@
 		"php": ">=7.2"
 	},
 	"require-dev": {
-		"automattic/jetpack-changelogger": "^5.0.0"
+		"automattic/jetpack-changelogger": "^5.1.0-alpha"
 	},
 	"suggest": {
 		"automattic/jetpack-autoloader": "Allow for better interoperability with other plugins that use this package."

diff --git a/vendor/automattic/jetpack-connection/composer.json b/vendor/automattic/jetpack-connection/composer.json
@@ -7,17 +7,17 @@
 		"php": ">=7.2",
 		"automattic/jetpack-a8c-mc-stats": "^3.0.0",
 		"automattic/jetpack-admin-ui": "^0.5.0",
-		"automattic/jetpack-assets": "^3.0.0",
+		"automattic/jetpack-assets": "^4.0.0-alpha",
 		"automattic/jetpack-constants": "^3.0.0",
 		"automattic/jetpack-roles": "^3.0.0",
-		"automattic/jetpack-status": "^5.0.0",
+		"automattic/jetpack-status": "^5.0.1-alpha",
 		"automattic/jetpack-redirect": "^3.0.0"
 	},
 	"require-dev": {
 		"automattic/wordbless": "@dev",
 		"yoast/phpunit-polyfills": "^1.1.1",
 		"brain/monkey": "2.6.1",
-		"automattic/jetpack-changelogger": "^5.0.0"
+		"automattic/jetpack-changelogger": "^5.1.0-alpha"
 	},
 	"suggest": {
 		"automattic/jetpack-autoloader": "Allow for better interoperability with other plugins that use this package."

diff --git a/vendor/automattic/jetpack-constants/composer.json b/vendor/automattic/jetpack-constants/composer.json
@@ -9,7 +9,7 @@
 	"require-dev": {
 		"brain/monkey": "2.6.1",
 		"yoast/phpunit-polyfills": "^1.1.1",
-		"automattic/jetpack-changelogger": "^5.0.0"
+		"automattic/jetpack-changelogger": "^5.1.0-alpha"
 	},
 	"suggest": {
 		"automattic/jetpack-autoloader": "Allow for better interoperability with other plugins that use this package."

diff --git a/vendor/automattic/jetpack-device-detection/composer.json b/vendor/automattic/jetpack-device-detection/composer.json
@@ -8,7 +8,7 @@
 	},
 	"require-dev": {
 		"yoast/phpunit-polyfills": "^1.1.1",
-		"automattic/jetpack-changelogger": "^5.0.0"
+		"automattic/jetpack-changelogger": "^5.1.0-alpha"
 	},
 	"suggest": {
 		"automattic/jetpack-autoloader": "Allow for better interoperability with other plugins that use this package."

diff --git a/vendor/automattic/jetpack-google-analytics/composer.json b/vendor/automattic/jetpack-google-analytics/composer.json
@@ -5,11 +5,11 @@
 	"license": "GPL-2.0-or-later",
 	"require": {
 		"php": ">=7.2",
-		"automattic/jetpack-status": "^5.0.0"
+		"automattic/jetpack-status": "^5.0.1-alpha"
 	},
 	"require-dev": {
 		"yoast/phpunit-polyfills": "^1.1.1",
-		"automattic/jetpack-changelogger": "^5.0.0",
+		"automattic/jetpack-changelogger": "^5.1.0-alpha",
 		"automattic/wordbless": "^0.4.2"
 	},
 	"autoload": {

diff --git a/vendor/automattic/jetpack-ip/composer.json b/vendor/automattic/jetpack-ip/composer.json
@@ -9,7 +9,7 @@
 	"require-dev": {
 		"brain/monkey": "2.6.1",
 		"yoast/phpunit-polyfills": "^1.1.1",
-		"automattic/jetpack-changelogger": "^5.0.0"
+		"automattic/jetpack-changelogger": "^5.1.0-alpha"
 	},
 	"suggest": {
 		"automattic/jetpack-autoloader": "Allow for better interoperability with other plugins that use this package."

diff --git a/vendor/automattic/jetpack-jitm/composer.json b/vendor/automattic/jetpack-jitm/composer.json
@@ -6,17 +6,17 @@
 	"require": {
 		"php": ">=7.2",
 		"automattic/jetpack-a8c-mc-stats": "^3.0.0",
-		"automattic/jetpack-assets": "^3.0.0",
+		"automattic/jetpack-assets": "^4.0.0-alpha",
 		"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",
-		"automattic/jetpack-status": "^5.0.0"
+		"automattic/jetpack-status": "^5.0.1-alpha"
 	},
 	"require-dev": {
 		"brain/monkey": "2.6.1",
 		"yoast/phpunit-polyfills": "^1.1.1",
-		"automattic/jetpack-changelogger": "^5.0.0"
+		"automattic/jetpack-changelogger": "^5.1.0-alpha"
 	},
 	"suggest": {
 		"automattic/jetpack-autoloader": "Allow for better interoperability with other plugins that use this package."

diff --git a/vendor/automattic/jetpack-logo/composer.json b/vendor/automattic/jetpack-logo/composer.json
@@ -8,7 +8,7 @@
 	},
 	"require-dev": {
 		"yoast/phpunit-polyfills": "^1.1.1",
-		"automattic/jetpack-changelogger": "^5.0.0"
+		"automattic/jetpack-changelogger": "^5.1.0-alpha"
 	},
 	"suggest": {
 		"automattic/jetpack-autoloader": "Allow for better interoperability with other plugins that use this package."

diff --git a/vendor/automattic/jetpack-masterbar/composer.json b/vendor/automattic/jetpack-masterbar/composer.json
@@ -5,20 +5,20 @@
 	"license": "GPL-2.0-or-later",
 	"require": {
 		"php": ">=7.2",
-		"automattic/jetpack-assets": "^3.0.0",
+		"automattic/jetpack-assets": "^4.0.0-alpha",
 		"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.1-alpha",
 		"automattic/jetpack-jitm": "^4.0.0",
 		"automattic/jetpack-logo": "^3.0.0",
 		"automattic/jetpack-plans": "^0.5.0",
-		"automattic/jetpack-status": "^5.0.0"
+		"automattic/jetpack-status": "^5.0.1-alpha"
 	},
 	"require-dev": {
 		"brain/monkey": "2.6.1",
 		"yoast/phpunit-polyfills": "^1.1.1",
-		"automattic/jetpack-changelogger": "^5.0.0",
+		"automattic/jetpack-changelogger": "^5.1.0-alpha",
 		"automattic/patchwork-redefine-exit": "^2.0.0-alpha",
 		"automattic/wordbless": "dev-master"
 	},

diff --git a/vendor/automattic/jetpack-mu-wpcom/composer.json b/vendor/automattic/jetpack-mu-wpcom/composer.json
@@ -5,23 +5,23 @@
 	"license": "GPL-2.0-or-later",
 	"require": {
 		"php": ">=7.2",
-		"automattic/jetpack-assets": "^3.0.0",
+		"automattic/jetpack-assets": "^4.0.0-alpha",
 		"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.1-alpha",
 		"automattic/jetpack-masterbar": "^0.10.0-alpha",
 		"automattic/jetpack-redirect": "^3.0.0",
 		"automattic/jetpack-stats-admin": "^0.23.0-alpha",
-		"automattic/jetpack-status": "^5.0.0",
+		"automattic/jetpack-status": "^5.0.1-alpha",
 		"automattic/scheduled-updates": "^0.14.0-alpha",
 		"automattic/jetpack-compat": "^4.0.0-alpha",
 		"automattic/jetpack-google-analytics": "^0.3.0-alpha",
 		"scssphp/scssphp": "1.12.0"
 	},
 	"require-dev": {
 		"yoast/phpunit-polyfills": "^1.1.1",
-		"automattic/jetpack-changelogger": "^5.0.0",
+		"automattic/jetpack-changelogger": "^5.1.0-alpha",
 		"automattic/wordbless": "0.4.2"
 	},
 	"suggest": {

diff --git a/...c/build/wpcom-blocks-event-countdown-editor/wpcom-blocks-event-countdown-editor.asset.php b/...c/build/wpcom-blocks-event-countdown-editor/wpcom-blocks-event-countdown-editor.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('jetpack-connection', 'lodash', 'moment', 'react', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-data', 'wp-date', 'wp-element', 'wp-i18n', 'wp-plugins', 'wp-polyfill', 'wp-url'), 'version' => '68582e65b89bf93a6ee6');
+<?php return array('dependencies' => array('jetpack-connection', 'lodash', 'moment', 'react', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-data', 'wp-date', 'wp-element', 'wp-i18n', 'wp-plugins', 'wp-polyfill', 'wp-url'), 'version' => '02a7f104a494a41cecea');
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<?php return array('dependencies' => array('jetpack-connection', 'lodash', 'moment', 'react', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-data', 'wp-date', 'wp-element', 'wp-i18n', 'wp-plugins', 'wp-polyfill', 'wp-url'), 'version' => '68582e65b89bf93a6ee6');
		<?php return array('dependencies' => array('jetpack-connection', 'lodash', 'moment', 'react', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-data', 'wp-date', 'wp-element', 'wp-i18n', 'wp-plugins', 'wp-polyfill', 'wp-url'), 'version' => '02a7f104a494a41cecea');