Update query parameter for JITM requests (#41542)

* Update query parameter for JITM requests * changelog * Use null coalescing operator Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/13268950573 Upstream-Ref: Automattic/jetpack@821e82b
Automattic · Feb 11, 2025 · 4aa301d · 4aa301d
1 parent 71ee151
commit 4aa301d
Show file tree

Hide file tree

Showing 25 changed files with 239 additions and 223 deletions.
diff --git a/composer.json b/composer.json
@@ -4,13 +4,13 @@
 	"type": "wordpress-plugin",
 	"license": "GPL-2.0-or-later",
 	"require": {
-		"automattic/jetpack-assets": "^4.0.5",
+		"automattic/jetpack-assets": "^4.0.6",
 		"automattic/jetpack-admin-ui": "^0.5.2",
 		"automattic/jetpack-autoloader": "^5.0.1",
 		"automattic/jetpack-composer-plugin": "^4.0.0",
 		"automattic/jetpack-config": "^3.0.0",
-		"automattic/jetpack-connection": "^6.4.0",
-		"automattic/jetpack-my-jetpack": "^5.4.3-alpha",
+		"automattic/jetpack-connection": "^6.4.1",
+		"automattic/jetpack-my-jetpack": "^5.4.4-alpha",
 		"automattic/jetpack-sync": "^4.7.0",
 		"automattic/jetpack-status": "^5.0.3"
 	},

diff --git a/jetpack_vendor/automattic/jetpack-assets/CHANGELOG.md b/jetpack_vendor/automattic/jetpack-assets/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).
 
+## [4.0.6] - 2025-02-11
+### Changed
+- Update dependencies.
+
 ## [4.0.5] - 2025-02-05
 ### Changed
 - Updated package dependencies. [#41491]
@@ -556,6 +560,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Statically access asset tools
 
+[4.0.6]: https://github.com/Automattic/jetpack-assets/compare/v4.0.5...v4.0.6
 [4.0.5]: https://github.com/Automattic/jetpack-assets/compare/v4.0.4...v4.0.5
 [4.0.4]: https://github.com/Automattic/jetpack-assets/compare/v4.0.3...v4.0.4
 [4.0.3]: https://github.com/Automattic/jetpack-assets/compare/v4.0.2...v4.0.3

diff --git a/jetpack_vendor/automattic/jetpack-boost-core/composer.json b/jetpack_vendor/automattic/jetpack-boost-core/composer.json
@@ -5,7 +5,7 @@
 	"license": "GPL-2.0-or-later",
 	"require": {
 		"php": ">=7.2",
-		"automattic/jetpack-connection": "^6.4.0"
+		"automattic/jetpack-connection": "^6.4.1"
 	},
 	"require-dev": {
 		"yoast/phpunit-polyfills": "^1.1.1",

diff --git a/jetpack_vendor/automattic/jetpack-connection/CHANGELOG.md b/jetpack_vendor/automattic/jetpack-connection/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).
 
+## [6.4.1] - 2025-02-11
+### Changed
+- Update dependencies.
+
 ## [6.4.0] - 2025-02-10
 ### Changed
 - Tracks: Add site type to events [#41307]
@@ -1303,6 +1307,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Separate the connection library into its own package.
 
+[6.4.1]: https://github.com/Automattic/jetpack-connection/compare/v6.4.0...v6.4.1
 [6.4.0]: https://github.com/Automattic/jetpack-connection/compare/v6.3.2...v6.4.0
 [6.3.2]: https://github.com/Automattic/jetpack-connection/compare/v6.3.1...v6.3.2
 [6.3.1]: https://github.com/Automattic/jetpack-connection/compare/v6.3.0...v6.3.1

diff --git a/jetpack_vendor/automattic/jetpack-connection/composer.json b/jetpack_vendor/automattic/jetpack-connection/composer.json
@@ -7,7 +7,7 @@
 		"php": ">=7.2",
 		"automattic/jetpack-a8c-mc-stats": "^3.0.0",
 		"automattic/jetpack-admin-ui": "^0.5.2",
-		"automattic/jetpack-assets": "^4.0.5",
+		"automattic/jetpack-assets": "^4.0.6",
 		"automattic/jetpack-constants": "^3.0.1",
 		"automattic/jetpack-roles": "^3.0.1",
 		"automattic/jetpack-status": "^5.0.3",

diff --git a/jetpack_vendor/automattic/jetpack-connection/src/class-package-version.php b/jetpack_vendor/automattic/jetpack-connection/src/class-package-version.php
@@ -12,7 +12,7 @@
  */
 class Package_Version {
 
-	const PACKAGE_VERSION = '6.4.0';
+	const PACKAGE_VERSION = '6.4.1';
 
 	const PACKAGE_SLUG = 'connection';
 

diff --git a/jetpack_vendor/automattic/jetpack-explat/composer.json b/jetpack_vendor/automattic/jetpack-explat/composer.json
@@ -5,7 +5,7 @@
 	"license": "GPL-2.0-or-later",
 	"require": {
 		"php": ">=7.2",
-		"automattic/jetpack-connection": "^6.4.0"
+		"automattic/jetpack-connection": "^6.4.1"
 	},
 	"require-dev": {
 		"yoast/phpunit-polyfills": "^1.1.1",

diff --git a/jetpack_vendor/automattic/jetpack-jitm/CHANGELOG.md b/jetpack_vendor/automattic/jetpack-jitm/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.7-alpha] - unreleased
+
+This is an alpha version! The changes listed here are not final.
+
+### Fixed
+- Fix the query parameter used for JITM query strings
+
 ## [4.0.6] - 2025-02-10
 ### Changed
 - Updated package dependencies. [#41491]
@@ -824,6 +831,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Update Jetpack to use new JITM package
 
+[4.0.7-alpha]: https://github.com/Automattic/jetpack-jitm/compare/v4.0.6...v4.0.7-alpha
 [4.0.6]: https://github.com/Automattic/jetpack-jitm/compare/v4.0.5...v4.0.6
 [4.0.5]: https://github.com/Automattic/jetpack-jitm/compare/v4.0.4...v4.0.5
 [4.0.4]: https://github.com/Automattic/jetpack-jitm/compare/v4.0.3...v4.0.4

diff --git a/jetpack_vendor/automattic/jetpack-jitm/composer.json b/jetpack_vendor/automattic/jetpack-jitm/composer.json
@@ -6,8 +6,8 @@
 	"require": {
 		"php": ">=7.2",
 		"automattic/jetpack-a8c-mc-stats": "^3.0.0",
-		"automattic/jetpack-assets": "^4.0.5",
-		"automattic/jetpack-connection": "^6.4.0",
+		"automattic/jetpack-assets": "^4.0.6",
+		"automattic/jetpack-connection": "^6.4.1",
 		"automattic/jetpack-device-detection": "^3.0.0",
 		"automattic/jetpack-logo": "^3.0.0",
 		"automattic/jetpack-redirect": "^3.0.1",

diff --git a/jetpack_vendor/automattic/jetpack-jitm/src/class-jitm.php b/jetpack_vendor/automattic/jetpack-jitm/src/class-jitm.php
@@ -20,7 +20,7 @@
  */
 class JITM {
 
-	const PACKAGE_VERSION = '4.0.6';
+	const PACKAGE_VERSION = '4.0.7-alpha';
 
 	/**
 	 * The configuration method that is called from the jetpack-config package.

diff --git a/jetpack_vendor/automattic/jetpack-jitm/src/class-rest-api-endpoints.php b/jetpack_vendor/automattic/jetpack-jitm/src/class-rest-api-endpoints.php
@@ -58,12 +58,9 @@ public static function get_jitm_message( $request ) {
 		}
 
 		// add the search term to the query params if it exists
-		$query = $request['query'];
-		if ( ! empty( $request['s'] ) ) {
-			$query['s'] = $request['s'];
-		}
+		$query_param = $request['query'] ?? '';
 
-		return $jitm->get_messages( $request['message_path'], urldecode_deep( $query ), 'true' === $request['full_jp_logo_exists'] );
+		return $jitm->get_messages( $request['message_path'], urldecode_deep( array( 'query' => $query_param ) ), 'true' === $request['full_jp_logo_exists'] );
 	}
 
 	/**

diff --git a/jetpack_vendor/automattic/jetpack-licensing/composer.json b/jetpack_vendor/automattic/jetpack-licensing/composer.json
@@ -5,7 +5,7 @@
 	"license": "GPL-2.0-or-later",
 	"require": {
 		"php": ">=7.2",
-		"automattic/jetpack-connection": "^6.4.0"
+		"automattic/jetpack-connection": "^6.4.1"
 	},
 	"require-dev": {
 		"automattic/jetpack-test-environment": "@dev",

diff --git a/jetpack_vendor/automattic/jetpack-my-jetpack/CHANGELOG.md b/jetpack_vendor/automattic/jetpack-my-jetpack/CHANGELOG.md
@@ -5,16 +5,19 @@ 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).
 
-## [5.4.3-alpha] - unreleased
+## [5.4.4-alpha] - unreleased
 
 This is an alpha version! The changes listed here are not final.
 
+### Changed
+- Cache scan calls if no threats are found to improve performance
+
+## [5.4.3] - 2025-02-11
 ### Added
-- My Jetpack: Allow product notices to be closed with persistence.
+- My Jetpack: Allow product notices to be closed with persistence. [#41617]
 
 ### Changed
-- Cache scan calls if no threats are found to improve performance
-- Make entire row of dataview clickable when on mobile
+- Make entire row of dataview clickable when on mobile [#41643]
 
 ## [5.4.2] - 2025-02-10
 ### Added
@@ -1961,7 +1964,8 @@ This is an alpha version! The changes listed here are not final.
 ### Added
 - Created package
 
-[5.4.3-alpha]: https://github.com/Automattic/jetpack-my-jetpack/compare/5.4.2...5.4.3-alpha
+[5.4.4-alpha]: https://github.com/Automattic/jetpack-my-jetpack/compare/5.4.3...5.4.4-alpha
+[5.4.3]: https://github.com/Automattic/jetpack-my-jetpack/compare/5.4.2...5.4.3
 [5.4.2]: https://github.com/Automattic/jetpack-my-jetpack/compare/5.4.1...5.4.2
 [5.4.1]: https://github.com/Automattic/jetpack-my-jetpack/compare/5.4.0...5.4.1
 [5.4.0]: https://github.com/Automattic/jetpack-my-jetpack/compare/5.3.3...5.4.0

diff --git a/jetpack_vendor/automattic/jetpack-my-jetpack/composer.json b/jetpack_vendor/automattic/jetpack-my-jetpack/composer.json
@@ -6,19 +6,19 @@
 	"require": {
 		"php": ">=7.2",
 		"automattic/jetpack-admin-ui": "^0.5.2",
-		"automattic/jetpack-assets": "^4.0.5",
+		"automattic/jetpack-assets": "^4.0.6",
 		"automattic/jetpack-boost-speed-score": "^0.4.1",
-		"automattic/jetpack-connection": "^6.4.0",
+		"automattic/jetpack-connection": "^6.4.1",
 		"automattic/jetpack-explat": "^0.2.6",
-		"automattic/jetpack-jitm": "^4.0.6",
+		"automattic/jetpack-jitm": "^4.0.7-alpha",
 		"automattic/jetpack-licensing": "^3.0.4",
 		"automattic/jetpack-plugins-installer": "^0.5.0",
 		"automattic/jetpack-redirect": "^3.0.1",
 		"automattic/jetpack-constants": "^3.0.1",
 		"automattic/jetpack-plans": "^0.5.2",
 		"automattic/jetpack-status": "^5.0.3",
 		"automattic/jetpack-sync": "^4.7.0",
-		"automattic/jetpack-protect-status": "^0.5.1-alpha"
+		"automattic/jetpack-protect-status": "^0.5.1"
 	},
 	"require-dev": {
 		"yoast/phpunit-polyfills": "^1.1.1",

diff --git a/jetpack_vendor/automattic/jetpack-my-jetpack/src/class-initializer.php b/jetpack_vendor/automattic/jetpack-my-jetpack/src/class-initializer.php
@@ -41,7 +41,7 @@ class Initializer {
 	 *
 	 * @var string
 	 */
-	const PACKAGE_VERSION = '5.4.3-alpha';
+	const PACKAGE_VERSION = '5.4.4-alpha';
 
 	/**
 	 * HTML container ID for the IDC screen on My Jetpack page.

diff --git a/jetpack_vendor/automattic/jetpack-protect-status/CHANGELOG.md b/jetpack_vendor/automattic/jetpack-protect-status/CHANGELOG.md
@@ -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.5.1-alpha] - unreleased
-
-This is an alpha version! The changes listed here are not final.
-
+## [0.5.1] - 2025-02-11
 ### Fixed
-- Protect Status: ensure vulnerabilities property is always an array.
+- Protect Status: ensure vulnerabilities property is always an array. [#41694]
 
 ## [0.5.0] - 2025-02-10
 ### Changed
@@ -83,7 +80,7 @@ This is an alpha version! The changes listed here are not final.
 ### Changed
 - Updated package dependencies. [#37894]
 
-[0.5.1-alpha]: https://github.com/Automattic/jetpack-protect-status/compare/v0.5.0...v0.5.1-alpha
+[0.5.1]: https://github.com/Automattic/jetpack-protect-status/compare/v0.5.0...v0.5.1
 [0.5.0]: https://github.com/Automattic/jetpack-protect-status/compare/v0.4.3...v0.5.0
 [0.4.3]: https://github.com/Automattic/jetpack-protect-status/compare/v0.4.2...v0.4.3
 [0.4.2]: https://github.com/Automattic/jetpack-protect-status/compare/v0.4.1...v0.4.2

diff --git a/jetpack_vendor/automattic/jetpack-protect-status/composer.json b/jetpack_vendor/automattic/jetpack-protect-status/composer.json
@@ -5,7 +5,7 @@
 	"license": "GPL-2.0-or-later",
 	"require": {
 		"php": ">=7.2",
-		"automattic/jetpack-connection": "^6.4.0",
+		"automattic/jetpack-connection": "^6.4.1",
 		"automattic/jetpack-plugins-installer": "^0.5.0",
 		"automattic/jetpack-sync": "^4.7.0",
 		"automattic/jetpack-protect-models": "^0.5.0",

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.5.1-alpha';
+	const PACKAGE_VERSION = '0.5.1';
 	/**
 	 * 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
@@ -5,7 +5,7 @@
 	"license": "GPL-2.0-or-later",
 	"require": {
 		"php": ">=7.2",
-		"automattic/jetpack-connection": "^6.4.0",
+		"automattic/jetpack-connection": "^6.4.1",
 		"automattic/jetpack-constants": "^3.0.1",
 		"automattic/jetpack-password-checker": "^0.4.2",
 		"automattic/jetpack-ip": "^0.4.1",

diff --git a/jetpack_vendor/i18n-map.php b/jetpack_vendor/i18n-map.php
@@ -10,7 +10,7 @@
     ),
     'jetpack-assets' => array(
       'path' => 'jetpack_vendor/automattic/jetpack-assets',
-      'ver' => '4.0.5',
+      'ver' => '4.0.6',
     ),
     'jetpack-boost-core' => array(
       'path' => 'jetpack_vendor/automattic/jetpack-boost-core',
@@ -26,7 +26,7 @@
     ),
     'jetpack-connection' => array(
       'path' => 'jetpack_vendor/automattic/jetpack-connection',
-      'ver' => '6.4.0',
+      'ver' => '6.4.1',
     ),
     'jetpack-explat' => array(
       'path' => 'jetpack_vendor/automattic/jetpack-explat',
@@ -38,15 +38,15 @@
     ),
     'jetpack-jitm' => array(
       'path' => 'jetpack_vendor/automattic/jetpack-jitm',
-      'ver' => '4.0.6',
+      'ver' => '4.0.7-alpha1739295229',
     ),
     'jetpack-licensing' => array(
       'path' => 'jetpack_vendor/automattic/jetpack-licensing',
       'ver' => '3.0.4',
     ),
     'jetpack-my-jetpack' => array(
       'path' => 'jetpack_vendor/automattic/jetpack-my-jetpack',
-      'ver' => '5.4.3-alpha1739291673',
+      'ver' => '5.4.4-alpha1739293591',
     ),
     'jetpack-password-checker' => array(
       'path' => 'jetpack_vendor/automattic/jetpack-password-checker',
@@ -62,7 +62,7 @@
     ),
     'jetpack-protect-status' => array(
       'path' => 'jetpack_vendor/automattic/jetpack-protect-status',
-      'ver' => '0.5.1-alpha1739288537',
+      'ver' => '0.5.1',
     ),
     'jetpack-sync' => array(
       'path' => 'jetpack_vendor/automattic/jetpack-sync',

diff --git a/vendor/automattic/jetpack-plans/composer.json b/vendor/automattic/jetpack-plans/composer.json
@@ -5,7 +5,7 @@
 	"license": "GPL-2.0-or-later",
 	"require": {
 		"php": ">=7.2",
-		"automattic/jetpack-connection": "^6.4.0"
+		"automattic/jetpack-connection": "^6.4.1"
 	},
 	"require-dev": {
 		"yoast/phpunit-polyfills": "^1.1.1",