From 45832588a5a620ca43ef94c910528dd96e32074d Mon Sep 17 00:00:00 2001
From: Jason Moon <jason.moon@automattic.com>
Date: Mon, 15 Nov 2021 17:53:43 -0700
Subject: [PATCH 1/9] Migrate template tags class

---
 .../search/src/class-template-tags.php}       | 80 ++++++++++---------
 .../modules/search/class.jetpack-search.php   |  1 -
 .../jetpack/modules/widgets/search.php        | 19 +++--
 3 files changed, 55 insertions(+), 45 deletions(-)
 rename projects/{plugins/jetpack/modules/search/class.jetpack-search-template-tags.php => packages/search/src/class-template-tags.php} (80%)

diff --git a/projects/plugins/jetpack/modules/search/class.jetpack-search-template-tags.php b/projects/packages/search/src/class-template-tags.php
similarity index 80%
rename from projects/plugins/jetpack/modules/search/class.jetpack-search-template-tags.php
rename to projects/packages/search/src/class-template-tags.php
index befe9ba83aba6..144357672018f 100644
--- a/projects/plugins/jetpack/modules/search/class.jetpack-search-template-tags.php
+++ b/projects/packages/search/src/class-template-tags.php
@@ -1,13 +1,15 @@
 <?php
 /**
- * Jetpack Search: Jetpack_Search_Template_Tags class
+ * Jetpack Search: Template_Tags class
  *
  * @package    Jetpack
  * @subpackage Jetpack Search
  * @since      5.8.0
  */
 
-use Automattic\Jetpack\Search\Helper;
+namespace Automattic\Jetpack\Search;
+
+use Automattic\Jetpack\Search\Classic_Search as Jetpack_Search;
 
 /**
  * Class that has various methods for outputting functionality into a theme that doesn't support widgets.
@@ -15,19 +17,20 @@
  *
  * @since 5.8.0
  */
-class Jetpack_Search_Template_Tags {
+class Template_Tags {
 
 	/**
 	 * Renders all available filters that can be used to filter down search results on the frontend.
 	 *
 	 * @since 5.8.0
 	 *
-	 * @param array $filters    The available filters for the current query.
-	 * @param array $post_types An array of post types to make filterable
+	 * @param string $blog_id    Blog id.
+	 * @param array  $filters    The available filters for the current query.
+	 * @param array  $post_types An array of post types to make filterable.
 	 */
-	public static function render_available_filters( $filters = null, $post_types = null ) {
+	public static function render_available_filters( $blog_id, $filters = null, $post_types = null ) {
 		if ( is_null( $filters ) ) {
-			$filters = Jetpack_Search::instance()->get_filters();
+			$filters = Jetpack_Search::instance( $blog_id )->get_filters();
 		}
 
 		if ( is_null( $post_types ) ) {
@@ -40,12 +43,12 @@ public static function render_available_filters( $filters = null, $post_types =
 		 */
 		$active_post_types = array();
 		if ( Helper::post_types_differ_searchable( $post_types ) ) {
-			// get the active filter buckets from the query
-			$active_buckets          = Jetpack_Search::instance()->get_active_filter_buckets();
+			// get the active filter buckets from the query.
+			$active_buckets          = Jetpack_Search::instance( $blog_id )->get_active_filter_buckets();
 			$post_types_differ_query = Helper::post_types_differ_query( $post_types );
 
 			// remove any post_type filters from display if the current query
-			// already specifies to match all post types
+			// already specifies to match all post types.
 			if ( ! $post_types_differ_query ) {
 				$active_buckets = array_filter( $active_buckets, array( __CLASS__, 'is_not_post_type_filter' ) );
 			}
@@ -65,7 +68,7 @@ public static function render_available_filters( $filters = null, $post_types =
 		}
 
 		foreach ( (array) $filters as $filter ) {
-			if ( 'post_type' == $filter['type'] ) {
+			if ( 'post_type' === $filter['type'] ) {
 				self::render_filter( $filter, $post_types );
 			} else {
 				self::render_filter( $filter, $active_post_types );
@@ -76,14 +79,12 @@ public static function render_available_filters( $filters = null, $post_types =
 	/**
 	 * Renders filters for instant search.
 	 *
-	 * @since 8.3.0
-	 *
-	 * @param array $filters    The available filters for the current query.
-	 * @param array $post_types An array of post types (ignored).
+	 * @param string $blog_id    Blog id.
+	 * @param array  $filters    The available filters for the current query.
 	 */
-	public static function render_instant_filters( $filters = null, $post_types = null ) {
+	public static function render_instant_filters( $blog_id, $filters = null ) {
 		if ( is_null( $filters ) ) {
-			$filters = Jetpack_Search::instance()->get_filters();
+			$filters = Jetpack_Search::instance( $blog_id )->get_filters();
 		}
 
 		foreach ( (array) $filters as $filter ) {
@@ -133,7 +134,7 @@ public static function render_filter( $filter, $default_post_types ) {
 		<ul class="jetpack-search-filters-widget__filter-list">
 			<?php
 			foreach ( $filter['buckets'] as $item ) :
-				$url = ( empty( $item['active'] ) ) ?  $item['url'] : $item['remove_url'];
+				$url = ( empty( $item['active'] ) ) ? $item['url'] : $item['remove_url'];
 				?>
 				<li>
 					<label>
@@ -142,10 +143,12 @@ public static function render_filter( $filter, $default_post_types ) {
 							<?php
 								echo esc_html( $item['name'] );
 								echo '&nbsp;';
-								echo esc_html( sprintf(
-									'(%s)',
-									number_format_i18n( absint( $item['count'] ) )
-								) );
+								echo esc_html(
+									sprintf(
+										'(%s)',
+										number_format_i18n( absint( $item['count'] ) )
+									)
+								);
 							?>
 						</a>
 					</label>
@@ -220,14 +223,17 @@ public static function render_instant_filter( $filter ) {
 				}
 				?>
 				<li>
-				<a href="#" class="jetpack-search-filter__link" <?php echo $data_str; ?>>
+				<?php // TODO: Figure out how to properly escape $data_str below. ?>
+				<a href="#" class="jetpack-search-filter__link" <?php echo $data_str; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>> 
 						<?php
 							echo esc_html( $item['name'] );
 							echo '&nbsp;';
-							echo esc_html( sprintf(
-								'(%s)',
-								number_format_i18n( absint( $item['count'] ) )
-							) );
+							echo esc_html(
+								sprintf(
+									'(%s)',
+									number_format_i18n( absint( $item['count'] ) )
+								)
+							);
 						?>
 					</a>
 				</li>
@@ -241,12 +247,13 @@ public static function render_instant_filter( $filter ) {
 	 *
 	 * @since 5.8.0
 	 *
-	 * @param string $title        The widget's title
-	 * @param string $before_title The HTML tag to display before the title
-	 * @param string $after_title  The HTML tag to display after the title
+	 * @param string $title        The widget's title.
+	 * @param string $before_title The HTML tag to display before the title.
+	 * @param string $after_title  The HTML tag to display after the title.
 	 */
 	public static function render_widget_title( $title, $before_title, $after_title ) {
-		echo $before_title . esc_html( $title ) . $after_title;
+		// TODO: figure out how to properly escape this.
+		echo $before_title . esc_html( $title ) . $after_title; //phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
 	}
 
 	/**
@@ -263,7 +270,7 @@ public static function render_widget_search_form( $post_types, $orderby, $order
 
 		$fields_to_inject = array(
 			'orderby' => $orderby,
-			'order'   => $order
+			'order'   => $order,
 		);
 
 		// If the widget has specified post types to search within and IF the post types differ
@@ -276,7 +283,8 @@ public static function render_widget_search_form( $post_types, $orderby, $order
 		$form = self::inject_hidden_form_fields( $form, $fields_to_inject );
 
 		echo '<div class="jetpack-search-form">';
-		echo $form;
+		// TODO: Figure out how to properly escape this.
+		echo $form; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
 		echo '</div>';
 	}
 
@@ -301,7 +309,7 @@ private static function inject_hidden_form_fields( $form, $fields ) {
 			);
 		}
 
-		// This shouldn't need to be escaped since we've escaped above as we built $form_injection
+		// This shouldn't need to be escaped since we've escaped above as we built $form_injection.
 		$form = str_replace(
 			'</form>',
 			$form_injection . '</form>',
@@ -316,11 +324,11 @@ private static function inject_hidden_form_fields( $form, $fields ) {
 	 *
 	 * @since 5.8.0
 	 *
-	 * @param array $filter
+	 * @param array $filter Filter object.
 	 *
 	 * @return bool
 	 */
 	private static function is_not_post_type_filter( $filter ) {
 		return 'post_type' !== $filter['type'];
 	}
-}
\ No newline at end of file
+}
diff --git a/projects/plugins/jetpack/modules/search/class.jetpack-search.php b/projects/plugins/jetpack/modules/search/class.jetpack-search.php
index ce0b9e4b98657..fc276a02342cd 100644
--- a/projects/plugins/jetpack/modules/search/class.jetpack-search.php
+++ b/projects/plugins/jetpack/modules/search/class.jetpack-search.php
@@ -198,7 +198,6 @@ public function load_php() {
 	 * Loads the PHP common to all search. Should be called from extending classes.
 	 */
 	protected function base_load_php() {
-		require_once __DIR__ . '/class.jetpack-search-template-tags.php';
 		require_once JETPACK__PLUGIN_DIR . 'modules/widgets/search.php';
 	}
 
diff --git a/projects/plugins/jetpack/modules/widgets/search.php b/projects/plugins/jetpack/modules/widgets/search.php
index 8a19ce6180fea..efe8d60f388f3 100644
--- a/projects/plugins/jetpack/modules/widgets/search.php
+++ b/projects/plugins/jetpack/modules/widgets/search.php
@@ -1,4 +1,4 @@
-<?php
+<?php // phpcs:ignore WordPress.Files.FileName.InvalidClassFileName
 /**
  * Jetpack Search: Jetpack_Search_Widget class
  *
@@ -91,11 +91,11 @@ public function __construct( $name = null ) {
 			add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_frontend_scripts' ) );
 		}
 
-		add_action( 'jetpack_search_render_filters_widget_title', array( 'Jetpack_Search_Template_Tags', 'render_widget_title' ), 10, 3 );
+		add_action( 'jetpack_search_render_filters_widget_title', array( 'Automattic\Jetpack\Search\Template_Tags', 'render_widget_title' ), 10, 3 );
 		if ( Options::is_instant_enabled() ) {
-			add_action( 'jetpack_search_render_filters', array( 'Jetpack_Search_Template_Tags', 'render_instant_filters' ), 10, 2 );
+			add_action( 'jetpack_search_render_filters', array( 'Automattic\Jetpack\Search\Template_Tags', 'render_instant_filters' ), 10, 2 );
 		} else {
-			add_action( 'jetpack_search_render_filters', array( 'Jetpack_Search_Template_Tags', 'render_available_filters' ), 10, 2 );
+			add_action( 'jetpack_search_render_filters', array( 'Automattic\Jetpack\Search\Template_Tags', 'render_available_filters' ), 10, 2 );
 		}
 	}
 
@@ -368,7 +368,7 @@ public function widget_non_instant( $args, $instance ) {
 		// we need to dynamically inject the sort field into the search box when the search box is enabled, and display
 		// it separately when it's not.
 		if ( ! empty( $instance['search_box_enabled'] ) ) {
-			Jetpack_Search_Template_Tags::render_widget_search_form( $instance['post_types'], $orderby, $order );
+			Automattic\Jetpack\Search\Template_Tags::render_widget_search_form( $instance['post_types'], $orderby, $order );
 		}
 
 		if ( ! empty( $instance['search_box_enabled'] ) && ! empty( $instance['user_sort_enabled'] ) ) :
@@ -401,6 +401,7 @@ public function widget_non_instant( $args, $instance ) {
 			 */
 			do_action(
 				'jetpack_search_render_filters',
+				Jetpack::get_option( 'id' ),
 				$filters,
 				isset( $instance['post_types'] ) ? $instance['post_types'] : null
 			);
@@ -421,11 +422,12 @@ public function widget_non_instant( $args, $instance ) {
 	 * @param array $instance The current widget instance.
 	 */
 	public function widget_instant( $args, $instance ) {
+		$blog_id = Jetpack::get_option( 'id' );
 		if ( Helper::should_rerun_search_in_customizer_preview() ) {
-			Jetpack_Search::instance()->update_search_results_aggregations();
+			Automattic\Jetpack\Search\Classic_Search::instance( $blog_id )->update_search_results_aggregations();
 		}
 
-		$filters = Jetpack_Search::instance()->get_filters();
+		$filters = Automattic\Jetpack\Search\Classic_Search::instance( $blog_id )->get_filters();
 		if ( ! Helper::are_filters_by_widget_disabled() && ! $this->should_display_sitewide_filters() ) {
 			$filters = array_filter( $filters, array( $this, 'is_for_current_widget' ) );
 		}
@@ -457,7 +459,7 @@ public function widget_instant( $args, $instance ) {
 			do_action( 'jetpack_search_render_filters_widget_title', $title, $args['before_title'], $args['after_title'] );
 		}
 
-		Jetpack_Search_Template_Tags::render_widget_search_form( array(), '', '' );
+		Automattic\Jetpack\Search\Template_Tags::render_widget_search_form( array(), '', '' );
 
 		if ( $display_filters ) {
 			/**
@@ -472,6 +474,7 @@ public function widget_instant( $args, $instance ) {
 			 */
 			do_action(
 				'jetpack_search_render_filters',
+				Jetpack::get_option( 'id' ),
 				$filters,
 				null
 			);

From d189f250cecaa18c9b6ca862427ca9ec13c7cfba Mon Sep 17 00:00:00 2001
From: Jason Moon <jason.moon@automattic.com>
Date: Mon, 15 Nov 2021 17:53:53 -0700
Subject: [PATCH 2/9] Migrate the settings class

---
 .../search/src/class-settings.php}                   | 12 +++++-------
 .../modules/search/class-jetpack-instant-search.php  |  3 +--
 2 files changed, 6 insertions(+), 9 deletions(-)
 rename projects/{plugins/jetpack/modules/search/class-jetpack-search-settings.php => packages/search/src/class-settings.php} (89%)

diff --git a/projects/plugins/jetpack/modules/search/class-jetpack-search-settings.php b/projects/packages/search/src/class-settings.php
similarity index 89%
rename from projects/plugins/jetpack/modules/search/class-jetpack-search-settings.php
rename to projects/packages/search/src/class-settings.php
index 2298aa84716f7..ec4a9ed8ea54f 100644
--- a/projects/plugins/jetpack/modules/search/class-jetpack-search-settings.php
+++ b/projects/packages/search/src/class-settings.php
@@ -2,9 +2,11 @@
 /**
  * Jetpack Search Overlay Settings
  *
- * @package automattic/jetpack
+ * @package automattic/jetpack-search
  */
 
+namespace Automattic\Jetpack\Search;
+
 // Exit if file is accessed directly.
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
@@ -12,15 +14,11 @@
 
 /**
  * Class to initialize search settings on the site.
- *
- * @since 8.3.0
  */
-class Jetpack_Search_Settings {
+class Settings {
 
 	/**
 	 * Class initialization.
-	 *
-	 * @since 8.3.0
 	 */
 	public function __construct() {
 		add_action( 'admin_init', array( $this, 'settings_register' ) );
@@ -34,7 +32,7 @@ public function __construct() {
 	 */
 	public function settings_register() {
 		// NOTE: This contains significant code overlap with class-jetpack-search-customize.
-		$setting_prefix = Automattic\Jetpack\Search\Options::OPTION_PREFIX;
+		$setting_prefix = Options::OPTION_PREFIX;
 		$settings       = array(
 			array( $setting_prefix . 'color_theme', 'string', 'light' ),
 			array( $setting_prefix . 'result_format', 'string', 'minimal' ),
diff --git a/projects/plugins/jetpack/modules/search/class-jetpack-instant-search.php b/projects/plugins/jetpack/modules/search/class-jetpack-instant-search.php
index 2ebdbc90a8a1a..b7b4cb6aa979c 100644
--- a/projects/plugins/jetpack/modules/search/class-jetpack-instant-search.php
+++ b/projects/plugins/jetpack/modules/search/class-jetpack-instant-search.php
@@ -63,8 +63,7 @@ public static function instance() {
 	public function load_php() {
 		$this->base_load_php();
 
-		require_once __DIR__ . '/class-jetpack-search-settings.php';
-		new Jetpack_Search_Settings();
+		new Automattic\Jetpack\Search\Settings();
 
 		if ( class_exists( 'WP_Customize_Manager' ) ) {
 			require_once __DIR__ . '/class-jetpack-search-customize.php';

From 4ac8af477c0533f2a6354d420d30c1d02330210f Mon Sep 17 00:00:00 2001
From: Jason Moon <jason.moon@automattic.com>
Date: Mon, 15 Nov 2021 17:55:25 -0700
Subject: [PATCH 3/9] Changelog

---
 .../changelog/update-move-more-search-helpers-to-package      | 4 ++++
 .../changelog/update-move-more-search-helpers-to-package      | 4 ++++
 2 files changed, 8 insertions(+)
 create mode 100644 projects/packages/search/changelog/update-move-more-search-helpers-to-package
 create mode 100644 projects/plugins/jetpack/changelog/update-move-more-search-helpers-to-package

diff --git a/projects/packages/search/changelog/update-move-more-search-helpers-to-package b/projects/packages/search/changelog/update-move-more-search-helpers-to-package
new file mode 100644
index 0000000000000..6a2a0b90e70c9
--- /dev/null
+++ b/projects/packages/search/changelog/update-move-more-search-helpers-to-package
@@ -0,0 +1,4 @@
+Significance: minor
+Type: added
+
+Migrate additional helper classes to package
diff --git a/projects/plugins/jetpack/changelog/update-move-more-search-helpers-to-package b/projects/plugins/jetpack/changelog/update-move-more-search-helpers-to-package
new file mode 100644
index 0000000000000..2ec214f94c0eb
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/update-move-more-search-helpers-to-package
@@ -0,0 +1,4 @@
+Significance: patch
+Type: other
+
+Search: Migrate more helper classes to package

From 2362ebd28d8cb5fa3ad287030ef3febfcc6ddb9a Mon Sep 17 00:00:00 2001
From: Jason Moon <jason.moon@automattic.com>
Date: Mon, 15 Nov 2021 18:01:22 -0700
Subject: [PATCH 4/9] Revert unintended change

---
 projects/plugins/jetpack/modules/widgets/search.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/projects/plugins/jetpack/modules/widgets/search.php b/projects/plugins/jetpack/modules/widgets/search.php
index efe8d60f388f3..1665c8479c75d 100644
--- a/projects/plugins/jetpack/modules/widgets/search.php
+++ b/projects/plugins/jetpack/modules/widgets/search.php
@@ -422,12 +422,11 @@ public function widget_non_instant( $args, $instance ) {
 	 * @param array $instance The current widget instance.
 	 */
 	public function widget_instant( $args, $instance ) {
-		$blog_id = Jetpack::get_option( 'id' );
 		if ( Helper::should_rerun_search_in_customizer_preview() ) {
-			Automattic\Jetpack\Search\Classic_Search::instance( $blog_id )->update_search_results_aggregations();
+			Jetpack_Search::instance()->update_search_results_aggregations();
 		}
 
-		$filters = Automattic\Jetpack\Search\Classic_Search::instance( $blog_id )->get_filters();
+		$filters = Jetpack_Search::instance()->get_filters();
 		if ( ! Helper::are_filters_by_widget_disabled() && ! $this->should_display_sitewide_filters() ) {
 			$filters = array_filter( $filters, array( $this, 'is_for_current_widget' ) );
 		}

From 8406cdd248a929fb1156b301c54927996cef3542 Mon Sep 17 00:00:00 2001
From: Jason Moon <jason.moon@automattic.com>
Date: Mon, 15 Nov 2021 18:13:51 -0700
Subject: [PATCH 5/9] Update comments

---
 projects/packages/search/src/class-template-tags.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/projects/packages/search/src/class-template-tags.php b/projects/packages/search/src/class-template-tags.php
index 144357672018f..603303cf49eb5 100644
--- a/projects/packages/search/src/class-template-tags.php
+++ b/projects/packages/search/src/class-template-tags.php
@@ -1,10 +1,8 @@
 <?php
 /**
- * Jetpack Search: Template_Tags class
+ * Template tags class used primarily for rendering widget-related HTML.
  *
- * @package    Jetpack
- * @subpackage Jetpack Search
- * @since      5.8.0
+ * @package    automattic/jetpack-search
  */
 
 namespace Automattic\Jetpack\Search;

From 57c961a875ff970237b833c74ce2c3fc4eab4bac Mon Sep 17 00:00:00 2001
From: Jason Moon <jason.moon@automattic.com>
Date: Tue, 16 Nov 2021 18:21:42 -0700
Subject: [PATCH 6/9] Fix errant usage of Classic_Search

---
 .../packages/search/src/class-template-tags.php   | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/projects/packages/search/src/class-template-tags.php b/projects/packages/search/src/class-template-tags.php
index 603303cf49eb5..d0bd90f4aba63 100644
--- a/projects/packages/search/src/class-template-tags.php
+++ b/projects/packages/search/src/class-template-tags.php
@@ -2,13 +2,15 @@
 /**
  * Template tags class used primarily for rendering widget-related HTML.
  *
+ * Currently, this package can only run in the Jetpack plugin due to its usage of Jetpack_Search.
+ * Once Jetpack_Search has been migrated to the package as Classic_Search,
+ * this library will be independent from the Jetpack plugin.
+ *
  * @package    automattic/jetpack-search
  */
 
 namespace Automattic\Jetpack\Search;
 
-use Automattic\Jetpack\Search\Classic_Search as Jetpack_Search;
-
 /**
  * Class that has various methods for outputting functionality into a theme that doesn't support widgets.
  * Additionally the widget itself makes use of these class.
@@ -28,7 +30,8 @@ class Template_Tags {
 	 */
 	public static function render_available_filters( $blog_id, $filters = null, $post_types = null ) {
 		if ( is_null( $filters ) ) {
-			$filters = Jetpack_Search::instance( $blog_id )->get_filters();
+			// TODO: Must be migrated to use Classic_Search once the migration is underway.
+			$filters = \Jetpack_Search::instance()->get_filters();
 		}
 
 		if ( is_null( $post_types ) ) {
@@ -42,7 +45,8 @@ public static function render_available_filters( $blog_id, $filters = null, $pos
 		$active_post_types = array();
 		if ( Helper::post_types_differ_searchable( $post_types ) ) {
 			// get the active filter buckets from the query.
-			$active_buckets          = Jetpack_Search::instance( $blog_id )->get_active_filter_buckets();
+			// TODO: Must be migrated to use Classic_Search once the migration is underway.
+			$active_buckets          = \Jetpack_Search::instance()->get_active_filter_buckets();
 			$post_types_differ_query = Helper::post_types_differ_query( $post_types );
 
 			// remove any post_type filters from display if the current query
@@ -82,7 +86,8 @@ public static function render_available_filters( $blog_id, $filters = null, $pos
 	 */
 	public static function render_instant_filters( $blog_id, $filters = null ) {
 		if ( is_null( $filters ) ) {
-			$filters = Jetpack_Search::instance( $blog_id )->get_filters();
+			// TODO: Must be migrated to use Classic_Search once the migration is underway.
+			$filters = \Jetpack_Search::instance()->get_filters();
 		}
 
 		foreach ( (array) $filters as $filter ) {

From 2e7ca6bc9dfae5c229e0b48da1294fcaf7314bef Mon Sep 17 00:00:00 2001
From: Jason Moon <jason.moon@automattic.com>
Date: Tue, 16 Nov 2021 18:26:20 -0700
Subject: [PATCH 7/9] Remove unnecessary blog_id parameter

---
 projects/packages/search/src/class-template-tags.php | 12 +++++-------
 projects/plugins/jetpack/modules/widgets/search.php  |  2 --
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/projects/packages/search/src/class-template-tags.php b/projects/packages/search/src/class-template-tags.php
index d0bd90f4aba63..bc40103543334 100644
--- a/projects/packages/search/src/class-template-tags.php
+++ b/projects/packages/search/src/class-template-tags.php
@@ -24,11 +24,10 @@ class Template_Tags {
 	 *
 	 * @since 5.8.0
 	 *
-	 * @param string $blog_id    Blog id.
-	 * @param array  $filters    The available filters for the current query.
-	 * @param array  $post_types An array of post types to make filterable.
+	 * @param array $filters    The available filters for the current query.
+	 * @param array $post_types An array of post types to make filterable.
 	 */
-	public static function render_available_filters( $blog_id, $filters = null, $post_types = null ) {
+	public static function render_available_filters( $filters = null, $post_types = null ) {
 		if ( is_null( $filters ) ) {
 			// TODO: Must be migrated to use Classic_Search once the migration is underway.
 			$filters = \Jetpack_Search::instance()->get_filters();
@@ -81,10 +80,9 @@ public static function render_available_filters( $blog_id, $filters = null, $pos
 	/**
 	 * Renders filters for instant search.
 	 *
-	 * @param string $blog_id    Blog id.
-	 * @param array  $filters    The available filters for the current query.
+	 * @param array $filters    The available filters for the current query.
 	 */
-	public static function render_instant_filters( $blog_id, $filters = null ) {
+	public static function render_instant_filters( $filters = null ) {
 		if ( is_null( $filters ) ) {
 			// TODO: Must be migrated to use Classic_Search once the migration is underway.
 			$filters = \Jetpack_Search::instance()->get_filters();
diff --git a/projects/plugins/jetpack/modules/widgets/search.php b/projects/plugins/jetpack/modules/widgets/search.php
index 1665c8479c75d..13ef81f4e312b 100644
--- a/projects/plugins/jetpack/modules/widgets/search.php
+++ b/projects/plugins/jetpack/modules/widgets/search.php
@@ -401,7 +401,6 @@ public function widget_non_instant( $args, $instance ) {
 			 */
 			do_action(
 				'jetpack_search_render_filters',
-				Jetpack::get_option( 'id' ),
 				$filters,
 				isset( $instance['post_types'] ) ? $instance['post_types'] : null
 			);
@@ -473,7 +472,6 @@ public function widget_instant( $args, $instance ) {
 			 */
 			do_action(
 				'jetpack_search_render_filters',
-				Jetpack::get_option( 'id' ),
 				$filters,
 				null
 			);

From 77738f62dceca83385214afb5a8d0f9debf18fca Mon Sep 17 00:00:00 2001
From: Jason Moon <jason.moon@automattic.com>
Date: Thu, 18 Nov 2021 14:46:50 -0700
Subject: [PATCH 8/9] Update composer versions

---
 projects/packages/search/composer.json                      | 2 +-
 .../changelog/update-move-more-search-helpers-to-package#2  | 4 ++++
 projects/plugins/jetpack/composer.json                      | 2 +-
 projects/plugins/jetpack/composer.lock                      | 6 +++---
 4 files changed, 9 insertions(+), 5 deletions(-)
 create mode 100644 projects/plugins/jetpack/changelog/update-move-more-search-helpers-to-package#2

diff --git a/projects/packages/search/composer.json b/projects/packages/search/composer.json
index ffbb04cb5b3fb..dc6caa681e6e2 100644
--- a/projects/packages/search/composer.json
+++ b/projects/packages/search/composer.json
@@ -45,7 +45,7 @@
 			"link-template": "https://github.com/Automattic/jetpack-search/compare/v${old}...v${new}"
 		},
 		"branch-alias": {
-			"dev-master": "0.1.x-dev"
+			"dev-master": "0.2.x-dev"
 		}
 	}
 }
diff --git a/projects/plugins/jetpack/changelog/update-move-more-search-helpers-to-package#2 b/projects/plugins/jetpack/changelog/update-move-more-search-helpers-to-package#2
new file mode 100644
index 0000000000000..1eaea6a769e84
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/update-move-more-search-helpers-to-package#2
@@ -0,0 +1,4 @@
+Significance: patch
+Type: other
+
+Updated package dependencies.
diff --git a/projects/plugins/jetpack/composer.json b/projects/plugins/jetpack/composer.json
index 1d116dfb89b70..dec4a2b718214 100644
--- a/projects/plugins/jetpack/composer.json
+++ b/projects/plugins/jetpack/composer.json
@@ -34,7 +34,7 @@
 		"automattic/jetpack-partner": "1.5.x-dev",
 		"automattic/jetpack-redirect": "1.7.x-dev",
 		"automattic/jetpack-roles": "1.4.x-dev",
-		"automattic/jetpack-search": "0.1.x-dev",
+		"automattic/jetpack-search": "0.2.x-dev",
 		"automattic/jetpack-status": "1.9.x-dev",
 		"automattic/jetpack-sync": "1.27.x-dev",
 		"automattic/jetpack-terms-of-service": "1.9.x-dev",
diff --git a/projects/plugins/jetpack/composer.lock b/projects/plugins/jetpack/composer.lock
index 438e31440e33e..01bf4196f9e27 100644
--- a/projects/plugins/jetpack/composer.lock
+++ b/projects/plugins/jetpack/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "04cc8999b3ab2b55209651b9087b72c3",
+    "content-hash": "11375a185eef3f2273be2aeae5a9763c",
     "packages": [
         {
             "name": "automattic/jetpack-a8c-mc-stats",
@@ -1311,7 +1311,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/search",
-                "reference": "8b3cf6895223e44cb728fc1c89fd5b26b390b1ea"
+                "reference": "efd40bc5ee2b51d90b6d95faf31946ef1e2fc58f"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "^3.0",
@@ -1325,7 +1325,7 @@
                     "link-template": "https://github.com/Automattic/jetpack-search/compare/v${old}...v${new}"
                 },
                 "branch-alias": {
-                    "dev-master": "0.1.x-dev"
+                    "dev-master": "0.2.x-dev"
                 }
             },
             "autoload": {

From a12deb6f117264c32914988f9db385ffcaf67c0f Mon Sep 17 00:00:00 2001
From: Jasper Kang <jasper.kang@automattic.com>
Date: Thu, 25 Nov 2021 14:11:49 +1300
Subject: [PATCH 9/9] remove error free file form phpcs check exclude list

---
 tools/phpcs-excludelist.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tools/phpcs-excludelist.json b/tools/phpcs-excludelist.json
index 2945adfa735ec..f5c4e89ecff04 100644
--- a/tools/phpcs-excludelist.json
+++ b/tools/phpcs-excludelist.json
@@ -256,7 +256,6 @@
 	"projects/plugins/jetpack/modules/related-posts.php",
 	"projects/plugins/jetpack/modules/related-posts/class.related-posts-customize.php",
 	"projects/plugins/jetpack/modules/related-posts/jetpack-related-posts.php",
-	"projects/plugins/jetpack/modules/search/class.jetpack-search-template-tags.php",
 	"projects/plugins/jetpack/modules/seo-tools/jetpack-seo-posts.php",
 	"projects/plugins/jetpack/modules/seo-tools/jetpack-seo-titles.php",
 	"projects/plugins/jetpack/modules/seo-tools/jetpack-seo-utils.php",