From 248e8ffa81e1a3131477185263fe77aad0316fd4 Mon Sep 17 00:00:00 2001
From: Vedanshu Jain <vedanshu.jain.2012@gmail.com>
Date: Mon, 10 Oct 2022 13:45:18 +0530
Subject: [PATCH 01/22] Revert "Revert "[COT] Add the orders cache" (#34992)"

This reverts commit 0b5d7ab9ad4ef09fc0ef47c5deddfe2aa4f7e5c3.
---
 plugins/woocommerce/changelog/add-order_cache |   4 +
 .../includes/abstracts/abstract-wc-order.php  |   7 +
 .../admin/class-wc-admin-settings.php         |   3 +
 .../includes/class-wc-order-factory.php       |  45 +++++-
 plugins/woocommerce/src/Caches/OrderCache.php |  44 ++++++
 .../src/Caches/OrderCacheController.php       | 121 ++++++++++++++++
 .../woocommerce/src/Caching/ObjectCache.php   |  72 ++++++++--
 .../Orders/CustomOrdersTableController.php    |  44 +++++-
 .../DataStores/Orders/DataSynchronizer.php    |   6 +
 .../COTMigrationServiceProvider.php           |   3 +-
 .../OrdersDataStoreServiceProvider.php        |   7 +
 .../Internal/Features/FeaturesController.php  |   5 +
 .../woocommerce/src/Utilities/OrderUtil.php   |  11 ++
 .../class-wc-rest-orders-controller-tests.php |   7 +-
 .../tests/php/src/Caching/ObjectCacheTest.php | 131 ++++++++++++++----
 15 files changed, 459 insertions(+), 51 deletions(-)
 create mode 100644 plugins/woocommerce/changelog/add-order_cache
 create mode 100644 plugins/woocommerce/src/Caches/OrderCache.php
 create mode 100644 plugins/woocommerce/src/Caches/OrderCacheController.php

diff --git a/plugins/woocommerce/changelog/add-order_cache b/plugins/woocommerce/changelog/add-order_cache
new file mode 100644
index 000000000000..1b800aff214f
--- /dev/null
+++ b/plugins/woocommerce/changelog/add-order_cache
@@ -0,0 +1,4 @@
+Significance: minor
+Type: add
+
+Add a cache for orders, to use when custom order tables are enabled
diff --git a/plugins/woocommerce/includes/abstracts/abstract-wc-order.php b/plugins/woocommerce/includes/abstracts/abstract-wc-order.php
index 78932ad68bca..bebe53ada46f 100644
--- a/plugins/woocommerce/includes/abstracts/abstract-wc-order.php
+++ b/plugins/woocommerce/includes/abstracts/abstract-wc-order.php
@@ -10,9 +10,11 @@
  * @package     WooCommerce\Classes
  */
 
+use Automattic\WooCommerce\Caches\OrderCache;
 use Automattic\WooCommerce\Proxies\LegacyProxy;
 use Automattic\WooCommerce\Utilities\ArrayUtil;
 use Automattic\WooCommerce\Utilities\NumberUtil;
+use Automattic\WooCommerce\Utilities\OrderUtil;
 
 defined( 'ABSPATH' ) || exit;
 
@@ -203,6 +205,11 @@ public function save() {
 
 			$this->save_items();
 
+			if ( OrderUtil::orders_cache_usage_is_enabled() ) {
+				$order_cache = wc_get_container()->get( OrderCache::class );
+				$order_cache->update_if_cached( $this );
+			}
+
 			/**
 			 * Trigger action after saving to the DB.
 			 *
diff --git a/plugins/woocommerce/includes/admin/class-wc-admin-settings.php b/plugins/woocommerce/includes/admin/class-wc-admin-settings.php
index 477ae41ea618..2958d9498063 100644
--- a/plugins/woocommerce/includes/admin/class-wc-admin-settings.php
+++ b/plugins/woocommerce/includes/admin/class-wc-admin-settings.php
@@ -488,6 +488,8 @@ class="<?php echo esc_attr( $value['class'] ); ?>"
 							$visibility_class[] = 'show_options_if_checked';
 						}
 
+						$must_disable = ArrayUtil::get_value_or_default( $value, 'disabled', false );
+
 						if ( ! isset( $value['checkboxgroup'] ) || 'start' === $value['checkboxgroup'] ) {
 							$has_tooltip             = isset( $value['tooltip'] ) && '' !== $value['tooltip'];
 							$tooltip_container_class = $has_tooltip ? 'with-tooltip' : '';
@@ -515,6 +517,7 @@ class="<?php echo esc_attr( $value['class'] ); ?>"
 						?>
 							<label for="<?php echo esc_attr( $value['id'] ); ?>">
 								<input
+									<?php echo $must_disable ? 'disabled' : ''; ?>
 									name="<?php echo esc_attr( $value['field_name'] ); ?>"
 									id="<?php echo esc_attr( $value['id'] ); ?>"
 									type="checkbox"
diff --git a/plugins/woocommerce/includes/class-wc-order-factory.php b/plugins/woocommerce/includes/class-wc-order-factory.php
index 543f2bf39157..973f6e5ec187 100644
--- a/plugins/woocommerce/includes/class-wc-order-factory.php
+++ b/plugins/woocommerce/includes/class-wc-order-factory.php
@@ -8,6 +8,9 @@
  * @package WooCommerce\Classes
  */
 
+use Automattic\WooCommerce\Caches\OrderCache;
+use Automattic\WooCommerce\Utilities\OrderUtil;
+
 defined( 'ABSPATH' ) || exit;
 
 use Automattic\WooCommerce\Utilities\OrderUtil;
@@ -30,13 +33,26 @@ public static function get_order( $order_id = false ) {
 			return false;
 		}
 
+		$use_orders_cache = OrderUtil::orders_cache_usage_is_enabled();
+		if ( $use_orders_cache ) {
+			$order_cache = wc_get_container()->get( OrderCache::class );
+			$order       = $order_cache->get( $order_id );
+			if ( ! is_null( $order ) ) {
+				return $order;
+			}
+		}
+
 		$classname = self::get_class_name_for_order_id( $order_id );
 		if ( ! $classname ) {
 			return false;
 		}
 
 		try {
-			return new $classname( $order_id );
+			$order = new $classname( $order_id );
+			if ( $use_orders_cache && $order instanceof \WC_Abstract_Legacy_Order ) {
+				$order_cache->set( $order, $order_id );
+			}
+			return $order;
 		} catch ( Exception $e ) {
 			wc_caught_exception( $e, __FUNCTION__, array( $order_id ) );
 			return false;
@@ -56,6 +72,22 @@ public static function get_orders( $order_ids = array(), $skip_invalid = false )
 		$result    = array();
 		$order_ids = array_filter( array_map( array( __CLASS__, 'get_order_id' ), $order_ids ) );
 
+		$already_cached_orders = array();
+		$use_orders_cache      = OrderUtil::orders_cache_usage_is_enabled();
+		if ( $use_orders_cache ) {
+			$uncached_order_ids = array();
+			$order_cache        = wc_get_container()->get( OrderCache::class );
+			foreach ( $order_ids as $order_id ) {
+				$cached_order = $order_cache->get( absint( $order_id ) );
+				if ( is_null( $cached_order ) ) {
+					$uncached_order_ids[] = $order_id;
+				} else {
+					$already_cached_orders[] = $cached_order;
+				}
+			}
+			$order_ids = $uncached_order_ids;
+		}
+
 		// We separate order list by class, since their datastore might be different.
 		$order_list_by_class = array();
 		$order_id_classnames = self::get_class_names_for_order_ids( $order_ids );
@@ -99,9 +131,16 @@ public static function get_orders( $order_ids = array(), $skip_invalid = false )
 		}
 
 		// restore the sort order.
-		$result = array_replace( array_flip( $order_ids ), $result );
+		$result = array_values( array_replace( array_flip( $order_ids ), $result ) );
 
-		return array_values( $result );
+		if ( $use_orders_cache ) {
+			foreach ( $result as $order ) {
+				$order_cache->set( $order );
+			}
+			return array_merge( $already_cached_orders, $result );
+		} else {
+			return $result;
+		}
 	}
 
 	/**
diff --git a/plugins/woocommerce/src/Caches/OrderCache.php b/plugins/woocommerce/src/Caches/OrderCache.php
new file mode 100644
index 000000000000..f09adba3c621
--- /dev/null
+++ b/plugins/woocommerce/src/Caches/OrderCache.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace Automattic\WooCommerce\Caches;
+
+use Automattic\WooCommerce\Caching\ObjectCache;
+
+/**
+ * A class to cache order objects.
+ */
+class OrderCache extends ObjectCache {
+
+	/**
+	 * Get the identifier for the type of the cached objects.
+	 *
+	 * @return string
+	 */
+	public function get_object_type(): string {
+		return 'order';
+	}
+
+	/**
+	 * Get the id of an object to be cached.
+	 *
+	 * @param array|object $object The object to be cached.
+	 * @return int|string|null The id of the object, or null if it can't be determined.
+	 */
+	protected function get_object_id( $object ) {
+		return $object->get_id();
+	}
+
+	/**
+	 * Validate an object before caching it.
+	 *
+	 * @param array|object $object The object to validate.
+	 * @return string[]|null An array of error messages, or null if the object is valid.
+	 */
+	protected function validate( $object ): ?array {
+		if ( ! $object instanceof \WC_Abstract_Legacy_Order ) {
+			return array( 'The supplied order is not an instance of WC_Order, ' . gettype( $object ) );
+		}
+
+		return null;
+	}
+}
diff --git a/plugins/woocommerce/src/Caches/OrderCacheController.php b/plugins/woocommerce/src/Caches/OrderCacheController.php
new file mode 100644
index 000000000000..6d89bb5309c4
--- /dev/null
+++ b/plugins/woocommerce/src/Caches/OrderCacheController.php
@@ -0,0 +1,121 @@
+<?php
+
+namespace Automattic\WooCommerce\Caches;
+
+use Automattic\WooCommerce\Internal\Features\FeaturesController;
+use Automattic\WooCommerce\Internal\Traits\AccessiblePrivateMethods;
+
+/**
+ * A class to control the usage of the orders cache.
+ */
+class OrderCacheController {
+
+	use AccessiblePrivateMethods;
+
+	const FEATURE_NAME = 'orders_cache';
+
+	/**
+	 * The orders cache to use.
+	 *
+	 * @var OrderCache
+	 */
+	private $order_cache;
+
+	/**
+	 * The orders cache to use.
+	 *
+	 * @var FeaturesController
+	 */
+	private $features_controller;
+
+	/**
+	 * The backup value of the cache usage enable status, stored while the cache is temporarily disabled.
+	 *
+	 * @var null|bool
+	 */
+	private $orders_cache_usage_backup = null;
+
+	/**
+	 * Creates a new instance of the class.
+	 */
+	public function __construct() {
+		self::add_action( FeaturesController::FEATURE_ENABLED_CHANGED_ACTION, array( $this, 'handle_feature_enable_changed' ), 10, 2 );
+	}
+
+	/**
+	 * Class initialization, invoked by the DI container.
+	 *
+	 * @internal
+	 * @param OrderCache         $order_cache The order cache engine to use.
+	 * @param FeaturesController $features_controller The features controller to use.
+	 */
+	final public function init( OrderCache $order_cache, FeaturesController $features_controller ) {
+		$this->order_cache         = $order_cache;
+		$this->features_controller = $features_controller;
+	}
+
+	/**
+	 * Handler for the feature enable changed action, when the orders cache is enabled or disabled it flushes it.
+	 *
+	 * @param string $feature_id The id of the feature whose enable status changed.
+	 * @param bool   $enabled Whether the feature has been enabled or disabled.
+	 * @return void
+	 */
+	private function handle_feature_enable_changed( string $feature_id, bool $enabled ): void {
+		if ( self::FEATURE_NAME === $feature_id ) {
+			$this->order_cache->flush();
+		}
+	}
+
+	/**
+	 * Set the value of the order cache usage setting.
+	 *
+	 * @param bool $enable True if the order cache should be used, false if not.
+	 * @throws \Exception Attempt to enable the orders cache usage while it's temporarily disabled.
+	 */
+	public function set_orders_cache_usage( bool $enable ): void {
+		$this->features_controller->change_feature_enable( $enable );
+		$this->orders_cache_usage_backup = null;
+	}
+
+	/**
+	 * Get the value of the order cache usage setting.
+	 *
+	 * @return bool True if order cache usage setting is currently enabled, false if not.
+	 */
+	public function orders_cache_usage_is_enabled(): bool {
+		return ! $this->orders_cache_usage_is_temporarly_disabled() && $this->features_controller->feature_is_enabled( self::FEATURE_NAME );
+	}
+
+	/**
+	 * Temporarily disable the order cache if it's enabled.
+	 *
+	 * This is a purely in-memory operation: a variable is created with the value
+	 * of the current enable status for the feature, and this variable
+	 * is checked by orders_cache_usage_is_enabled. In the next request the
+	 * feature will be again enabled or not depending on how the feature is set.
+	 */
+	public function temporarily_disable_orders_cache_usage(): void {
+		if ( $this->orders_cache_usage_is_temporarly_disabled() ) {
+			return;
+		}
+
+		$this->orders_cache_usage_backup = $this->orders_cache_usage_is_enabled();
+	}
+
+	/**
+	 * Check if the order cache has been temporarily disabled.
+	 *
+	 * @return bool True if the order cache is currently temporarily disabled.
+	 */
+	public function orders_cache_usage_is_temporarly_disabled(): bool {
+		return null !== $this->orders_cache_usage_backup;
+	}
+
+	/**
+	 * Restore the order cache usage that had been temporarily disabled.
+	 */
+	public function maybe_restore_orders_cache_usage(): void {
+		$this->orders_cache_usage_backup = null;
+	}
+}
diff --git a/plugins/woocommerce/src/Caching/ObjectCache.php b/plugins/woocommerce/src/Caching/ObjectCache.php
index 2e86413069b4..94b6de7e642a 100644
--- a/plugins/woocommerce/src/Caching/ObjectCache.php
+++ b/plugins/woocommerce/src/Caching/ObjectCache.php
@@ -164,13 +164,13 @@ private function create_cache_key_prefix(): string {
 	/**
 	 * Add an object to the cache, or update an already cached object.
 	 *
-	 * @param int|string|null $id Id of the object to be cached, if null, get_object_id will be used to get it.
 	 * @param object|array    $object The object to be cached.
+	 * @param int|string|null $id Id of the object to be cached, if null, get_object_id will be used to get it.
 	 * @param int             $expiration Expiration of the cached data in seconds from the current time, or DEFAULT_EXPIRATION to use the default value.
 	 * @return bool True on success, false on error.
 	 * @throws CacheException Invalid parameter, or null id was passed and get_object_id returns null too.
 	 */
-	public function set( $id = null, $object, int $expiration = self::DEFAULT_EXPIRATION ): bool {
+	public function set( $object, $id = null, int $expiration = self::DEFAULT_EXPIRATION ): bool {
 		if ( null === $object ) {
 			throw new CacheException( "Can't cache a null value", $this, $id );
 		}
@@ -185,20 +185,22 @@ public function set( $id = null, $object, int $expiration = self::DEFAULT_EXPIRA
 
 		$this->verify_expiration_value( $expiration );
 
-		if ( null === $id ) {
-			$id = $this->get_object_id( $object );
-			if ( null === $id ) {
-				throw new CacheException( "Null id supplied and the cache class doesn't implement get_object_id", $this );
+		$errors = $this->validate( $object );
+		if ( ! is_null( $errors ) ) {
+			try {
+				$id = $this->get_id_from_object_if_null( $object, $id );
+			} catch ( \Throwable $ex ) { // phpcs:ignore Generic.CodeAnalysis.EmptyStatement.DetectedCatch
+				// Nothing else to do, we won't be able to add any significant object id to the CacheException and that's it.
 			}
-		}
 
-		$errors = $this->validate( $object );
-		if ( null !== $errors && 1 === count( $errors ) ) {
-			throw new CacheException( 'Object validation/serialization failed: ' . $errors[0], $this, $id, $errors );
-		} elseif ( ! empty( $errors ) ) {
-			throw new CacheException( 'Object validation/serialization failed', $this, $id, $errors );
+			if ( count( $errors ) === 1 ) {
+				throw new CacheException( 'Object validation/serialization failed: ' . $errors[0], $this, $id, $errors );
+			} elseif ( ! empty( $errors ) ) {
+				throw new CacheException( 'Object validation/serialization failed', $this, $id, $errors );
+			}
 		}
 
+		$id   = $this->get_id_from_object_if_null( $object, $id );
 		$data = $this->serialize( $object );
 
 		/**
@@ -213,7 +215,49 @@ public function set( $id = null, $object, int $expiration = self::DEFAULT_EXPIRA
 		$data = apply_filters( "woocommerce_after_serializing_{$this->object_type}_for_caching", $data, $object, $id );
 
 		$this->last_cached_data = $data;
-		return $this->get_cache_engine()->cache_object( $this->get_cache_key_prefix() . $id, $data, self::DEFAULT_EXPIRATION === $expiration ? $this->default_expiration : $expiration );
+		return $this->get_cache_engine()->cache_object(
+			$this->get_cache_key_prefix() . $id,
+			$data,
+			self::DEFAULT_EXPIRATION === $expiration ? $this->default_expiration : $expiration
+		);
+	}
+
+	/**
+	 * Update an object in the cache, but only if an object is already cached with the same id.
+	 *
+	 * @param object|array    $object The new object that will replace the already cached one.
+	 * @param int|string|null $id Id of the object to be cached, if null, get_object_id will be used to get it.
+	 * @param int             $expiration Expiration of the cached data in seconds from the current time, or DEFAULT_EXPIRATION to use the default value.
+	 * @return bool True on success, false on error or if no object wiith the supplied id was cached.
+	 * @throws CacheException Invalid parameter, or null id was passed and get_object_id returns null too.
+	 */
+	public function update_if_cached( $object, $id = null, int $expiration = self::DEFAULT_EXPIRATION ): bool {
+		$id = $this->get_id_from_object_if_null( $object, $id );
+
+		if ( ! $this->is_cached( $id ) ) {
+			return false;
+		}
+
+		return $this->set( $object, $id, $expiration );
+	}
+
+	/**
+	 * Get the id from an object if the id itself is null.
+	 *
+	 * @param object|array    $object The object to get the id from.
+	 * @param int|string|null $id An object id or null.
+	 * @return int|string|null Passed $id if it wasn't null, otherwise id obtained from $object using get_object_id.
+	 * @throws CacheException Passed $id is null and get_object_id returned null too.
+	 */
+	private function get_id_from_object_if_null( $object, $id ) {
+		if ( null === $id ) {
+			$id = $this->get_object_id( $object );
+			if ( null === $id ) {
+				throw new CacheException( "Null id supplied and the cache class doesn't implement get_object_id", $this );
+			}
+		}
+
+		return $id;
 	}
 
 	/**
@@ -261,7 +305,7 @@ public function get( $id, int $expiration = self::DEFAULT_EXPIRATION, callable $
 				return null;
 			}
 
-			$this->set( $id, $object, $expiration );
+			$this->set( $object, $id, $expiration );
 			$data = $this->last_cached_data;
 		}
 
diff --git a/plugins/woocommerce/src/Internal/DataStores/Orders/CustomOrdersTableController.php b/plugins/woocommerce/src/Internal/DataStores/Orders/CustomOrdersTableController.php
index 3ceeb399229e..29e8cea6f1e0 100644
--- a/plugins/woocommerce/src/Internal/DataStores/Orders/CustomOrdersTableController.php
+++ b/plugins/woocommerce/src/Internal/DataStores/Orders/CustomOrdersTableController.php
@@ -5,9 +5,12 @@
 
 namespace Automattic\WooCommerce\Internal\DataStores\Orders;
 
+use Automattic\WooCommerce\Caches\OrderCache;
+use Automattic\WooCommerce\Caches\OrderCacheController;
 use Automattic\WooCommerce\Internal\BatchProcessing\BatchProcessingController;
 use Automattic\WooCommerce\Internal\Features\FeaturesController;
 use Automattic\WooCommerce\Internal\Traits\AccessiblePrivateMethods;
+use Automattic\WooCommerce\Utilities\OrderUtil;
 
 defined( 'ABSPATH' ) || exit;
 
@@ -81,6 +84,20 @@ class CustomOrdersTableController {
 	 */
 	private $features_controller;
 
+	/**
+	 * The orders cache object to use.
+	 *
+	 * @var OrderCache
+	 */
+	private $order_cache;
+
+	/**
+	 * The orders cache controller object to use.
+	 *
+	 * @var OrderCacheController
+	 */
+	private $order_cache_controller;
+
 	/**
 	 * Class constructor.
 	 */
@@ -114,18 +131,24 @@ private function init_hooks() {
 	 * @param OrdersTableRefundDataStore $refund_data_store The refund data store to use.
 	 * @param BatchProcessingController  $batch_processing_controller The batch processing controller to use.
 	 * @param FeaturesController         $features_controller The features controller instance to use.
+	 * @param OrderCache                 $order_cache The order cache engine to use.
+	 * @param OrderCacheController       $order_cache_controller The order cache controller to use.
 	 */
 	final public function init(
 		OrdersTableDataStore $data_store,
 		DataSynchronizer $data_synchronizer,
 		OrdersTableRefundDataStore $refund_data_store,
 		BatchProcessingController $batch_processing_controller,
-		FeaturesController $features_controller ) {
+		FeaturesController $features_controller,
+		OrderCache $order_cache,
+		OrderCacheController $order_cache_controller ) {
 		$this->data_store                  = $data_store;
 		$this->data_synchronizer           = $data_synchronizer;
 		$this->batch_processing_controller = $batch_processing_controller;
 		$this->refund_data_store           = $refund_data_store;
 		$this->features_controller         = $features_controller;
+		$this->order_cache                 = $order_cache;
+		$this->order_cache_controller      = $order_cache_controller;
 	}
 
 	/**
@@ -466,8 +489,14 @@ private function process_pre_update_option( $value, $option, $old_value ) {
 			return $value;
 		}
 
+		if ( self::CUSTOM_ORDERS_TABLE_USAGE_ENABLED_OPTION !== $option || $value === $old_value || false === $old_value ) {
+			return $value;
+		}
+
+		$this->order_cache->flush();
+
 		/**
-		 * Commenting out for better testability.
+		 * TODO: Re-enable the following code once the COT to posts table sync is implemented (it's currently commented out to ease testing).
 		$sync_is_pending = 0 !== $this->data_synchronizer->get_current_orders_pending_sync_count();
 		if ( $sync_is_pending ) {
 			throw new \Exception( "The authoritative table for orders storage can't be changed while there are orders out of sync" );
@@ -575,4 +604,15 @@ private function register_post_type_for_order_placeholders(): void {
 			)
 		);
 	}
+
+	/**
+	 * Handle the order deleted/trashed hooks.
+	 *
+	 * @param int $order_id The id of the order deleted or trashed.
+	 */
+	private function after_order_deleted_or_trashed( int $order_id ): void {
+		if ( $this->features_controller->feature_is_enabled( OrderCacheController::FEATURE_NAME ) ) {
+			$this->order_cache->remove( $order_id );
+		}
+	}
 }
diff --git a/plugins/woocommerce/src/Internal/DataStores/Orders/DataSynchronizer.php b/plugins/woocommerce/src/Internal/DataStores/Orders/DataSynchronizer.php
index efb50a8940c5..5df64183cae6 100644
--- a/plugins/woocommerce/src/Internal/DataStores/Orders/DataSynchronizer.php
+++ b/plugins/woocommerce/src/Internal/DataStores/Orders/DataSynchronizer.php
@@ -5,6 +5,8 @@
 
 namespace Automattic\WooCommerce\Internal\DataStores\Orders;
 
+use Automattic\WooCommerce\Caches\OrderCache;
+use Automattic\WooCommerce\Caches\OrderCacheController;
 use Automattic\WooCommerce\Database\Migrations\CustomOrderTable\PostsToOrdersMigrationController;
 use Automattic\WooCommerce\Internal\BatchProcessing\BatchProcessorInterface;
 use Automattic\WooCommerce\Internal\Features\FeaturesController;
@@ -111,6 +113,7 @@ public function create_database_tables() {
 	 * Delete the custom orders database tables.
 	 */
 	public function delete_database_tables() {
+		$this->cache->flush();
 		$table_names = $this->data_store->get_all_table_names();
 
 		foreach ( $table_names as $table_name ) {
@@ -329,6 +332,8 @@ public function cleanup_synchronization_state() {
 	 * @param array $batch Batch details.
 	 */
 	public function process_batch( array $batch ) : void {
+		$this->cache_controller->temporarily_disable_orders_cache_usage();
+
 		if ( $this->custom_orders_table_is_authoritative() ) {
 			foreach ( $batch as $id ) {
 				$order = wc_get_order( $id );
@@ -344,6 +349,7 @@ public function process_batch( array $batch ) : void {
 		}
 		if ( 0 === $this->get_total_pending_count() ) {
 			$this->cleanup_synchronization_state();
+			$this->cache_controller->maybe_restore_orders_cache_usage();
 		}
 	}
 
diff --git a/plugins/woocommerce/src/Internal/DependencyManagement/ServiceProviders/COTMigrationServiceProvider.php b/plugins/woocommerce/src/Internal/DependencyManagement/ServiceProviders/COTMigrationServiceProvider.php
index f1e953325595..92c338b296d8 100644
--- a/plugins/woocommerce/src/Internal/DependencyManagement/ServiceProviders/COTMigrationServiceProvider.php
+++ b/plugins/woocommerce/src/Internal/DependencyManagement/ServiceProviders/COTMigrationServiceProvider.php
@@ -7,7 +7,6 @@
 
 use Automattic\WooCommerce\DataBase\Migrations\CustomOrderTable\CLIRunner;
 use Automattic\WooCommerce\Database\Migrations\CustomOrderTable\PostsToOrdersMigrationController;
-use Automattic\WooCommerce\Internal\DataStores\Orders\DataSynchronizer;
 use Automattic\WooCommerce\Internal\DependencyManagement\AbstractServiceProvider;
 
 /**
@@ -25,7 +24,6 @@ class COTMigrationServiceProvider extends AbstractServiceProvider {
 	protected $provides = array(
 		PostsToOrdersMigrationController::class,
 		CLIRunner::class,
-		DataSynchronizer::class,
 	);
 
 	/**
@@ -37,5 +35,6 @@ class COTMigrationServiceProvider extends AbstractServiceProvider {
 	 */
 	public function register() {
 		$this->share( PostsToOrdersMigrationController::class );
+		$this->share( CLIRunner::class );
 	}
 }
diff --git a/plugins/woocommerce/src/Internal/DependencyManagement/ServiceProviders/OrdersDataStoreServiceProvider.php b/plugins/woocommerce/src/Internal/DependencyManagement/ServiceProviders/OrdersDataStoreServiceProvider.php
index 4e4b0b18c5e3..e1e207fe82b4 100644
--- a/plugins/woocommerce/src/Internal/DependencyManagement/ServiceProviders/OrdersDataStoreServiceProvider.php
+++ b/plugins/woocommerce/src/Internal/DependencyManagement/ServiceProviders/OrdersDataStoreServiceProvider.php
@@ -6,6 +6,9 @@
 namespace Automattic\WooCommerce\Internal\DependencyManagement\ServiceProviders;
 
 use Automattic\Jetpack\Constants;
+use Automattic\WooCommerce\Caches\OrderCache;
+use Automattic\WooCommerce\Caches\OrderCacheController;
+use Automattic\WooCommerce\Caching\TransientsEngine;
 use Automattic\WooCommerce\DataBase\Migrations\CustomOrderTable\CLIRunner;
 use Automattic\WooCommerce\Database\Migrations\CustomOrderTable\PostsToOrdersMigrationController;
 use Automattic\WooCommerce\Internal\BatchProcessing\BatchProcessingController;
@@ -36,6 +39,8 @@ class OrdersDataStoreServiceProvider extends AbstractServiceProvider {
 		CLIRunner::class,
 		OrdersTableDataStoreMeta::class,
 		OrdersTableRefundDataStore::class,
+		OrderCache::class,
+		OrderCacheController::class,
 	);
 
 	/**
@@ -54,6 +59,8 @@ public function register() {
 				OrdersTableRefundDataStore::class,
 				BatchProcessingController::class,
 				FeaturesController::class,
+				OrderCache::class,
+				OrderCacheController::class,
 			)
 		);
 
diff --git a/plugins/woocommerce/src/Internal/Features/FeaturesController.php b/plugins/woocommerce/src/Internal/Features/FeaturesController.php
index 9a10192ad11f..c5096334c5d4 100644
--- a/plugins/woocommerce/src/Internal/Features/FeaturesController.php
+++ b/plugins/woocommerce/src/Internal/Features/FeaturesController.php
@@ -111,6 +111,11 @@ public function __construct() {
 				'description'     => __( 'Enable the high performance order storage feature.', 'woocommerce' ),
 				'is_experimental' => true,
 			),
+			OrderCacheController::FEATURE_NAME => array(
+				'name'            => __( 'Orders cache', 'woocommerce' ),
+				'description'     => __( 'Enable the usage of a cache for shop orders', 'woocommerce' ),
+				'is_experimental' => true,
+			),
 		);
 
 		$this->legacy_feature_ids = array( 'analytics', 'new_navigation', 'new_product_management' );
diff --git a/plugins/woocommerce/src/Utilities/OrderUtil.php b/plugins/woocommerce/src/Utilities/OrderUtil.php
index e8bee281a726..1a609058a016 100644
--- a/plugins/woocommerce/src/Utilities/OrderUtil.php
+++ b/plugins/woocommerce/src/Utilities/OrderUtil.php
@@ -5,8 +5,10 @@
 
 namespace Automattic\WooCommerce\Utilities;
 
+use Automattic\WooCommerce\Caches\OrderCacheController;
 use Automattic\WooCommerce\Internal\Admin\Orders\PageController;
 use Automattic\WooCommerce\Internal\DataStores\Orders\CustomOrdersTableController;
+use Automattic\WooCommerce\Internal\Features\FeaturesController;
 use Automattic\WooCommerce\Internal\Utilities\COTMigrationUtil;
 use WC_Order;
 use WP_Post;
@@ -35,6 +37,15 @@ public static function custom_orders_table_usage_is_enabled() : bool {
 		return wc_get_container()->get( CustomOrdersTableController::class )->custom_orders_table_usage_is_enabled();
 	}
 
+	/**
+	 * Helper function to get whether the orders cache should be used or not.
+	 *
+	 * @return bool True if the orders cache should be used, false otherwise.
+	 */
+	public static function orders_cache_usage_is_enabled() : bool {
+		return wc_get_container()->get( OrderCacheController::class )->orders_cache_usage_is_enabled();
+	}
+
 	/**
 	 * Checks if posts and order custom table sync is enabled and there are no pending orders.
 	 *
diff --git a/plugins/woocommerce/tests/php/includes/rest-api/Controllers/Version3/class-wc-rest-orders-controller-tests.php b/plugins/woocommerce/tests/php/includes/rest-api/Controllers/Version3/class-wc-rest-orders-controller-tests.php
index 670a35b3f75c..95501cbf8ea1 100644
--- a/plugins/woocommerce/tests/php/includes/rest-api/Controllers/Version3/class-wc-rest-orders-controller-tests.php
+++ b/plugins/woocommerce/tests/php/includes/rest-api/Controllers/Version3/class-wc-rest-orders-controller-tests.php
@@ -230,8 +230,9 @@ public function test_orders_delete(): void {
 		$order = new \WC_Order();
 		$order->set_status( 'completed' );
 		$order->save();
+		$order_id = $order->get_id();
 
-		$request  = new \WP_REST_Request( 'DELETE', '/wc/v3/orders/' . $order->get_id() );
+		$request  = new \WP_REST_Request( 'DELETE', '/wc/v3/orders/' . $order_id );
 		$response = $this->server->dispatch( $request );
 
 		$this->assertEquals( 200, $response->get_status() );
@@ -239,13 +240,13 @@ public function test_orders_delete(): void {
 		// Check that the response includes order data from the order (before deletion).
 		$data = $response->get_data();
 		$this->assertArrayHasKey( 'id', $data );
-		$this->assertEquals( $data['id'], $order->get_id() );
+		$this->assertEquals( $data['id'], $order_id );
 		$this->assertEquals( 'completed', $data['status'] );
 
 		wp_cache_flush();
 
 		// Check the order was actually deleted.
-		$order = wc_get_order( $order->get_id() );
+		$order = wc_get_order( $order_id );
 		$this->assertEquals( 'trash', $order->get_status( 'edit' ) );
 	}
 
diff --git a/plugins/woocommerce/tests/php/src/Caching/ObjectCacheTest.php b/plugins/woocommerce/tests/php/src/Caching/ObjectCacheTest.php
index be63d540f93e..279791857138 100644
--- a/plugins/woocommerce/tests/php/src/Caching/ObjectCacheTest.php
+++ b/plugins/woocommerce/tests/php/src/Caching/ObjectCacheTest.php
@@ -94,7 +94,7 @@ public function test_try_set_null_object() {
 		$this->expectException( CacheException::class );
 		$this->expectExceptionMessage( "Can't cache a null value" );
 
-		$this->sut->set( 'the_id', null );
+		$this->sut->set( null );
 	}
 
 	/**
@@ -104,7 +104,7 @@ public function test_try_set_non_object_or_array_object() {
 		$this->expectException( CacheException::class );
 		$this->expectExceptionMessage( "Can't cache a non-object, non-array value" );
 
-		$this->sut->set( 'the_id', 1234 );
+		$this->sut->set( 1234 );
 	}
 
 	/**
@@ -114,7 +114,7 @@ public function test_try_set_non_int_or_string_id() {
 		$this->expectException( CacheException::class );
 		$this->expectExceptionMessage( "Object id must be an int, a string, or null for 'set'" );
 
-		$this->sut->set( array( 1, 2 ), array( 'foo' ) );
+		$this->sut->set( array( 'foo' ), array( 1, 2 ) );
 	}
 
 	/**
@@ -130,7 +130,7 @@ public function test_try_set_invalid_expiration_value( int $expiration ) {
 		$this->expectException( CacheException::class );
 		$this->expectExceptionMessage( 'Invalid expiration value, must be ObjectCache::DEFAULT_EXPIRATION or a value between 1 and ObjectCache::MAX_EXPIRATION' );
 
-		$this->sut->set( 'the_id', array( 'foo' ), $expiration );
+		$this->sut->set( array( 'foo' ), 'the_id', $expiration );
 	}
 
 	/**
@@ -139,7 +139,7 @@ public function test_try_set_invalid_expiration_value( int $expiration ) {
 	public function try_set_when_cache_engine_fails() {
 		$this->cache_engine->caching_succeeds = false;
 
-		$result = $this->sut->set( 'the_id', array( 'foo' ) );
+		$result = $this->sut->set( array( 'foo' ), 'the_id' );
 		$this->assertFalse( $result );
 	}
 
@@ -148,7 +148,7 @@ public function try_set_when_cache_engine_fails() {
 	 */
 	public function test_set_new_object_with_id_caches_with_expected_key() {
 		$object = array( 'foo' );
-		$result = $this->sut->set( 'the_id', $object );
+		$result = $this->sut->set( $object, 'the_id' );
 
 		$this->assertTrue( $result );
 
@@ -165,9 +165,9 @@ public function test_set_new_object_with_id_caches_with_expected_key() {
 	 */
 	public function test_setting_two_objects_result_in_same_prefix() {
 		$object_1 = array( 'foo' );
-		$this->sut->set( 'the_id_1', $object_1 );
+		$this->sut->set( $object_1, 'the_id_1' );
 		$object_2 = array( 1, 2, 3, 4 );
-		$this->sut->set( 9999, $object_2 );
+		$this->sut->set( $object_2, 9999 );
 
 		$prefix = 'woocommerce_object_cache|the_type|random_1|';
 
@@ -183,7 +183,7 @@ public function test_setting_two_objects_result_in_same_prefix() {
 	 * @testdox 'set' uses the default expiration value if no explicit value is passed.
 	 */
 	public function test_set_with_default_expiration() {
-		$this->sut->set( 'the_id', array( 'foo' ) );
+		$this->sut->set( array( 'foo' ), 'the_id' );
 		$this->assertEquals( $this->sut->get_default_expiration_value(), $this->cache_engine->last_expiration );
 	}
 
@@ -191,7 +191,7 @@ public function test_set_with_default_expiration() {
 	 * @testdox 'set' uses the explicitly passed expiration value.
 	 */
 	public function test_set_with_explicit_expiration() {
-		$this->sut->set( 'the_id', array( 'foo' ), 1234 );
+		$this->sut->set( array( 'foo' ), 'the_id', 1234 );
 		$this->assertEquals( 1234, $this->cache_engine->last_expiration );
 	}
 
@@ -202,7 +202,7 @@ public function test_set_null_id_without_id_retrieval_implementation() {
 		$this->expectException( CacheException::class );
 		$this->expectExceptionMessage( "Null id supplied and the cache class doesn't implement get_object_id" );
 
-		$this->sut->set( null, array( 'foo' ) );
+		$this->sut->set( array( 'foo' ) );
 	}
 
 	/**
@@ -227,11 +227,88 @@ protected function get_random_string(): string {
 
 		// phpcs:enable Squiz.Commenting
 
-		$sut->set( null, array( 'id' => 1234 ) );
+		$sut->set( array( 'id' => 1234 ) );
 
 		$this->assertEquals( 'woocommerce_object_cache|the_type|random|1235', array_keys( $this->cache_engine->cache )[0] );
 	}
 
+	/**
+	 * @testdox 'update_if_cached' does nothing if no object is cached with the passed (or obtained) id.
+	 *
+	 * @testWith [1234]
+	 *           [null]
+	 *
+	 * @param ?int $id Id to pass to update_if_cached.
+	 */
+	public function test_update_if_cached_does_nothing_for_not_cached_id( ?int $id ) {
+		// phpcs:disable Squiz.Commenting
+
+		$sut = new class() extends ObjectCache {
+			public function get_object_type(): string {
+				return 'the_type';
+			}
+
+			protected function get_object_id( $object ) {
+				return $object['id'];
+			}
+		};
+
+		// phpcs:enable Squiz.Commenting
+
+		$result = $sut->update_if_cached( array( 'id' => 1234 ), $id );
+		$this->assertFalse( $result );
+		$this->assertEmpty( $this->cache_engine->cache );
+	}
+
+	/**
+	 * @testdox 'update_if_cached' updates an already cached object the same way as 'set'.
+	 *
+	 * @testWith [1234]
+	 *           [null]
+	 *
+	 * @param ?int $id Id to pass to update_if_cached.
+	 */
+	public function test_update_if_cached_updates_already_cached_object( ?int $id ) {
+		// phpcs:disable Squiz.Commenting
+
+		$sut = new class() extends ObjectCache {
+			public function get_object_type(): string {
+				return 'the_type';
+			}
+
+			protected function get_object_id( $object ) {
+				return $object['id'];
+			}
+
+			protected function get_random_string(): string {
+				return 'random';
+			}
+		};
+
+		// phpcs:enable Squiz.Commenting
+
+		$sut->set( array( 'id' => 1234 ), $id );
+		$this->assertEquals( 'woocommerce_object_cache|the_type|random|1234', array_keys( $this->cache_engine->cache )[0] );
+
+		$new_value = array(
+			'id'  => 1234,
+			'foo' => 'bar',
+		);
+		$result    = $sut->update_if_cached( $new_value, $id );
+		$this->assertTrue( $result );
+		$this->assertEquals( $this->cache_engine->cache['woocommerce_object_cache|the_type|random|1234'], array( 'data' => $new_value ) );
+	}
+
+	/**
+	 * @testdox 'update_if_cached' throws an exception if no object id is passed and the class doesn't implement 'get_object_id'.
+	 */
+	public function test_update_if_cached_null_id_without_id_retrieval_implementation() {
+		$this->expectException( CacheException::class );
+		$this->expectExceptionMessage( "Null id supplied and the cache class doesn't implement get_object_id" );
+
+		$this->sut->update_if_cached( array( 'foo' ) );
+	}
+
 	/**
 	 * @testdox 'set' caches the value returned by 'serialize'.
 	 */
@@ -252,7 +329,7 @@ protected function serialize( $object ): array {
 
 		// phpcs:enable Squiz.Commenting
 
-		$sut->set( 1234, $object );
+		$sut->set( $object, 1234 );
 
 		$cached   = array_values( $this->cache_engine->cache )[0];
 		$expected = array( 'the_data' => $object );
@@ -269,7 +346,7 @@ protected function serialize( $object ): array {
 	 */
 	public function test_set_with_custom_serialization_that_returns_errors( int $errors_count ) {
 		$exception = null;
-		$errors    = 1 === $errors_count ? array( 'Foo failed' ) : array( 'Foo failed', 'Bar failed' );
+		$errors    = $errors_count === 1 ? array( 'Foo failed' ) : array( 'Foo failed', 'Bar failed' );
 		$object    = array( 'foo' );
 
 		// phpcs:disable Squiz.Commenting
@@ -293,13 +370,13 @@ protected function validate( $object ): array {
 		// phpcs:enable Squiz.Commenting
 
 		try {
-			$sut->set( 1234, $object );
+			$sut->set( $object, 1234 );
 		} catch ( CacheException $thrown ) {
 			$exception = $thrown;
 		}
 
 		$expected_message = 'Object validation/serialization failed';
-		if ( 1 === $errors_count ) {
+		if ( $errors_count === 1 ) {
 			$expected_message .= ': Foo failed';
 		}
 		$this->assertEquals( $expected_message, $exception->getMessage() );
@@ -343,7 +420,7 @@ public function test_try_get_with_invalid_expiration_value( int $expiration ) {
 	 */
 	public function test_try_getting_previously_cached_object() {
 		$object = array( 'foo' );
-		$this->sut->set( 'the_id', $object );
+		$this->sut->set( $object, 'the_id' );
 
 		$result = $this->sut->get( 'the_id' );
 		$this->assertEquals( $object, $result );
@@ -465,7 +542,7 @@ protected function deserialize( array $serialized ) {
 
 		// phpcs:enable Squiz.Commenting
 
-		$sut->set( 'the_id', array( 1, 2 ) );
+		$sut->set( array( 1, 2 ), 'the_id' );
 
 		$result   = $sut->get( 'the_id' );
 		$expected = array( 1, 2, 3 );
@@ -476,8 +553,8 @@ protected function deserialize( array $serialized ) {
 	 * @testdox 'remove' removes a cached object and returns true, or returns false if there's no cached object under the passed id.
 	 */
 	public function test_remove() {
-		$this->sut->set( 'the_id_1', array( 'foo' ) );
-		$this->sut->set( 'the_id_2', array( 'bar' ) );
+		$this->sut->set( array( 'foo' ), 'the_id_1' );
+		$this->sut->set( array( 'bar' ), 'the_id_2' );
 
 		$result_1 = $this->sut->remove( 'the_id_1' );
 		$result_2 = $this->sut->remove( 'the_id_X' );
@@ -493,12 +570,12 @@ public function test_remove() {
 	 * @testdox 'flush' deletes the stored cache key prefix, effectively rendering the cached objects inaccessible.
 	 */
 	public function test_flush() {
-		$this->sut->set( 'the_id', array( 'foo' ) );
+		$this->sut->set( array( 'foo' ), 'the_id' );
 
 		$this->sut->flush();
 		$this->assertFalse( get_option( 'wp_object_cache_key_prefix_the_type' ) );
 
-		$this->sut->set( 'the_id_2', array( 'bar' ) );
+		$this->sut->set( array( 'bar' ), 'the_id_2' );
 
 		$expected_new_prefix = 'woocommerce_object_cache|the_type|random_2|';
 		$this->assertEquals( $expected_new_prefix, get_option( 'wp_object_cache_key_prefix_the_type' ) );
@@ -534,7 +611,7 @@ protected function get_cache_engine_instance(): CacheEngine {
 		// phpcs:enable Squiz.Commenting
 
 		$object = array( 'foo' );
-		$sut->set( 'the_id', $object );
+		$sut->set( $object, 'the_id' );
 
 		$expected_cached = array( 'data' => $object );
 		$this->assertEquals( $expected_cached, array_values( $engine->cache )[0] );
@@ -560,7 +637,7 @@ function( $old_engine, $cache ) use ( $engine, &$engine_passed_to_filter, &$cach
 		);
 
 		$object = array( 'foo' );
-		$this->sut->set( 'the_id', $object );
+		$this->sut->set( $object, 'the_id' );
 
 		$expected_cached = array( 'data' => $object );
 		$this->assertEquals( $expected_cached, array_values( $engine->cache )[0] );
@@ -590,7 +667,7 @@ function( $data, $object, $id ) use ( &$object_passed_to_filter, &$id_passed_to_
 		);
 
 		$object = array( 'fizz' );
-		$this->sut->set( 'the_id', $object );
+		$this->sut->set( $object, 'the_id' );
 
 		$expected_cached = array(
 			'data' => $object,
@@ -626,7 +703,7 @@ function( $object, $data, $id ) use ( &$object_passed_to_filter, &$id_passed_to_
 			3
 		);
 
-		$this->sut->set( 'the_id', $original_object );
+		$this->sut->set( $original_object, 'the_id' );
 		$retrieved_object = $this->sut->get( 'the_id' );
 
 		$this->assertEquals( $replacement_object, $retrieved_object );
@@ -658,7 +735,7 @@ function( $id, $result ) use ( &$id_passed_to_action, &$result_passed_to_action
 			2
 		);
 
-		$this->sut->set( 'the_id', array( 'foo' ) );
+		$this->sut->set( array( 'foo' ), 'the_id' );
 		$this->sut->remove( $operation_succeeds ? 'the_id' : 'INVALID_ID' );
 
 		$this->assertEquals( $operation_succeeds ? 'the_id' : 'INVALID_ID', $id_passed_to_action );

From 7aabda47a18308be89c0a6501636bcdb3ccba31d Mon Sep 17 00:00:00 2001
From: Vedanshu Jain <vedanshu.jain.2012@gmail.com>
Date: Tue, 24 Jan 2023 14:47:05 +0530
Subject: [PATCH 02/22] Move the namespace algorithm functions to dedicated
 CacheNameSpaceTrait.

We intend to use the same namespacing algorithm for HPOS orders cache like we have been using before for posts. Moving this structure to a common trait allow us to use the same logic for both posts and HPOS.
---
 .../includes/class-wc-cache-helper.php        | 43 ++----------
 .../includes/class-wc-order-factory.php       |  2 -
 .../src/Caching/CacheNameSpaceTrait.php       | 66 +++++++++++++++++++
 .../{WpCacheEngine.php => WPCacheEngine.php}  |  0
 4 files changed, 70 insertions(+), 41 deletions(-)
 create mode 100644 plugins/woocommerce/src/Caching/CacheNameSpaceTrait.php
 rename plugins/woocommerce/src/Caching/{WpCacheEngine.php => WPCacheEngine.php} (100%)

diff --git a/plugins/woocommerce/includes/class-wc-cache-helper.php b/plugins/woocommerce/includes/class-wc-cache-helper.php
index e80611619aef..9c0296633e0b 100644
--- a/plugins/woocommerce/includes/class-wc-cache-helper.php
+++ b/plugins/woocommerce/includes/class-wc-cache-helper.php
@@ -5,12 +5,15 @@
  * @package WooCommerce\Classes
  */
 
+use Automattic\WooCommerce\Caching\CacheNameSpaceTrait;
+
 defined( 'ABSPATH' ) || exit;
 
 /**
  * WC_Cache_Helper.
  */
 class WC_Cache_Helper {
+	use CacheNameSpaceTrait;
 
 	/**
 	 * Transients to delete on shutdown.
@@ -42,7 +45,7 @@ public static function init() {
 	 */
 	public static function additional_nocache_headers( $headers ) {
 		global $wp_query;
-		
+
 		$agent = isset( $_SERVER['HTTP_USER_AGENT'] ) ? wp_unslash( $_SERVER['HTTP_USER_AGENT'] ) : ''; // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
 
 		$set_cache = false;
@@ -114,44 +117,6 @@ public static function invalidate_attribute_count( $attribute_keys ) {
 		}
 	}
 
-	/**
-	 * Get prefix for use with wp_cache_set. Allows all cache in a group to be invalidated at once.
-	 *
-	 * @param  string $group Group of cache to get.
-	 * @return string
-	 */
-	public static function get_cache_prefix( $group ) {
-		// Get cache key - uses cache key wc_orders_cache_prefix to invalidate when needed.
-		$prefix = wp_cache_get( 'wc_' . $group . '_cache_prefix', $group );
-
-		if ( false === $prefix ) {
-			$prefix = microtime();
-			wp_cache_set( 'wc_' . $group . '_cache_prefix', $prefix, $group );
-		}
-
-		return 'wc_cache_' . $prefix . '_';
-	}
-
-	/**
-	 * Increment group cache prefix (invalidates cache).
-	 *
-	 * @param string $group Group of cache to clear.
-	 */
-	public static function incr_cache_prefix( $group ) {
-		wc_deprecated_function( 'WC_Cache_Helper::incr_cache_prefix', '3.9.0', 'WC_Cache_Helper::invalidate_cache_group' );
-		self::invalidate_cache_group( $group );
-	}
-
-	/**
-	 * Invalidate cache group.
-	 *
-	 * @param string $group Group of cache to clear.
-	 * @since 3.9.0
-	 */
-	public static function invalidate_cache_group( $group ) {
-		wp_cache_set( 'wc_' . $group . '_cache_prefix', microtime(), $group );
-	}
-
 	/**
 	 * Get a hash of the customer location.
 	 *
diff --git a/plugins/woocommerce/includes/class-wc-order-factory.php b/plugins/woocommerce/includes/class-wc-order-factory.php
index 973f6e5ec187..3851a048f492 100644
--- a/plugins/woocommerce/includes/class-wc-order-factory.php
+++ b/plugins/woocommerce/includes/class-wc-order-factory.php
@@ -13,8 +13,6 @@
 
 defined( 'ABSPATH' ) || exit;
 
-use Automattic\WooCommerce\Utilities\OrderUtil;
-
 /**
  * Order factory class
  */
diff --git a/plugins/woocommerce/src/Caching/CacheNameSpaceTrait.php b/plugins/woocommerce/src/Caching/CacheNameSpaceTrait.php
new file mode 100644
index 000000000000..bf61e19a129c
--- /dev/null
+++ b/plugins/woocommerce/src/Caching/CacheNameSpaceTrait.php
@@ -0,0 +1,66 @@
+<?php
+
+namespace Automattic\WooCommerce\Caching;
+
+/**
+ * Implements namespacing algorithm to simulate grouping and namespacing for wp_cache, memcache and other caching engines that don't support grouping natively.
+ *
+ * See the algorithm details here: https://github.com/memcached/memcached/wiki/ProgrammingTricks#namespacing.
+ *
+ * To use the namespacing algorithm in the CacheEngine class:
+ * 1. Use a group string to identify all objects of a type.
+ * 2. Before setting cache, prefix the cache key by using the `get_cache_prefix`.
+ * 3. Use `invalidate_cache_group` function to invalidate all caches in entire group at once.
+ */
+trait CacheNameSpaceTrait {
+
+	/**
+	 * Get prefix for use with wp_cache_set. Allows all cache in a group to be invalidated at once.
+	 *
+	 * @param  string $group Group of cache to get.
+	 * @return string Prefix.
+	 */
+	public static function get_cache_prefix( $group ) {
+		// Get cache key - uses cache key wc_orders_cache_prefix to invalidate when needed.
+		$prefix = wp_cache_get( 'wc_' . $group . '_cache_prefix', $group );
+
+		if ( false === $prefix ) {
+			$prefix = microtime();
+			wp_cache_set( 'wc_' . $group . '_cache_prefix', $prefix, $group );
+		}
+
+		return 'wc_cache_' . $prefix . '_';
+	}
+
+	/**
+	 * Increment group cache prefix (invalidates cache).
+	 *
+	 * @param string $group Group of cache to clear.
+	 */
+	public static function incr_cache_prefix( $group ) {
+		wc_deprecated_function( 'WC_Cache_Helper::incr_cache_prefix', '3.9.0', 'WC_Cache_Helper::invalidate_cache_group' );
+		self::invalidate_cache_group( $group );
+	}
+
+	/**
+	 * Invalidate cache group.
+	 *
+	 * @param string $group Group of cache to clear.
+	 * @since 3.9.0
+	 */
+	public static function invalidate_cache_group( $group ) {
+		wp_cache_set( 'wc_' . $group . '_cache_prefix', microtime(), $group );
+	}
+
+	/**
+	 * Helper method to get prefixed key.
+	 *
+	 * @param  string $key   Key to prefix.
+	 * @param  string $group Group of cache to get.
+	 *
+	 * @return string Prefixed key.
+	 */
+	public static function get_prefixed_key( $key, $group ) {
+		return self::get_cache_prefix( $group ) . $key;
+	}
+}
diff --git a/plugins/woocommerce/src/Caching/WpCacheEngine.php b/plugins/woocommerce/src/Caching/WPCacheEngine.php
similarity index 100%
rename from plugins/woocommerce/src/Caching/WpCacheEngine.php
rename to plugins/woocommerce/src/Caching/WPCacheEngine.php

From eb69f7814545f1cc1a58c2bbf110011fc9839548 Mon Sep 17 00:00:00 2001
From: Vedanshu Jain <vedanshu.jain.2012@gmail.com>
Date: Tue, 24 Jan 2023 14:51:01 +0530
Subject: [PATCH 03/22] Allow grouping support in cache engines.

This will allow us to add namespacing support directly in the cache engine.
---
 .../woocommerce/src/Caching/CacheEngine.php   | 17 +++--
 .../woocommerce/src/Caching/WPCacheEngine.php | 64 +++++++++++++++----
 2 files changed, 63 insertions(+), 18 deletions(-)

diff --git a/plugins/woocommerce/src/Caching/CacheEngine.php b/plugins/woocommerce/src/Caching/CacheEngine.php
index 5881f8caf683..dc276fd09f0e 100644
--- a/plugins/woocommerce/src/Caching/CacheEngine.php
+++ b/plugins/woocommerce/src/Caching/CacheEngine.php
@@ -14,7 +14,7 @@ interface CacheEngine {
 	 * @param string $key They key under which the object to retrieve is cached.
 	 * @return array|object|null The cached object, or null if there's no object cached under the passed key.
 	 */
-	public function get_cached_object( string $key);
+	public function get_cached_object( string $key, string $group = '' );
 
 	/**
 	 * Caches an object under a given key, and with a given expiration.
@@ -24,7 +24,7 @@ public function get_cached_object( string $key);
 	 * @param int          $expiration Expiration for the cached object, in seconds.
 	 * @return bool True if the object is cached successfully, false otherwise.
 	 */
-	public function cache_object( string $key, $object, int $expiration): bool;
+	public function cache_object( string $key, $object, int $expiration, string $group = '' ): bool;
 
 	/**
 	 * Removes a cached object from the cache.
@@ -32,7 +32,7 @@ public function cache_object( string $key, $object, int $expiration): bool;
 	 * @param string $key They key under which the object is cached.
 	 * @return bool True if the object is removed from the cache successfully, false otherwise (because the object wasn't cached or for other reason).
 	 */
-	public function delete_cached_object( string $key): bool;
+	public function delete_cached_object( string $key, string $group = '' ): bool;
 
 	/**
 	 * Checks if an object is cached under a given key.
@@ -40,5 +40,14 @@ public function delete_cached_object( string $key): bool;
 	 * @param string $key The key to verify.
 	 * @return bool True if there's an object cached under the given key, false otherwise.
 	 */
-	public function is_cached( string $key): bool;
+	public function is_cached( string $key, string $group = '' ): bool;
+
+	/**
+	 * Deletes all cached objects under a given group.
+	 *
+	 * @param string $group The group to delete.
+	 *
+	 * @return bool True if the group is deleted successfully, false otherwise.
+	 */
+	public function delete_cache_group( string $group = '' ): bool;
 }
diff --git a/plugins/woocommerce/src/Caching/WPCacheEngine.php b/plugins/woocommerce/src/Caching/WPCacheEngine.php
index 682a666931e3..f3f2b7716cf1 100644
--- a/plugins/woocommerce/src/Caching/WPCacheEngine.php
+++ b/plugins/woocommerce/src/Caching/WPCacheEngine.php
@@ -5,28 +5,64 @@
 /**
  * Implementation of CacheEngine that uses the built-in WordPress cache.
  */
-class WpCacheEngine implements CacheEngine {
+class WPCacheEngine implements CacheEngine {
+	use CacheNameSpaceTrait;
 
-	public const CACHE_GROUP_NAME = 'wc-object-cache';
-
-	// phpcs:disable Squiz.Commenting.FunctionComment.Missing
-
-	public function get_cached_object( string $key ) {
-		$value = wp_cache_get( $key, self::CACHE_GROUP_NAME );
+	/**
+	 * Gets an object from the cache.
+	 *
+	 * @param string $key The key under which the object is cached.
+	 * @return array|object|null The cached object, or null if the object is not cached.
+	 */
+	public function get_cached_object( string $key, string $group = '' ) {
+		$prefixed_key = self::get_prefixed_key( $key, $group );
+		$value = wp_cache_get( $prefixed_key, $group );
 		return false === $value ? null : $value;
 	}
 
-	public function cache_object( string $key, $object, int $expiration ): bool {
-		return wp_cache_set( $key, $object, self::CACHE_GROUP_NAME, $expiration );
+	/**
+	 * Caches an object under a given key, and with a given expiration.
+	 *
+	 * @param string       $key The key under which the object will be cached.
+	 * @param array|object $object The object to cache.
+	 * @param int          $expiration Expiration for the cached object, in seconds.
+	 * @return bool True if the object is cached successfully, false otherwise.
+	 */
+	public function cache_object( string $key, $object, int $expiration, string $group = '' ): bool {
+		$prefixed_key = self::get_prefixed_key( $key, $group );
+		return wp_cache_set( $prefixed_key, $object, $group, $expiration );
 	}
 
-	public function delete_cached_object( string $key ): bool {
-		return wp_cache_delete( $key, self::CACHE_GROUP_NAME );
+	/**
+	 * Removes a cached object from the cache.
+	 *
+	 * @param string $key They key under which the object is cached.
+	 * @return bool True if the object is removed from the cache successfully, false otherwise (because the object wasn't cached or for other reason).
+	 */
+	public function delete_cached_object( string $key, string $group = '' ): bool {
+		$prefixed_key = self::get_prefixed_key( $key, $group );
+		return wp_cache_delete( $prefixed_key, $group );
 	}
 
-	public function is_cached( string $key ): bool {
-		return false !== wp_cache_get( $key, self::CACHE_GROUP_NAME );
+	/**
+	 * Checks if an object is cached under a given key.
+	 *
+	 * @param string $key The key to verify.
+	 * @return bool True if there's an object cached under the given key, false otherwise.
+	 */
+	public function is_cached( string $key, string $group = '' ): bool {
+		$prefixed_key = self::get_prefixed_key( $key, $group );
+		return false !== wp_cache_get( $prefixed_key, $group );
 	}
 
-	// phpcs:enable Squiz.Commenting.FunctionComment.Missing
+	/**
+	 * Deletes all cached objects under a given group.
+	 *
+	 * @param string $group The group to delete.
+	 *
+	 * @return bool True if the group is deleted successfully, false otherwise.
+	 */
+	public function delete_cache_group( string $group = '' ): bool {
+		self::invalidate_cache_group( $group );
+	}
 }

From 217703a9b608ba9f632b9b0ae6c79ef06ce32a54 Mon Sep 17 00:00:00 2001
From: Vedanshu Jain <vedanshu.jain.2012@gmail.com>
Date: Tue, 24 Jan 2023 14:52:28 +0530
Subject: [PATCH 04/22] Remove namespacing from object cache since its
 supported by cache engine directly.

---
 plugins/woocommerce/src/Caches/OrderCache.php |  14 +-
 .../woocommerce/src/Caching/ObjectCache.php   | 166 +++---------------
 2 files changed, 34 insertions(+), 146 deletions(-)

diff --git a/plugins/woocommerce/src/Caches/OrderCache.php b/plugins/woocommerce/src/Caches/OrderCache.php
index f09adba3c621..c4f0a7e31f38 100644
--- a/plugins/woocommerce/src/Caches/OrderCache.php
+++ b/plugins/woocommerce/src/Caches/OrderCache.php
@@ -15,7 +15,7 @@ class OrderCache extends ObjectCache {
 	 * @return string
 	 */
 	public function get_object_type(): string {
-		return 'order';
+		return 'orders';
 	}
 
 	/**
@@ -41,4 +41,16 @@ protected function validate( $object ): ?array {
 
 		return null;
 	}
+
+	/**
+	 * Get an object from an authoritative data store.
+	 * This is used by 'get' if the object isn't cached and no custom object retrieval callback is suupplied.
+	 *
+	 * @param int|string $id The id of the object to get.
+	 *
+	 * @return array|object|null The retrieved object, or null if it's not possible to retrieve an object by the given id.
+	 */
+	protected function get_from_datastore( $id ) {
+		return wc_get_order( $id );
+	}
 }
diff --git a/plugins/woocommerce/src/Caching/ObjectCache.php b/plugins/woocommerce/src/Caching/ObjectCache.php
index 94b6de7e642a..23bc6728c716 100644
--- a/plugins/woocommerce/src/Caching/ObjectCache.php
+++ b/plugins/woocommerce/src/Caching/ObjectCache.php
@@ -17,8 +17,6 @@
  */
 abstract class ObjectCache {
 
-	private const CACHE_PREFIX_OPTION_NAME = 'wp_object_cache_key_prefix_';
-
 	/**
 	 * Expiration value to be passed to 'set' to use the value of $default_expiration.
 	 */
@@ -54,24 +52,10 @@ abstract class ObjectCache {
 	/**
 	 * The cache engine to use.
 	 *
-	 * @var CacheEngine
+	 * @var ?CacheEngine
 	 */
 	private $cache_engine = null;
 
-	/**
-	 * The prefix to use for cache keys to pass to the cache engine.
-	 *
-	 * @var string
-	 */
-	private $cache_key_prefix = null;
-
-	/**
-	 * The name of the option used to store the cache prefix.
-	 *
-	 * @var string
-	 */
-	private $cache_key_prefix_option_name;
-
 	/**
 	 * Gets an identifier for the types of objects cached by this class.
 	 * This identifier will be used to compose the keys passed to the cache engine,
@@ -92,8 +76,6 @@ public function __construct() {
 		if ( empty( $this->object_type ) ) {
 			throw new CacheException( 'Class ' . get_class( $this ) . ' returns an empty value for get_object_type', $this );
 		}
-
-		$this->cache_key_prefix_option_name = self::CACHE_PREFIX_OPTION_NAME . $this->object_type;
 	}
 
 	/**
@@ -117,7 +99,7 @@ private function get_cache_engine(): CacheEngine {
 			/**
 			 * Filters the underlying cache engine to be used by an instance of ObjectCache.
 			 *
-			 * @since 6.8.0
+			 * @since 7.4.0
 			 *
 			 * @param CacheEngine $engine The cache engine to be used by default.
 			 * @param ObjectCache $cache_instance The instance of ObjectCache that will use the cache engine.
@@ -128,39 +110,6 @@ private function get_cache_engine(): CacheEngine {
 		return $this->cache_engine;
 	}
 
-	/**
-	 * Get the current cache prefix to use, generating one if none is in use yet.
-	 *
-	 * @return string
-	 */
-	private function get_cache_key_prefix(): string {
-		$value = $this->cache_key_prefix;
-		if ( ! $value ) {
-			$value = get_option( $this->cache_key_prefix_option_name );
-			if ( ! $value ) {
-				$value = $this->create_cache_key_prefix();
-			}
-			$this->cache_key_prefix = $value;
-		}
-		return $value;
-	}
-
-	/**
-	 * Generate a prefix for the cache keys to use, containing the object type and a random string,
-	 * and store it persistently using an option.
-	 *
-	 * @return string The generated prefix.
-	 * @throws CacheException Can't store the generated prefix.
-	 */
-	private function create_cache_key_prefix(): string {
-		$prefix_variable_part = $this->get_random_string();
-		$prefix               = "woocommerce_object_cache|{$this->object_type}|{$prefix_variable_part}|";
-		if ( ! update_option( $this->cache_key_prefix_option_name, $prefix ) ) {
-			throw new CacheException( "Can't store the key prefix option", $this );
-		}
-		return $prefix;
-	}
-
 	/**
 	 * Add an object to the cache, or update an already cached object.
 	 *
@@ -201,24 +150,13 @@ public function set( $object, $id = null, int $expiration = self::DEFAULT_EXPIRA
 		}
 
 		$id   = $this->get_id_from_object_if_null( $object, $id );
-		$data = $this->serialize( $object );
-
-		/**
-		 * Filters the serialized object that will be passed by an instance of ObjectCache to its cache engine to be cached.
-		 *
-		 * @since 6.8.0
-		 *
-		 * @param array $data The already serialized object data.
-		 * @param array|object $object The object before serialization.
-		 * @returns array The actual serialized object data that will be passed to the cache engine.
-		 */
-		$data = apply_filters( "woocommerce_after_serializing_{$this->object_type}_for_caching", $data, $object, $id );
-
-		$this->last_cached_data = $data;
+
+		$this->last_cached_data = $object;
 		return $this->get_cache_engine()->cache_object(
-			$this->get_cache_key_prefix() . $id,
-			$data,
-			self::DEFAULT_EXPIRATION === $expiration ? $this->default_expiration : $expiration
+			$id,
+			$object,
+			self::DEFAULT_EXPIRATION === $expiration ? $this->default_expiration : $expiration,
+			$this->get_object_type()
 		);
 	}
 
@@ -246,7 +184,9 @@ public function update_if_cached( $object, $id = null, int $expiration = self::D
 	 *
 	 * @param object|array    $object The object to get the id from.
 	 * @param int|string|null $id An object id or null.
+	 *
 	 * @return int|string|null Passed $id if it wasn't null, otherwise id obtained from $object using get_object_id.
+	 *
 	 * @throws CacheException Passed $id is null and get_object_id returned null too.
 	 */
 	private function get_id_from_object_if_null( $object, $id ) {
@@ -293,7 +233,7 @@ public function get( $id, int $expiration = self::DEFAULT_EXPIRATION, callable $
 
 		$this->verify_expiration_value( $expiration );
 
-		$data = $this->get_cache_engine()->get_cached_object( $this->get_cache_key_prefix() . $id );
+		$data = $this->get_cache_engine()->get_cached_object( $id, $this->get_object_type() );
 		if ( null === $data ) {
 			if ( $get_from_datastore_callback ) {
 				$object = $get_from_datastore_callback( $id );
@@ -309,18 +249,7 @@ public function get( $id, int $expiration = self::DEFAULT_EXPIRATION, callable $
 			$data = $this->last_cached_data;
 		}
 
-		$object = $this->deserialize( $data );
-
-		/**
-		 * Filters the deserialized object that is retrieved from the cache engine of an instance of ObjectCache and will be returned by 'get'.
-		 *
-		 * @since 6.8.0
-		 *
-		 * @param array|object $object The object after being deserialized.
-		 * @param array $data The serialized object data that was retrieved from the cache engine.
-		 * @returns array|object The actual deserialized object data that will be returned by 'get'.
-		 */
-		return apply_filters( "woocommerce_after_deserializing_{$this->object_type}_from_cache", $object, $data, $id );
+		return $data;
 	}
 
 	/**
@@ -330,41 +259,16 @@ public function get( $id, int $expiration = self::DEFAULT_EXPIRATION, callable $
 	 * @return bool True if the object is removed from the cache successfully, false otherwise (because the object wasn't cached or for other reason).
 	 */
 	public function remove( $id ): bool {
-		$result = $this->get_cache_engine()->delete_cached_object( $this->get_cache_key_prefix() . $id );
-
-		/**
-		 * Action triggered by an instance of ObjectCache after an object is (attempted to be) removed from the cache.
-		 *
-		 * @since 6.8.0
-		 *
-		 * @param int|string $id The id of the object being removed.
-		 * @param bool $result True if the object removal succeeded, false otherwise.
-		 */
-		do_action( "woocommerce_after_removing_{$this->object_type}_from_cache", $id, $result );
-
-		return $result;
+		return $this->get_cache_engine()->delete_cached_object( $id, $this->get_object_type() );
 	}
 
 	/**
 	 * Remove all the objects from the cache.
-	 * This is done by forcing the generation of a new cache key prefix
-	 * and leaving the old cached objects to expire.
 	 *
-	 * @return void
+	 * @return bool True on success, false on error.
 	 */
-	public function flush(): void {
-		delete_option( $this->cache_key_prefix_option_name );
-		$this->cache_key_prefix = null;
-
-		/**
-		 * Action triggered by an instance of ObjectCache after it flushes all the cached objects.
-		 *
-		 * @since 6.8.0
-		 *
-		 * @param ObjectCache $cache_instance The instance of ObjectCache whose 'flush` method has been called.
-		 * @param CacheEngine $engine The cache engine in use.
-		 */
-		do_action( "woocommerce_after_flushing_{$this->object_type}_cache", $this, $this->get_cache_engine() );
+	public function flush(): bool {
+		return $this->get_cache_engine()->delete_cache_group( $this->get_object_type() );
 	}
 
 	/**
@@ -374,7 +278,7 @@ public function flush(): void {
 	 * @return bool True if there's a cached object with the specified id.
 	 */
 	public function is_cached( $id ): bool {
-		return $this->get_cache_engine()->is_cached( $this->get_cache_key_prefix() . $id );
+		return $this->get_cache_engine()->is_cached( $id, $this->get_object_type() );
 	}
 
 	/**
@@ -384,9 +288,7 @@ public function is_cached( $id ): bool {
 	 * @param array|object $object The object to get the id for.
 	 * @return int|string|null
 	 */
-	protected function get_object_id( $object ) {
-		return null;
-	}
+	abstract protected function get_object_id( $object );
 
 	/**
 	 * Validate an object before it's cached.
@@ -394,31 +296,7 @@ protected function get_object_id( $object ) {
 	 * @param array|object $object Object to validate.
 	 * @return array|null An array with validation error messages, null or an empty array if there are no errors.
 	 */
-	protected function validate( $object ): ?array {
-		return null;
-	}
-
-	/**
-	 * Convert an object to a serialized form suitable for caching.
-	 * If a class overrides this method it should override 'deserialize' as well.
-	 *
-	 * @param array|object $object The object to serialize.
-	 * @return array The serialized object.
-	 */
-	protected function serialize( $object ): array {
-		return array( 'data' => $object );
-	}
-
-	/**
-	 * Deserializes a set of object data after having been retrieved from the cache.
-	 * If a class overrides this method it should override 'serialize' as well.
-	 *
-	 * @param array $serialized Serialized object data as it was returned by 'validate_and_serialize'.
-	 * @return object|array Deserialized object, ready to be returned by 'get'.
-	 */
-	protected function deserialize( array $serialized ) {
-		return $serialized['data'];
-	}
+	abstract protected function validate( $object ): ?array;
 
 	/**
 	 * Get an object from an authoritative data store.
@@ -427,9 +305,7 @@ protected function deserialize( array $serialized ) {
 	 * @param int|string $id The id of the object to get.
 	 * @return array|object|null The retrieved object, or null if it's not possible to retrieve an object by the given id.
 	 */
-	protected function get_from_datastore( $id ) {
-		return null;
-	}
+	abstract protected function get_from_datastore( $id );
 
 	/**
 	 * Get the instance of the cache engine to use.
@@ -437,7 +313,7 @@ protected function get_from_datastore( $id ) {
 	 * @return CacheEngine
 	 */
 	protected function get_cache_engine_instance(): CacheEngine {
-		return wc_get_container()->get( WpCacheEngine::class );
+		return wc_get_container()->get( WPCacheEngine::class );
 	}
 
 	/**

From eb2900614c6105fd53d4380505d7986d27615459 Mon Sep 17 00:00:00 2001
From: Vedanshu Jain <vedanshu.jain.2012@gmail.com>
Date: Tue, 24 Jan 2023 14:53:29 +0530
Subject: [PATCH 05/22] Use HPOS feature flag for order cache as well.

---
 .../src/Caches/OrderCacheController.php       | 46 +++----------------
 .../Internal/Features/FeaturesController.php  |  5 --
 2 files changed, 6 insertions(+), 45 deletions(-)

diff --git a/plugins/woocommerce/src/Caches/OrderCacheController.php b/plugins/woocommerce/src/Caches/OrderCacheController.php
index 6d89bb5309c4..3c513abb8f20 100644
--- a/plugins/woocommerce/src/Caches/OrderCacheController.php
+++ b/plugins/woocommerce/src/Caches/OrderCacheController.php
@@ -4,6 +4,7 @@
 
 use Automattic\WooCommerce\Internal\Features\FeaturesController;
 use Automattic\WooCommerce\Internal\Traits\AccessiblePrivateMethods;
+use Automattic\WooCommerce\Utilities\OrderUtil;
 
 /**
  * A class to control the usage of the orders cache.
@@ -12,8 +13,6 @@ class OrderCacheController {
 
 	use AccessiblePrivateMethods;
 
-	const FEATURE_NAME = 'orders_cache';
-
 	/**
 	 * The orders cache to use.
 	 *
@@ -35,56 +34,23 @@ class OrderCacheController {
 	 */
 	private $orders_cache_usage_backup = null;
 
-	/**
-	 * Creates a new instance of the class.
-	 */
-	public function __construct() {
-		self::add_action( FeaturesController::FEATURE_ENABLED_CHANGED_ACTION, array( $this, 'handle_feature_enable_changed' ), 10, 2 );
-	}
-
 	/**
 	 * Class initialization, invoked by the DI container.
 	 *
 	 * @internal
-	 * @param OrderCache         $order_cache The order cache engine to use.
-	 * @param FeaturesController $features_controller The features controller to use.
+	 * @param OrderCache $order_cache The order cache engine to use.
 	 */
-	final public function init( OrderCache $order_cache, FeaturesController $features_controller ) {
+	final public function init( OrderCache $order_cache ) {
 		$this->order_cache         = $order_cache;
-		$this->features_controller = $features_controller;
-	}
-
-	/**
-	 * Handler for the feature enable changed action, when the orders cache is enabled or disabled it flushes it.
-	 *
-	 * @param string $feature_id The id of the feature whose enable status changed.
-	 * @param bool   $enabled Whether the feature has been enabled or disabled.
-	 * @return void
-	 */
-	private function handle_feature_enable_changed( string $feature_id, bool $enabled ): void {
-		if ( self::FEATURE_NAME === $feature_id ) {
-			$this->order_cache->flush();
-		}
-	}
-
-	/**
-	 * Set the value of the order cache usage setting.
-	 *
-	 * @param bool $enable True if the order cache should be used, false if not.
-	 * @throws \Exception Attempt to enable the orders cache usage while it's temporarily disabled.
-	 */
-	public function set_orders_cache_usage( bool $enable ): void {
-		$this->features_controller->change_feature_enable( $enable );
-		$this->orders_cache_usage_backup = null;
 	}
 
 	/**
-	 * Get the value of the order cache usage setting.
+	 * Whether order cache usage is enabled. Currently, linked to custom orders' table usage.
 	 *
-	 * @return bool True if order cache usage setting is currently enabled, false if not.
+	 * @return bool True if the order cache is enabled.
 	 */
 	public function orders_cache_usage_is_enabled(): bool {
-		return ! $this->orders_cache_usage_is_temporarly_disabled() && $this->features_controller->feature_is_enabled( self::FEATURE_NAME );
+		return OrderUtil::custom_orders_table_usage_is_enabled();
 	}
 
 	/**
diff --git a/plugins/woocommerce/src/Internal/Features/FeaturesController.php b/plugins/woocommerce/src/Internal/Features/FeaturesController.php
index c5096334c5d4..9a10192ad11f 100644
--- a/plugins/woocommerce/src/Internal/Features/FeaturesController.php
+++ b/plugins/woocommerce/src/Internal/Features/FeaturesController.php
@@ -111,11 +111,6 @@ public function __construct() {
 				'description'     => __( 'Enable the high performance order storage feature.', 'woocommerce' ),
 				'is_experimental' => true,
 			),
-			OrderCacheController::FEATURE_NAME => array(
-				'name'            => __( 'Orders cache', 'woocommerce' ),
-				'description'     => __( 'Enable the usage of a cache for shop orders', 'woocommerce' ),
-				'is_experimental' => true,
-			),
 		);
 
 		$this->legacy_feature_ids = array( 'analytics', 'new_navigation', 'new_product_management' );

From 93bc959957daccb8efca1c11d0131208b8fbf058 Mon Sep 17 00:00:00 2001
From: Vedanshu Jain <vedanshu.jain.2012@gmail.com>
Date: Tue, 24 Jan 2023 14:53:47 +0530
Subject: [PATCH 06/22] Apply renaming of WPCacheEngine class.

---
 .../ServiceProviders/ObjectCacheServiceProvider.php         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/woocommerce/src/Internal/DependencyManagement/ServiceProviders/ObjectCacheServiceProvider.php b/plugins/woocommerce/src/Internal/DependencyManagement/ServiceProviders/ObjectCacheServiceProvider.php
index 9e06d1ad057d..28a0165cee57 100644
--- a/plugins/woocommerce/src/Internal/DependencyManagement/ServiceProviders/ObjectCacheServiceProvider.php
+++ b/plugins/woocommerce/src/Internal/DependencyManagement/ServiceProviders/ObjectCacheServiceProvider.php
@@ -2,7 +2,7 @@
 
 namespace Automattic\WooCommerce\Internal\DependencyManagement\ServiceProviders;
 
-use Automattic\WooCommerce\Caching\WpCacheEngine;
+use Automattic\WooCommerce\Caching\WPCacheEngine;
 use Automattic\WooCommerce\Internal\DependencyManagement\AbstractServiceProvider;
 
 /**
@@ -16,13 +16,13 @@ class ObjectCacheServiceProvider extends AbstractServiceProvider {
 	 * @var array
 	 */
 	protected $provides = array(
-		WpCacheEngine::class,
+		WPCacheEngine::class,
 	);
 
 	/**
 	 * Register the classes.
 	 */
 	public function register() {
-		$this->share( WpCacheEngine::class );
+		$this->share( WPCacheEngine::class );
 	}
 }

From 7619c335ffbd31418010cc5380781a05591c3ba4 Mon Sep 17 00:00:00 2001
From: Vedanshu Jain <vedanshu.jain.2012@gmail.com>
Date: Wed, 25 Jan 2023 12:29:55 +0530
Subject: [PATCH 07/22] Fix unit tests for object cache to accomodate recent
 changes.

---
 .../src/Caching/CacheNameSpaceTrait.php       |   2 +-
 .../woocommerce/src/Caching/ObjectCache.php   |   1 -
 .../woocommerce/src/Caching/WPCacheEngine.php |   2 +-
 .../php/src/Caching/CacheExceptionTest.php    |  16 +-
 .../src/Caching/InMemoryObjectCacheEngine.php |  63 ---
 .../src/Caching/InvalidObjectCacheClass.php   |  21 +
 .../tests/php/src/Caching/ObjectCacheTest.php | 390 +++++-------------
 7 files changed, 142 insertions(+), 353 deletions(-)
 delete mode 100644 plugins/woocommerce/tests/php/src/Caching/InMemoryObjectCacheEngine.php

diff --git a/plugins/woocommerce/src/Caching/CacheNameSpaceTrait.php b/plugins/woocommerce/src/Caching/CacheNameSpaceTrait.php
index bf61e19a129c..7c4f4cbb8c2e 100644
--- a/plugins/woocommerce/src/Caching/CacheNameSpaceTrait.php
+++ b/plugins/woocommerce/src/Caching/CacheNameSpaceTrait.php
@@ -49,7 +49,7 @@ public static function incr_cache_prefix( $group ) {
 	 * @since 3.9.0
 	 */
 	public static function invalidate_cache_group( $group ) {
-		wp_cache_set( 'wc_' . $group . '_cache_prefix', microtime(), $group );
+		return wp_cache_set( 'wc_' . $group . '_cache_prefix', microtime(), $group );
 	}
 
 	/**
diff --git a/plugins/woocommerce/src/Caching/ObjectCache.php b/plugins/woocommerce/src/Caching/ObjectCache.php
index 23bc6728c716..e116997c38a0 100644
--- a/plugins/woocommerce/src/Caching/ObjectCache.php
+++ b/plugins/woocommerce/src/Caching/ObjectCache.php
@@ -244,7 +244,6 @@ public function get( $id, int $expiration = self::DEFAULT_EXPIRATION, callable $
 			if ( null === $object ) {
 				return null;
 			}
-
 			$this->set( $object, $id, $expiration );
 			$data = $this->last_cached_data;
 		}
diff --git a/plugins/woocommerce/src/Caching/WPCacheEngine.php b/plugins/woocommerce/src/Caching/WPCacheEngine.php
index f3f2b7716cf1..c59448dded9e 100644
--- a/plugins/woocommerce/src/Caching/WPCacheEngine.php
+++ b/plugins/woocommerce/src/Caching/WPCacheEngine.php
@@ -63,6 +63,6 @@ public function is_cached( string $key, string $group = '' ): bool {
 	 * @return bool True if the group is deleted successfully, false otherwise.
 	 */
 	public function delete_cache_group( string $group = '' ): bool {
-		self::invalidate_cache_group( $group );
+		return self::invalidate_cache_group( $group );
 	}
 }
diff --git a/plugins/woocommerce/tests/php/src/Caching/CacheExceptionTest.php b/plugins/woocommerce/tests/php/src/Caching/CacheExceptionTest.php
index 936d596e30df..3a6b3910078f 100644
--- a/plugins/woocommerce/tests/php/src/Caching/CacheExceptionTest.php
+++ b/plugins/woocommerce/tests/php/src/Caching/CacheExceptionTest.php
@@ -26,7 +26,21 @@ public function setUp(): void {
 			public function get_object_type(): string {
 				return 'the_type';
 			}
-		};
+
+			protected function get_object_id( $object ) {
+			}
+
+			protected function validate( $object ): ?array {
+			}
+
+			/**
+			 * @param $id
+			 *
+			 * @return mixed
+			 */
+			protected function get_from_datastore( $id ) {
+				// TODO: Implement get_from_datastore() method.
+}};
 		// phpcs:enable Squiz.Commenting
 	}
 
diff --git a/plugins/woocommerce/tests/php/src/Caching/InMemoryObjectCacheEngine.php b/plugins/woocommerce/tests/php/src/Caching/InMemoryObjectCacheEngine.php
deleted file mode 100644
index 51d3ce2de0de..000000000000
--- a/plugins/woocommerce/tests/php/src/Caching/InMemoryObjectCacheEngine.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-namespace Automattic\WooCommerce\Tests\Caching;
-
-use Automattic\WooCommerce\Caching\CacheEngine;
-use Automattic\WooCommerce\Utilities\ArrayUtil;
-
-/**
- * An implementation of CacheEngine that simply stores cached objects in an array.
- */
-class InMemoryObjectCacheEngine implements CacheEngine {
-
-	/**
-	 * The cached objects.
-	 *
-	 * @var array
-	 */
-	public $cache = array();
-
-	/**
-	 * Whether calls to 'cache_object' will succeed or not.
-	 *
-	 * @var bool
-	 */
-	public $caching_succeeds = true;
-
-	/**
-	 * Value of the expiration time that was passed to 'cache_object' the last time it was called.
-	 *
-	 * @var int
-	 */
-	public $last_expiration;
-
-	// phpcs:disable Squiz.Commenting
-
-	public function get_cached_object( string $key ) {
-		return ArrayUtil::get_value_or_default( $this->cache, $key, null );
-	}
-
-	public function cache_object( string $key, $object, int $expiration ): bool {
-		if ( ! $this->caching_succeeds ) {
-			return false;
-		}
-		$this->cache[ $key ]   = $object;
-		$this->last_expiration = $expiration;
-		return true;
-	}
-
-	public function delete_cached_object( string $key ): bool {
-		if ( array_key_exists( $key, $this->cache ) ) {
-			unset( $this->cache[ $key ] );
-			return true;
-		}
-
-		return false;
-	}
-
-	public function is_cached( $key ): bool {
-		return array_key_exists( $key, $this->cache );
-	}
-
-	// phpcs:enable Squiz.Commenting
-}
diff --git a/plugins/woocommerce/tests/php/src/Caching/InvalidObjectCacheClass.php b/plugins/woocommerce/tests/php/src/Caching/InvalidObjectCacheClass.php
index 42f0ba1620b7..7cd3f4138388 100644
--- a/plugins/woocommerce/tests/php/src/Caching/InvalidObjectCacheClass.php
+++ b/plugins/woocommerce/tests/php/src/Caching/InvalidObjectCacheClass.php
@@ -17,4 +17,25 @@ public function get_object_type(): string {
 	}
 
 	// phpcs:enable Squiz.Commenting
+
+	/**
+	 * @inheritDoc
+	 */
+	protected function get_object_id( $object ) {
+		// TODO: Implement get_object_id() method.
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	protected function validate( $object ): ?array {
+		// TODO: Implement validate() method.
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	protected function get_from_datastore( $id ) {
+		// TODO: Implement get_from_datastore() method.
+	}
 }
diff --git a/plugins/woocommerce/tests/php/src/Caching/ObjectCacheTest.php b/plugins/woocommerce/tests/php/src/Caching/ObjectCacheTest.php
index 279791857138..c01ed5f57210 100644
--- a/plugins/woocommerce/tests/php/src/Caching/ObjectCacheTest.php
+++ b/plugins/woocommerce/tests/php/src/Caching/ObjectCacheTest.php
@@ -5,7 +5,7 @@
 use Automattic\WooCommerce\Caching\CacheException;
 use Automattic\WooCommerce\Caching\ObjectCache;
 use Automattic\WooCommerce\Caching\CacheEngine;
-use Automattic\WooCommerce\Caching\WpCacheEngine;
+use Automattic\WooCommerce\Caching\WPCacheEngine;
 
 /**
  * Tests for the ObjectCache class.
@@ -19,23 +19,10 @@ class ObjectCacheTest extends \WC_Unit_Test_Case {
 	 */
 	private $sut;
 
-	/**
-	 * The cache engine to use.
-	 *
-	 * @var CacheEngine
-	 */
-	private $cache_engine;
-
 	/**
 	 * Runs before each test.
 	 */
 	public function setUp(): void {
-		$cache_engine       = new InMemoryObjectCacheEngine();
-		$this->cache_engine = $cache_engine;
-
-		$container = wc_get_container();
-		$container->replace( WpCacheEngine::class, $cache_engine );
-		$this->reset_container_resolutions();
 
 		// phpcs:disable Squiz.Commenting
 
@@ -50,9 +37,22 @@ protected function get_random_string(): string {
 				$this->random_string_index++;
 				return 'random_' . $this->random_string_index;
 			}
-		};
 
+			protected function get_object_id( $object ) {
+				return null;
+			}
+
+			protected function validate( $object ): ?array {
+				return null;
+			}
+
+			protected function get_from_datastore( $id ) {
+				return null;
+			}
+		};
 		// phpcs:enable Squiz.Commenting
+
+		$this->sut->flush();
 	}
 
 	/**
@@ -152,12 +152,10 @@ public function test_set_new_object_with_id_caches_with_expected_key() {
 
 		$this->assertTrue( $result );
 
-		$expected_prefix = 'woocommerce_object_cache|the_type|random_1|';
-		$this->assertEquals( $expected_prefix, get_option( 'wp_object_cache_key_prefix_the_type' ) );
+		$expected_prefix = \WC_Cache_Helper::get_cache_prefix( 'the_type' );
 
 		$key             = $expected_prefix . 'the_id';
-		$expected_cached = array( 'data' => $object );
-		$this->assertEquals( $expected_cached, $this->cache_engine->cache[ $key ] );
+		$this->assertEquals( $object, wp_cache_get( $key, 'the_type' ) );
 	}
 
 	/**
@@ -169,30 +167,12 @@ public function test_setting_two_objects_result_in_same_prefix() {
 		$object_2 = array( 1, 2, 3, 4 );
 		$this->sut->set( $object_2, 9999 );
 
-		$prefix = 'woocommerce_object_cache|the_type|random_1|';
+		$prefix = \WC_Cache_Helper::get_cache_prefix( 'the_type' );
 
 		$key_1           = $prefix . 'the_id_1';
-		$expected_cached = array( 'data' => $object_1 );
-		$this->assertEquals( $expected_cached, $this->cache_engine->cache[ $key_1 ] );
+		$this->assertEquals( $object_1, wp_cache_get( $key_1, 'the_type' ) );
 		$key_2           = $prefix . '9999';
-		$expected_cached = array( 'data' => $object_2 );
-		$this->assertEquals( $expected_cached, $this->cache_engine->cache[ $key_2 ] );
-	}
-
-	/**
-	 * @testdox 'set' uses the default expiration value if no explicit value is passed.
-	 */
-	public function test_set_with_default_expiration() {
-		$this->sut->set( array( 'foo' ), 'the_id' );
-		$this->assertEquals( $this->sut->get_default_expiration_value(), $this->cache_engine->last_expiration );
-	}
-
-	/**
-	 * @testdox 'set' uses the explicitly passed expiration value.
-	 */
-	public function test_set_with_explicit_expiration() {
-		$this->sut->set( array( 'foo' ), 'the_id', 1234 );
-		$this->assertEquals( 1234, $this->cache_engine->last_expiration );
+		$this->assertEquals( $object_2, wp_cache_get( $key_2, 'the_type' ) );
 	}
 
 	/**
@@ -223,24 +203,28 @@ protected function get_object_id( $object ) {
 			protected function get_random_string(): string {
 				return 'random';
 			}
+
+			protected function validate( $object ): ?array {
+				return null;
+			}
+
+			protected function get_from_datastore( $id ) {
+				return null;
+			}
 		};
 
 		// phpcs:enable Squiz.Commenting
 
 		$sut->set( array( 'id' => 1234 ) );
 
-		$this->assertEquals( 'woocommerce_object_cache|the_type|random|1235', array_keys( $this->cache_engine->cache )[0] );
+		$this->assertEquals( array( 'id' => 1234 ), $sut->get( '1235' ) );
 	}
 
 	/**
 	 * @testdox 'update_if_cached' does nothing if no object is cached with the passed (or obtained) id.
-	 *
-	 * @testWith [1234]
-	 *           [null]
-	 *
-	 * @param ?int $id Id to pass to update_if_cached.
 	 */
-	public function test_update_if_cached_does_nothing_for_not_cached_id( ?int $id ) {
+	public function test_update_if_cached_does_nothing_for_not_cached_id() {
+		$id = 1234;
 		// phpcs:disable Squiz.Commenting
 
 		$sut = new class() extends ObjectCache {
@@ -251,24 +235,30 @@ public function get_object_type(): string {
 			protected function get_object_id( $object ) {
 				return $object['id'];
 			}
+
+			protected function validate( $object ): ?array {
+				return null;
+			}
+
+			protected function get_from_datastore( $id ) {
+				return null;
+			}
 		};
 
 		// phpcs:enable Squiz.Commenting
 
 		$result = $sut->update_if_cached( array( 'id' => 1234 ), $id );
 		$this->assertFalse( $result );
-		$this->assertEmpty( $this->cache_engine->cache );
+		$this->assertEmpty( $sut->get( $id ) );
 	}
 
 	/**
 	 * @testdox 'update_if_cached' updates an already cached object the same way as 'set'.
 	 *
-	 * @testWith [1234]
-	 *           [null]
-	 *
 	 * @param ?int $id Id to pass to update_if_cached.
 	 */
-	public function test_update_if_cached_updates_already_cached_object( ?int $id ) {
+	public function test_update_if_cached_updates_already_cached_object() {
+		$id = 1234;
 		// phpcs:disable Squiz.Commenting
 
 		$sut = new class() extends ObjectCache {
@@ -283,12 +273,20 @@ protected function get_object_id( $object ) {
 			protected function get_random_string(): string {
 				return 'random';
 			}
+
+			protected function validate( $object ): ?array {
+				return null;
+			}
+
+			protected function get_from_datastore( $id ) {
+				return null;
+			}
 		};
 
 		// phpcs:enable Squiz.Commenting
 
 		$sut->set( array( 'id' => 1234 ), $id );
-		$this->assertEquals( 'woocommerce_object_cache|the_type|random|1234', array_keys( $this->cache_engine->cache )[0] );
+		$this->assertEquals( array( 'id' => 1234 ), $sut->get( $id ) );
 
 		$new_value = array(
 			'id'  => 1234,
@@ -296,7 +294,7 @@ protected function get_random_string(): string {
 		);
 		$result    = $sut->update_if_cached( $new_value, $id );
 		$this->assertTrue( $result );
-		$this->assertEquals( $this->cache_engine->cache['woocommerce_object_cache|the_type|random|1234'], array( 'data' => $new_value ) );
+		$this->assertEquals( $new_value, $sut->get( $id ) );
 	}
 
 	/**
@@ -309,33 +307,6 @@ public function test_update_if_cached_null_id_without_id_retrieval_implementatio
 		$this->sut->update_if_cached( array( 'foo' ) );
 	}
 
-	/**
-	 * @testdox 'set' caches the value returned by 'serialize'.
-	 */
-	public function test_set_with_custom_serialization() {
-		$object = array( 'foo' );
-
-		// phpcs:disable Squiz.Commenting
-
-		$sut = new class() extends ObjectCache {
-			public function get_object_type(): string {
-				return 'the_type';
-			}
-
-			protected function serialize( $object ): array {
-				return array( 'the_data' => $object );
-			}
-		};
-
-		// phpcs:enable Squiz.Commenting
-
-		$sut->set( $object, 1234 );
-
-		$cached   = array_values( $this->cache_engine->cache )[0];
-		$expected = array( 'the_data' => $object );
-		$this->assertEquals( $expected, $cached );
-	}
-
 	/**
 	 * @testdox 'set' throws an exception if 'validate' returns errors.
 	 *
@@ -365,6 +336,14 @@ public function __construct( $errors ) {
 			protected function validate( $object ): array {
 				return $this->errors;
 			}
+
+			protected function get_from_datastore( $id ) {
+				return null;
+			}
+
+			protected function get_object_id( $object ) {
+				return $object['id'];
+			}
 		};
 
 		// phpcs:enable Squiz.Commenting
@@ -446,26 +425,7 @@ public function test_try_getting_not_cached_object_with_callback() {
 
 		$expected = array( 'id' => 'the_id' );
 		$this->assertEquals( $expected, $result );
-		$this->assertEquals( array( 'data' => $expected ), array_values( $this->cache_engine->cache )[0] );
-		$this->assertEquals( $this->sut->get_default_expiration_value(), $this->cache_engine->last_expiration );
-	}
-
-	/**
-	 * @testdox 'get' uses the passed object retrieval callback if there's no object cached under the passed id, and caches the object retrieved using the passed expiration value.
-	 */
-	public function test_try_getting_not_cached_object_with_callback_and_explicit_expiration() {
-		$expiration = 1234;
-
-		$callback = function( $id ) {
-			return array( 'id' => $id );
-		};
-
-		$result = $this->sut->get( 'the_id', $expiration, $callback );
-
-		$expected = array( 'id' => 'the_id' );
-		$this->assertEquals( $expected, $result );
-		$this->assertEquals( array( 'data' => $expected ), array_values( $this->cache_engine->cache )[0] );
-		$this->assertEquals( $expiration, $this->cache_engine->last_expiration );
+		$this->assertEquals( $expected, $this->sut->get( 'the_id' ) );
 	}
 
 	/**
@@ -482,71 +442,22 @@ public function get_object_type(): string {
 			protected function get_from_datastore( $id ) {
 				return array( 'id' => $id );
 			}
-		};
-
-		// phpcs:enable Squiz.Commenting
 
-		$result = $sut->get( 'the_id' );
-
-		$expected = array( 'id' => 'the_id' );
-		$this->assertEquals( $expected, $result );
-		$this->assertEquals( array( 'data' => $expected ), array_values( $this->cache_engine->cache )[0] );
-		$this->assertEquals( $this->sut->get_default_expiration_value(), $this->cache_engine->last_expiration );
-	}
-
-	/**
-	 * @testdox 'get' uses the 'get_from_datastore' method if there's no object cached under the passed id, and caches the object retrieved using the passed expiration value.
-	 */
-	public function test_try_getting_not_cached_object_get_from_datastore_implemented_and_explicit_expiration() {
-		$expiration = 1234;
-
-		// phpcs:disable Squiz.Commenting
-
-		$sut = new class() extends ObjectCache {
-			public function get_object_type(): string {
-				return 'the_type';
+			protected function get_object_id( $object ) {
 			}
 
-			protected function get_from_datastore( $id ) {
-				return array( 'id' => $id );
+			protected function validate( $object ) : ?array {
+				return null;
 			}
 		};
 
 		// phpcs:enable Squiz.Commenting
 
-		$result = $sut->get( 'the_id', $expiration );
+		$result = $sut->get( 'the_id' );
 
 		$expected = array( 'id' => 'the_id' );
 		$this->assertEquals( $expected, $result );
-		$this->assertEquals( array( 'data' => $expected ), array_values( $this->cache_engine->cache )[0] );
-		$this->assertEquals( $expiration, $this->cache_engine->last_expiration );
-	}
-
-	/**
-	 * @testdox 'get' applies 'deserialize' to the object returned by the cache engine before returning it.
-	 */
-	public function test_custom_deserialization() {
-		// phpcs:disable Squiz.Commenting
-
-		$sut = new class() extends ObjectCache {
-			public function get_object_type(): string {
-				return 'the_type';
-			}
-
-			protected function deserialize( array $serialized ) {
-				$object   = $serialized['data'];
-				$object[] = 3;
-				return $object;
-			}
-		};
-
-		// phpcs:enable Squiz.Commenting
-
-		$sut->set( array( 1, 2 ), 'the_id' );
-
-		$result   = $sut->get( 'the_id' );
-		$expected = array( 1, 2, 3 );
-		$this->assertEquals( $expected, $result );
+		$this->assertEquals( $expected, $sut->get( 'the_id' ) );
 	}
 
 	/**
@@ -572,13 +483,15 @@ public function test_remove() {
 	public function test_flush() {
 		$this->sut->set( array( 'foo' ), 'the_id' );
 
+		$current_prefix_key = \WC_Cache_Helper::get_cache_prefix( 'the_type' );
 		$this->sut->flush();
-		$this->assertFalse( get_option( 'wp_object_cache_key_prefix_the_type' ) );
+		$this->assertFalse( $this->sut->is_cached( 'the_id' ) );
+		$expected_new_prefix = \WC_Cache_Helper::get_cache_prefix( 'the_type' );
+		$this->assertNotEquals( $current_prefix_key, $expected_new_prefix );
 
 		$this->sut->set( array( 'bar' ), 'the_id_2' );
 
-		$expected_new_prefix = 'woocommerce_object_cache|the_type|random_2|';
-		$this->assertEquals( $expected_new_prefix, get_option( 'wp_object_cache_key_prefix_the_type' ) );
+		$this->assertEquals( $expected_new_prefix, \WC_Cache_Helper::get_cache_prefix( 'the_type' ) );
 		$this->assertFalse( $this->sut->is_cached( 'the_id' ) );
 		$this->assertTrue( $this->sut->is_cached( 'the_id_2' ) );
 	}
@@ -587,7 +500,7 @@ public function test_flush() {
 	 * @testdox A custom cache engine instance can be used by overriding 'get_cache_engine_instance'.
 	 */
 	public function test_custom_cache_engine_via_protected_method() {
-		$engine = new InMemoryObjectCacheEngine();
+		$engine = new WPCacheEngine();
 
 		// phpcs:disable Squiz.Commenting
 
@@ -606,6 +519,16 @@ public function __construct( $engine ) {
 			protected function get_cache_engine_instance(): CacheEngine {
 				return $this->engine;
 			}
+
+			protected function get_object_id( $object ) {
+			}
+
+			protected function validate( $object ): ?array {
+				return null;
+			}
+
+			protected function get_from_datastore( $id ) {
+			}
 		};
 
 		// phpcs:enable Squiz.Commenting
@@ -613,18 +536,33 @@ protected function get_cache_engine_instance(): CacheEngine {
 		$object = array( 'foo' );
 		$sut->set( $object, 'the_id' );
 
-		$expected_cached = array( 'data' => $object );
-		$this->assertEquals( $expected_cached, array_values( $engine->cache )[0] );
+		$this->assertEquals( $object, $sut->get( 'the_id' ) );
 	}
 
 	/**
 	 * @testdox A custom cache engine instance can be used via 'wc_object_cache_get_engine' filter.
 	 */
 	public function test_custom_cache_engine_via_hook() {
-		$engine                  = new InMemoryObjectCacheEngine();
+		$engine                  = new class extends WPCacheEngine {};
 		$engine_passed_to_filter = null;
 		$cache_passed_to_filter  = null;
 
+		$sut = new class() extends ObjectCache {
+			public function get_object_type(): string {
+				return 'the_type';
+			}
+
+			protected function get_object_id( $object ) {
+			}
+
+			protected function validate( $object ): ?array {
+				return null;
+			}
+
+			protected function get_from_datastore( $id ) {
+			}
+		};
+
 		add_filter(
 			'wc_object_cache_get_engine',
 			function( $old_engine, $cache ) use ( $engine, &$engine_passed_to_filter, &$cache_passed_to_filter ) {
@@ -637,131 +575,11 @@ function( $old_engine, $cache ) use ( $engine, &$engine_passed_to_filter, &$cach
 		);
 
 		$object = array( 'foo' );
-		$this->sut->set( $object, 'the_id' );
-
-		$expected_cached = array( 'data' => $object );
-		$this->assertEquals( $expected_cached, array_values( $engine->cache )[0] );
-
-		$this->assertEquals( $engine_passed_to_filter, wc_get_container()->get( WpCacheEngine::class ) );
-		$this->assertEquals( $cache_passed_to_filter, $this->sut );
-	}
-
-	/**
-	 * @testdox 'woocommerce_after_serializing_{type}_for_caching' allows to modify the serialized object before being cached.
-	 */
-	public function test_modifying_serialized_object_via_filter() {
-		$object_passed_to_filter = null;
-		$id_passed_to_filter     = null;
-
-		add_filter(
-			'woocommerce_after_serializing_the_type_for_caching',
-			function( $data, $object, $id ) use ( &$object_passed_to_filter, &$id_passed_to_filter ) {
-				$object_passed_to_filter = $object;
-				$id_passed_to_filter     = $id;
-
-				$data['foo'] = 'bar';
-				return $data;
-			},
-			10,
-			3
-		);
-
-		$object = array( 'fizz' );
-		$this->sut->set( $object, 'the_id' );
-
-		$expected_cached = array(
-			'data' => $object,
-			'foo'  => 'bar',
-		);
-		$this->assertEquals( $expected_cached, array_values( $this->cache_engine->cache )[0] );
-
-		$this->assertEquals( $object, $object_passed_to_filter );
-		$this->assertEquals( 'the_id', $id_passed_to_filter );
-	}
-
-	/**
-	 * @testdox 'woocommerce_after_deserializing_{type}_from_cache' allows to modify the deserialized object before it's returned by 'get'.
-	 */
-	public function test_modifying_deserialized_object_via_filter() {
-		$object_passed_to_filter = null;
-		$id_passed_to_filter     = null;
-		$data_passed_to_filter   = null;
-
-		$original_object    = array( 'foo' );
-		$replacement_object = array( 'bar' );
-
-		add_filter(
-			'woocommerce_after_deserializing_the_type_from_cache',
-			function( $object, $data, $id ) use ( &$object_passed_to_filter, &$id_passed_to_filter, &$data_passed_to_filter, $replacement_object ) {
-				$object_passed_to_filter = $object;
-				$id_passed_to_filter     = $id;
-				$data_passed_to_filter   = $data;
-
-				return $replacement_object;
-			},
-			10,
-			3
-		);
-
-		$this->sut->set( $original_object, 'the_id' );
-		$retrieved_object = $this->sut->get( 'the_id' );
-
-		$this->assertEquals( $replacement_object, $retrieved_object );
-
-		$this->assertEquals( $original_object, $object_passed_to_filter );
-		$this->assertEquals( array( 'data' => $original_object ), $data_passed_to_filter );
-		$this->assertEquals( 'the_id', $id_passed_to_filter );
-	}
-
-	/**
-	 * @testdox 'remove' triggers the 'woocommerce_after_removing_{type}_from_cache' action.
-	 *
-	 * @testWith [true]
-	 *           [false]
-	 *
-	 * @param bool $operation_succeeds Whether the removal operation succeeds or not.
-	 */
-	public function test_action_triggered_on_object_removed_from_cache( bool $operation_succeeds ) {
-		$id_passed_to_action     = null;
-		$result_passed_to_action = null;
-
-		add_action(
-			'woocommerce_after_removing_the_type_from_cache',
-			function( $id, $result ) use ( &$id_passed_to_action, &$result_passed_to_action ) {
-				$id_passed_to_action     = $id;
-				$result_passed_to_action = $result;
-			},
-			10,
-			2
-		);
-
-		$this->sut->set( array( 'foo' ), 'the_id' );
-		$this->sut->remove( $operation_succeeds ? 'the_id' : 'INVALID_ID' );
-
-		$this->assertEquals( $operation_succeeds ? 'the_id' : 'INVALID_ID', $id_passed_to_action );
-		$this->assertEquals( $operation_succeeds, $result_passed_to_action );
-	}
-
-	/**
-	 * @testdox 'flush' triggers the 'woocommerce_after_flushing_{type}_cache' action.
-	 */
-	public function test_action_triggered_on_cache_flushed() {
-		$cache_passed_to_action  = null;
-		$engine_passed_to_action = null;
-
-		add_action(
-			'woocommerce_after_flushing_the_type_cache',
-			function( $cache, $engine ) use ( &$cache_passed_to_action, &$engine_passed_to_action ) {
-				$cache_passed_to_action  = $cache;
-				$engine_passed_to_action = $engine;
-			},
-			10,
-			2
-		);
+		$sut->set( $object, 'the_id' );
 
-		$this->sut->flush();
+		$this->assertEquals( $object, $sut->get( 'the_id' ) );
 
-		$this->assertEquals( $this->sut, $cache_passed_to_action );
-		$this->assertEquals( $this->cache_engine, $engine_passed_to_action );
+		$this->assertEquals( $engine_passed_to_filter, wc_get_container()->get( WPCacheEngine::class ) );
+		$this->assertEquals( $cache_passed_to_filter, $sut );
 	}
 }

From 8fadc81cf70b16e477236a044f702ecd618176e7 Mon Sep 17 00:00:00 2001
From: Vedanshu Jain <vedanshu.jain.2012@gmail.com>
Date: Wed, 25 Jan 2023 12:43:14 +0530
Subject: [PATCH 08/22] Applied coding standards.

---
 .../src/Caches/OrderCacheController.php        |  2 +-
 .../woocommerce/src/Caching/CacheEngine.php    |  8 ++++++++
 .../woocommerce/src/Caching/ObjectCache.php    |  2 +-
 .../woocommerce/src/Caching/WPCacheEngine.php  | 14 +++++++++++---
 .../Orders/CustomOrdersTableController.php     | 15 ++++-----------
 .../OrdersDataStoreServiceProvider.php         | 11 ++++++++++-
 .../php/src/Caching/CacheExceptionTest.php     |  9 ++-------
 .../src/Caching/InvalidObjectCacheClass.php    | 17 ++---------------
 .../tests/php/src/Caching/ObjectCacheTest.php  | 18 ++++++++----------
 9 files changed, 47 insertions(+), 49 deletions(-)

diff --git a/plugins/woocommerce/src/Caches/OrderCacheController.php b/plugins/woocommerce/src/Caches/OrderCacheController.php
index 3c513abb8f20..2a971cf8f202 100644
--- a/plugins/woocommerce/src/Caches/OrderCacheController.php
+++ b/plugins/woocommerce/src/Caches/OrderCacheController.php
@@ -41,7 +41,7 @@ class OrderCacheController {
 	 * @param OrderCache $order_cache The order cache engine to use.
 	 */
 	final public function init( OrderCache $order_cache ) {
-		$this->order_cache         = $order_cache;
+		$this->order_cache = $order_cache;
 	}
 
 	/**
diff --git a/plugins/woocommerce/src/Caching/CacheEngine.php b/plugins/woocommerce/src/Caching/CacheEngine.php
index dc276fd09f0e..90023bb73a30 100644
--- a/plugins/woocommerce/src/Caching/CacheEngine.php
+++ b/plugins/woocommerce/src/Caching/CacheEngine.php
@@ -12,6 +12,8 @@ interface CacheEngine {
 	 * Retrieves an object cached under a given key.
 	 *
 	 * @param string $key They key under which the object to retrieve is cached.
+	 * @param string $group The group under which the object is cached.
+	 *
 	 * @return array|object|null The cached object, or null if there's no object cached under the passed key.
 	 */
 	public function get_cached_object( string $key, string $group = '' );
@@ -22,6 +24,8 @@ public function get_cached_object( string $key, string $group = '' );
 	 * @param string       $key The key under which the object will be cached.
 	 * @param array|object $object The object to cache.
 	 * @param int          $expiration Expiration for the cached object, in seconds.
+	 * @param string       $group The group under which the object will be cached.
+	 *
 	 * @return bool True if the object is cached successfully, false otherwise.
 	 */
 	public function cache_object( string $key, $object, int $expiration, string $group = '' ): bool;
@@ -30,6 +34,8 @@ public function cache_object( string $key, $object, int $expiration, string $gro
 	 * Removes a cached object from the cache.
 	 *
 	 * @param string $key They key under which the object is cached.
+	 * @param string $group The group under which the object is cached.
+	 *
 	 * @return bool True if the object is removed from the cache successfully, false otherwise (because the object wasn't cached or for other reason).
 	 */
 	public function delete_cached_object( string $key, string $group = '' ): bool;
@@ -38,6 +44,8 @@ public function delete_cached_object( string $key, string $group = '' ): bool;
 	 * Checks if an object is cached under a given key.
 	 *
 	 * @param string $key The key to verify.
+	 * @param string $group The group under which the object is cached.
+	 *
 	 * @return bool True if there's an object cached under the given key, false otherwise.
 	 */
 	public function is_cached( string $key, string $group = '' ): bool;
diff --git a/plugins/woocommerce/src/Caching/ObjectCache.php b/plugins/woocommerce/src/Caching/ObjectCache.php
index e116997c38a0..8fc5acfbafe2 100644
--- a/plugins/woocommerce/src/Caching/ObjectCache.php
+++ b/plugins/woocommerce/src/Caching/ObjectCache.php
@@ -149,7 +149,7 @@ public function set( $object, $id = null, int $expiration = self::DEFAULT_EXPIRA
 			}
 		}
 
-		$id   = $this->get_id_from_object_if_null( $object, $id );
+		$id = $this->get_id_from_object_if_null( $object, $id );
 
 		$this->last_cached_data = $object;
 		return $this->get_cache_engine()->cache_object(
diff --git a/plugins/woocommerce/src/Caching/WPCacheEngine.php b/plugins/woocommerce/src/Caching/WPCacheEngine.php
index c59448dded9e..7463a1856b3a 100644
--- a/plugins/woocommerce/src/Caching/WPCacheEngine.php
+++ b/plugins/woocommerce/src/Caching/WPCacheEngine.php
@@ -9,10 +9,12 @@ class WPCacheEngine implements CacheEngine {
 	use CacheNameSpaceTrait;
 
 	/**
-	 * Gets an object from the cache.
+	 * Retrieves an object cached under a given key.
 	 *
-	 * @param string $key The key under which the object is cached.
-	 * @return array|object|null The cached object, or null if the object is not cached.
+	 * @param string $key They key under which the object to retrieve is cached.
+	 * @param string $group The group under which the object is cached.
+	 *
+	 * @return array|object|null The cached object, or null if there's no object cached under the passed key.
 	 */
 	public function get_cached_object( string $key, string $group = '' ) {
 		$prefixed_key = self::get_prefixed_key( $key, $group );
@@ -26,6 +28,8 @@ public function get_cached_object( string $key, string $group = '' ) {
 	 * @param string       $key The key under which the object will be cached.
 	 * @param array|object $object The object to cache.
 	 * @param int          $expiration Expiration for the cached object, in seconds.
+	 * @param string       $group The group under which the object will be cached.
+	 *
 	 * @return bool True if the object is cached successfully, false otherwise.
 	 */
 	public function cache_object( string $key, $object, int $expiration, string $group = '' ): bool {
@@ -37,6 +41,8 @@ public function cache_object( string $key, $object, int $expiration, string $gro
 	 * Removes a cached object from the cache.
 	 *
 	 * @param string $key They key under which the object is cached.
+	 * @param string $group The group under which the object is cached.
+	 *
 	 * @return bool True if the object is removed from the cache successfully, false otherwise (because the object wasn't cached or for other reason).
 	 */
 	public function delete_cached_object( string $key, string $group = '' ): bool {
@@ -48,6 +54,8 @@ public function delete_cached_object( string $key, string $group = '' ): bool {
 	 * Checks if an object is cached under a given key.
 	 *
 	 * @param string $key The key to verify.
+	 * @param string $group The group under which the object is cached.
+	 *
 	 * @return bool True if there's an object cached under the given key, false otherwise.
 	 */
 	public function is_cached( string $key, string $group = '' ): bool {
diff --git a/plugins/woocommerce/src/Internal/DataStores/Orders/CustomOrdersTableController.php b/plugins/woocommerce/src/Internal/DataStores/Orders/CustomOrdersTableController.php
index 29e8cea6f1e0..530f7be1a054 100644
--- a/plugins/woocommerce/src/Internal/DataStores/Orders/CustomOrdersTableController.php
+++ b/plugins/woocommerce/src/Internal/DataStores/Orders/CustomOrdersTableController.php
@@ -119,6 +119,7 @@ private function init_hooks() {
 		self::add_filter( DataSynchronizer::PENDING_SYNCHRONIZATION_FINISHED_ACTION, array( $this, 'process_sync_finished' ), 10, 0 );
 		self::add_action( 'woocommerce_update_options_advanced_custom_data_stores', array( $this, 'process_options_updated' ), 10, 0 );
 		self::add_action( 'woocommerce_after_register_post_type', array( $this, 'register_post_type_for_order_placeholders' ), 10, 0 );
+		self::add_action( 'woocommerce_delete_order', array( $this, 'after_order_deleted_or_trashed' ), 10, 1 );
 		self::add_action( FeaturesController::FEATURE_ENABLED_CHANGED_ACTION, array( $this, 'handle_feature_enabled_changed' ), 10, 2 );
 	}
 
@@ -485,7 +486,8 @@ private function process_updated_option( $option, $old_value, $value ) {
 	 * @throws \Exception Attempt to change the authoritative orders table while orders sync is pending.
 	 */
 	private function process_pre_update_option( $value, $option, $old_value ) {
-		if ( self::CUSTOM_ORDERS_TABLE_USAGE_ENABLED_OPTION !== $option || $value === $old_value || false === $old_value ) {
+		if ( DataSynchronizer::ORDERS_DATA_SYNC_ENABLED_OPTION === $option && $value !== $old_value ) {
+			$this->order_cache->flush();
 			return $value;
 		}
 
@@ -605,14 +607,5 @@ private function register_post_type_for_order_placeholders(): void {
 		);
 	}
 
-	/**
-	 * Handle the order deleted/trashed hooks.
-	 *
-	 * @param int $order_id The id of the order deleted or trashed.
-	 */
-	private function after_order_deleted_or_trashed( int $order_id ): void {
-		if ( $this->features_controller->feature_is_enabled( OrderCacheController::FEATURE_NAME ) ) {
-			$this->order_cache->remove( $order_id );
-		}
-	}
+
 }
diff --git a/plugins/woocommerce/src/Internal/DependencyManagement/ServiceProviders/OrdersDataStoreServiceProvider.php b/plugins/woocommerce/src/Internal/DependencyManagement/ServiceProviders/OrdersDataStoreServiceProvider.php
index e1e207fe82b4..2d233ad43f4a 100644
--- a/plugins/woocommerce/src/Internal/DependencyManagement/ServiceProviders/OrdersDataStoreServiceProvider.php
+++ b/plugins/woocommerce/src/Internal/DependencyManagement/ServiceProviders/OrdersDataStoreServiceProvider.php
@@ -50,7 +50,16 @@ public function register() {
 		$this->share( OrdersTableDataStoreMeta::class );
 
 		$this->share( OrdersTableDataStore::class )->addArguments( array( OrdersTableDataStoreMeta::class, DatabaseUtil::class, LegacyProxy::class ) );
-		$this->share( DataSynchronizer::class )->addArguments( array( OrdersTableDataStore::class, DatabaseUtil::class, PostsToOrdersMigrationController::class, LegacyProxy::class ) );
+		$this->share( DataSynchronizer::class )->addArguments(
+			array(
+				OrdersTableDataStore::class,
+				DatabaseUtil::class,
+				PostsToOrdersMigrationController::class,
+				OrderCache::class,
+				OrderCacheController::class,
+				LegacyProxy::class,
+			)
+		);
 		$this->share( OrdersTableRefundDataStore::class )->addArguments( array( OrdersTableDataStoreMeta::class, DatabaseUtil::class, LegacyProxy::class ) );
 		$this->share( CustomOrdersTableController::class )->addArguments(
 			array(
diff --git a/plugins/woocommerce/tests/php/src/Caching/CacheExceptionTest.php b/plugins/woocommerce/tests/php/src/Caching/CacheExceptionTest.php
index 3a6b3910078f..8896b0f97fca 100644
--- a/plugins/woocommerce/tests/php/src/Caching/CacheExceptionTest.php
+++ b/plugins/woocommerce/tests/php/src/Caching/CacheExceptionTest.php
@@ -33,14 +33,9 @@ protected function get_object_id( $object ) {
 			protected function validate( $object ): ?array {
 			}
 
-			/**
-			 * @param $id
-			 *
-			 * @return mixed
-			 */
 			protected function get_from_datastore( $id ) {
-				// TODO: Implement get_from_datastore() method.
-}};
+			}
+		};
 		// phpcs:enable Squiz.Commenting
 	}
 
diff --git a/plugins/woocommerce/tests/php/src/Caching/InvalidObjectCacheClass.php b/plugins/woocommerce/tests/php/src/Caching/InvalidObjectCacheClass.php
index 7cd3f4138388..804fe5d72d87 100644
--- a/plugins/woocommerce/tests/php/src/Caching/InvalidObjectCacheClass.php
+++ b/plugins/woocommerce/tests/php/src/Caching/InvalidObjectCacheClass.php
@@ -11,31 +11,18 @@ class InvalidObjectCacheClass extends ObjectCache {
 
 
 	// phpcs:disable Squiz.Commenting
-
 	public function get_object_type(): string {
 		return '';
 	}
 
-	// phpcs:enable Squiz.Commenting
-
-	/**
-	 * @inheritDoc
-	 */
 	protected function get_object_id( $object ) {
-		// TODO: Implement get_object_id() method.
 	}
 
-	/**
-	 * @inheritDoc
-	 */
 	protected function validate( $object ): ?array {
-		// TODO: Implement validate() method.
 	}
 
-	/**
-	 * @inheritDoc
-	 */
 	protected function get_from_datastore( $id ) {
-		// TODO: Implement get_from_datastore() method.
 	}
+	// phpcs:enable Squiz.Commenting
+
 }
diff --git a/plugins/woocommerce/tests/php/src/Caching/ObjectCacheTest.php b/plugins/woocommerce/tests/php/src/Caching/ObjectCacheTest.php
index c01ed5f57210..2c59cc51220e 100644
--- a/plugins/woocommerce/tests/php/src/Caching/ObjectCacheTest.php
+++ b/plugins/woocommerce/tests/php/src/Caching/ObjectCacheTest.php
@@ -153,8 +153,8 @@ public function test_set_new_object_with_id_caches_with_expected_key() {
 		$this->assertTrue( $result );
 
 		$expected_prefix = \WC_Cache_Helper::get_cache_prefix( 'the_type' );
-
 		$key             = $expected_prefix . 'the_id';
+
 		$this->assertEquals( $object, wp_cache_get( $key, 'the_type' ) );
 	}
 
@@ -169,9 +169,9 @@ public function test_setting_two_objects_result_in_same_prefix() {
 
 		$prefix = \WC_Cache_Helper::get_cache_prefix( 'the_type' );
 
-		$key_1           = $prefix . 'the_id_1';
+		$key_1 = $prefix . 'the_id_1';
 		$this->assertEquals( $object_1, wp_cache_get( $key_1, 'the_type' ) );
-		$key_2           = $prefix . '9999';
+		$key_2 = $prefix . '9999';
 		$this->assertEquals( $object_2, wp_cache_get( $key_2, 'the_type' ) );
 	}
 
@@ -254,8 +254,6 @@ protected function get_from_datastore( $id ) {
 
 	/**
 	 * @testdox 'update_if_cached' updates an already cached object the same way as 'set'.
-	 *
-	 * @param ?int $id Id to pass to update_if_cached.
 	 */
 	public function test_update_if_cached_updates_already_cached_object() {
 		$id = 1234;
@@ -317,7 +315,7 @@ public function test_update_if_cached_null_id_without_id_retrieval_implementatio
 	 */
 	public function test_set_with_custom_serialization_that_returns_errors( int $errors_count ) {
 		$exception = null;
-		$errors    = $errors_count === 1 ? array( 'Foo failed' ) : array( 'Foo failed', 'Bar failed' );
+		$errors    = 1 === $errors_count ? array( 'Foo failed' ) : array( 'Foo failed', 'Bar failed' );
 		$object    = array( 'foo' );
 
 		// phpcs:disable Squiz.Commenting
@@ -355,7 +353,7 @@ protected function get_object_id( $object ) {
 		}
 
 		$expected_message = 'Object validation/serialization failed';
-		if ( $errors_count === 1 ) {
+		if ( 1 === $errors_count ) {
 			$expected_message .= ': Foo failed';
 		}
 		$this->assertEquals( $expected_message, $exception->getMessage() );
@@ -503,7 +501,6 @@ public function test_custom_cache_engine_via_protected_method() {
 		$engine = new WPCacheEngine();
 
 		// phpcs:disable Squiz.Commenting
-
 		$sut = new class($engine) extends ObjectCache {
 			public function get_object_type(): string {
 				return 'the_type';
@@ -530,7 +527,6 @@ protected function validate( $object ): ?array {
 			protected function get_from_datastore( $id ) {
 			}
 		};
-
 		// phpcs:enable Squiz.Commenting
 
 		$object = array( 'foo' );
@@ -543,11 +539,12 @@ protected function get_from_datastore( $id ) {
 	 * @testdox A custom cache engine instance can be used via 'wc_object_cache_get_engine' filter.
 	 */
 	public function test_custom_cache_engine_via_hook() {
-		$engine                  = new class extends WPCacheEngine {};
+		$engine                  = new class() extends WPCacheEngine {};
 		$engine_passed_to_filter = null;
 		$cache_passed_to_filter  = null;
 
 		$sut = new class() extends ObjectCache {
+			// phpcs:disable Squiz.Commenting
 			public function get_object_type(): string {
 				return 'the_type';
 			}
@@ -561,6 +558,7 @@ protected function validate( $object ): ?array {
 
 			protected function get_from_datastore( $id ) {
 			}
+			// phpcs:enable Squiz.Commenting
 		};
 
 		add_filter(

From 79640d9abc0edd336c89793ee68e9e5ec714f8f6 Mon Sep 17 00:00:00 2001
From: Vedanshu Jain <vedanshu.jain.2012@gmail.com>
Date: Wed, 25 Jan 2023 12:58:45 +0530
Subject: [PATCH 09/22] Applied coding standards.

---
 plugins/woocommerce/src/Caching/WPCacheEngine.php               | 2 +-
 .../Internal/DataStores/Orders/CustomOrdersTableController.php  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/woocommerce/src/Caching/WPCacheEngine.php b/plugins/woocommerce/src/Caching/WPCacheEngine.php
index 7463a1856b3a..3bc65c23aa76 100644
--- a/plugins/woocommerce/src/Caching/WPCacheEngine.php
+++ b/plugins/woocommerce/src/Caching/WPCacheEngine.php
@@ -18,7 +18,7 @@ class WPCacheEngine implements CacheEngine {
 	 */
 	public function get_cached_object( string $key, string $group = '' ) {
 		$prefixed_key = self::get_prefixed_key( $key, $group );
-		$value = wp_cache_get( $prefixed_key, $group );
+		$value        = wp_cache_get( $prefixed_key, $group );
 		return false === $value ? null : $value;
 	}
 
diff --git a/plugins/woocommerce/src/Internal/DataStores/Orders/CustomOrdersTableController.php b/plugins/woocommerce/src/Internal/DataStores/Orders/CustomOrdersTableController.php
index 530f7be1a054..1c0bdafdbd02 100644
--- a/plugins/woocommerce/src/Internal/DataStores/Orders/CustomOrdersTableController.php
+++ b/plugins/woocommerce/src/Internal/DataStores/Orders/CustomOrdersTableController.php
@@ -498,7 +498,7 @@ private function process_pre_update_option( $value, $option, $old_value ) {
 		$this->order_cache->flush();
 
 		/**
-		 * TODO: Re-enable the following code once the COT to posts table sync is implemented (it's currently commented out to ease testing).
+		 * Re-enable the following code once the COT to posts table sync is implemented (it's currently commented out to ease testing).
 		$sync_is_pending = 0 !== $this->data_synchronizer->get_current_orders_pending_sync_count();
 		if ( $sync_is_pending ) {
 			throw new \Exception( "The authoritative table for orders storage can't be changed while there are orders out of sync" );

From e75ff70a87976b17831f033f86f3ed0a2890cc2a Mon Sep 17 00:00:00 2001
From: Vedanshu Jain <vedanshu.jain.2012@gmail.com>
Date: Wed, 25 Jan 2023 16:59:27 +0530
Subject: [PATCH 10/22] Merge fixes.

---
 .../Orders/CustomOrdersTableController.php       |  1 -
 .../DataStores/Orders/DataSynchronizer.php       | 16 ++++++++++------
 .../OrdersDataStoreServiceProvider.php           |  5 ++---
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/plugins/woocommerce/src/Internal/DataStores/Orders/CustomOrdersTableController.php b/plugins/woocommerce/src/Internal/DataStores/Orders/CustomOrdersTableController.php
index 1c0bdafdbd02..3e89b1d7a432 100644
--- a/plugins/woocommerce/src/Internal/DataStores/Orders/CustomOrdersTableController.php
+++ b/plugins/woocommerce/src/Internal/DataStores/Orders/CustomOrdersTableController.php
@@ -119,7 +119,6 @@ private function init_hooks() {
 		self::add_filter( DataSynchronizer::PENDING_SYNCHRONIZATION_FINISHED_ACTION, array( $this, 'process_sync_finished' ), 10, 0 );
 		self::add_action( 'woocommerce_update_options_advanced_custom_data_stores', array( $this, 'process_options_updated' ), 10, 0 );
 		self::add_action( 'woocommerce_after_register_post_type', array( $this, 'register_post_type_for_order_placeholders' ), 10, 0 );
-		self::add_action( 'woocommerce_delete_order', array( $this, 'after_order_deleted_or_trashed' ), 10, 1 );
 		self::add_action( FeaturesController::FEATURE_ENABLED_CHANGED_ACTION, array( $this, 'handle_feature_enabled_changed' ), 10, 2 );
 	}
 
diff --git a/plugins/woocommerce/src/Internal/DataStores/Orders/DataSynchronizer.php b/plugins/woocommerce/src/Internal/DataStores/Orders/DataSynchronizer.php
index 5df64183cae6..c2fd374100ad 100644
--- a/plugins/woocommerce/src/Internal/DataStores/Orders/DataSynchronizer.php
+++ b/plugins/woocommerce/src/Internal/DataStores/Orders/DataSynchronizer.php
@@ -84,11 +84,16 @@ public function __construct() {
 	 * @param LegacyProxy                      $legacy_proxy The legacy proxy instance to use.
 	 * @internal
 	 */
-	final public function init( OrdersTableDataStore $data_store, DatabaseUtil $database_util, PostsToOrdersMigrationController $posts_to_cot_migrator, LegacyProxy $legacy_proxy ) {
-		$this->data_store            = $data_store;
-		$this->database_util         = $database_util;
-		$this->posts_to_cot_migrator = $posts_to_cot_migrator;
-		$this->error_logger          = $legacy_proxy->call_function( 'wc_get_logger' );
+	final public function init(
+		OrdersTableDataStore $data_store,
+		DatabaseUtil $database_util,
+		PostsToOrdersMigrationController $posts_to_cot_migrator,
+		LegacyProxy $legacy_proxy
+	) {
+		$this->data_store             = $data_store;
+		$this->database_util          = $database_util;
+		$this->posts_to_cot_migrator  = $posts_to_cot_migrator;
+		$this->error_logger           = $legacy_proxy->call_function( 'wc_get_logger' );
 	}
 
 	/**
@@ -113,7 +118,6 @@ public function create_database_tables() {
 	 * Delete the custom orders database tables.
 	 */
 	public function delete_database_tables() {
-		$this->cache->flush();
 		$table_names = $this->data_store->get_all_table_names();
 
 		foreach ( $table_names as $table_name ) {
diff --git a/plugins/woocommerce/src/Internal/DependencyManagement/ServiceProviders/OrdersDataStoreServiceProvider.php b/plugins/woocommerce/src/Internal/DependencyManagement/ServiceProviders/OrdersDataStoreServiceProvider.php
index 2d233ad43f4a..787ff605eadc 100644
--- a/plugins/woocommerce/src/Internal/DependencyManagement/ServiceProviders/OrdersDataStoreServiceProvider.php
+++ b/plugins/woocommerce/src/Internal/DependencyManagement/ServiceProviders/OrdersDataStoreServiceProvider.php
@@ -55,8 +55,6 @@ public function register() {
 				OrdersTableDataStore::class,
 				DatabaseUtil::class,
 				PostsToOrdersMigrationController::class,
-				OrderCache::class,
-				OrderCacheController::class,
 				LegacyProxy::class,
 			)
 		);
@@ -72,7 +70,8 @@ public function register() {
 				OrderCacheController::class,
 			)
 		);
-
+		$this->share( OrderCache::class );
+		$this->share( OrderCacheController::class )->addArgument( OrderCache::class );
 		if ( Constants::is_defined( 'WP_CLI' ) && WP_CLI ) {
 			$this->share( CLIRunner::class )->addArguments( array( CustomOrdersTableController::class, DataSynchronizer::class, PostsToOrdersMigrationController::class ) );
 		}

From 4db8cc8e261c60386cc7b0bce39c2a381da5d3c9 Mon Sep 17 00:00:00 2001
From: Vedanshu Jain <vedanshu.jain.2012@gmail.com>
Date: Wed, 25 Jan 2023 17:17:00 +0530
Subject: [PATCH 11/22] Coding standard fix.

---
 .../src/Internal/DataStores/Orders/DataSynchronizer.php   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/woocommerce/src/Internal/DataStores/Orders/DataSynchronizer.php b/plugins/woocommerce/src/Internal/DataStores/Orders/DataSynchronizer.php
index c2fd374100ad..8ac740bd207f 100644
--- a/plugins/woocommerce/src/Internal/DataStores/Orders/DataSynchronizer.php
+++ b/plugins/woocommerce/src/Internal/DataStores/Orders/DataSynchronizer.php
@@ -90,10 +90,10 @@ final public function init(
 		PostsToOrdersMigrationController $posts_to_cot_migrator,
 		LegacyProxy $legacy_proxy
 	) {
-		$this->data_store             = $data_store;
-		$this->database_util          = $database_util;
-		$this->posts_to_cot_migrator  = $posts_to_cot_migrator;
-		$this->error_logger           = $legacy_proxy->call_function( 'wc_get_logger' );
+		$this->data_store            = $data_store;
+		$this->database_util         = $database_util;
+		$this->posts_to_cot_migrator = $posts_to_cot_migrator;
+		$this->error_logger          = $legacy_proxy->call_function( 'wc_get_logger' );
 	}
 
 	/**

From 4837b805677eedd5ee50511fed5a5d8167d41e6f Mon Sep 17 00:00:00 2001
From: Vedanshu Jain <vedanshu.jain.2012@gmail.com>
Date: Wed, 25 Jan 2023 18:36:46 +0530
Subject: [PATCH 12/22] Remove infinite loop by unlinking cache and datastore.

---
 plugins/woocommerce/src/Caches/OrderCache.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/woocommerce/src/Caches/OrderCache.php b/plugins/woocommerce/src/Caches/OrderCache.php
index c4f0a7e31f38..e64d55e9ed6d 100644
--- a/plugins/woocommerce/src/Caches/OrderCache.php
+++ b/plugins/woocommerce/src/Caches/OrderCache.php
@@ -51,6 +51,6 @@ protected function validate( $object ): ?array {
 	 * @return array|object|null The retrieved object, or null if it's not possible to retrieve an object by the given id.
 	 */
 	protected function get_from_datastore( $id ) {
-		return wc_get_order( $id );
+		return null;
 	}
 }

From 3ff08d23dace59181b3893698fa58b3fd9468df2 Mon Sep 17 00:00:00 2001
From: Vedanshu Jain <vedanshu.jain.2012@gmail.com>
Date: Wed, 25 Jan 2023 21:11:40 +0530
Subject: [PATCH 13/22] Clear cache after deleting post.

---
 .../src/Internal/DataStores/Orders/OrdersTableDataStore.php    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plugins/woocommerce/src/Internal/DataStores/Orders/OrdersTableDataStore.php b/plugins/woocommerce/src/Internal/DataStores/Orders/OrdersTableDataStore.php
index 0fd369cf83ce..32ee4ed18ee3 100644
--- a/plugins/woocommerce/src/Internal/DataStores/Orders/OrdersTableDataStore.php
+++ b/plugins/woocommerce/src/Internal/DataStores/Orders/OrdersTableDataStore.php
@@ -6,6 +6,7 @@
 namespace Automattic\WooCommerce\Internal\DataStores\Orders;
 
 use Automattic\Jetpack\Constants;
+use Automattic\WooCommerce\Caches\OrderCache;
 use Automattic\WooCommerce\Internal\Utilities\DatabaseUtil;
 use Automattic\WooCommerce\Proxies\LegacyProxy;
 use Automattic\WooCommerce\Utilities\ArrayUtil;
@@ -1974,6 +1975,7 @@ public function untrash_order( WC_Order $order ): bool {
 	 */
 	public function delete_order_data_from_custom_order_tables( $order_id ) {
 		global $wpdb;
+		$order_cache = wc_get_container()->get( OrderCache::class );
 
 		// Delete COT-specific data.
 		foreach ( $this->get_all_table_names() as $table ) {
@@ -1984,6 +1986,7 @@ public function delete_order_data_from_custom_order_tables( $order_id ) {
 					: array( 'order_id' => $order_id ),
 				array( '%d' )
 			);
+			$order_cache->remove( $order_id );
 		}
 	}
 

From 694fb67980b10e21878db2e56f3d8efc6bba355e Mon Sep 17 00:00:00 2001
From: Vedanshu Jain <vedanshu.jain.2012@gmail.com>
Date: Thu, 26 Jan 2023 11:51:28 +0530
Subject: [PATCH 14/22] Temporary disable cache before backfilling.

---
 .../DataStores/Orders/DataSynchronizer.php    | 23 +++++++++++++------
 .../OrdersDataStoreServiceProvider.php        |  1 +
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/plugins/woocommerce/src/Internal/DataStores/Orders/DataSynchronizer.php b/plugins/woocommerce/src/Internal/DataStores/Orders/DataSynchronizer.php
index 8ac740bd207f..8ed2f9946f93 100644
--- a/plugins/woocommerce/src/Internal/DataStores/Orders/DataSynchronizer.php
+++ b/plugins/woocommerce/src/Internal/DataStores/Orders/DataSynchronizer.php
@@ -65,6 +65,13 @@ class DataSynchronizer implements BatchProcessorInterface {
 	 */
 	private $error_logger;
 
+	/**
+	 * The order cache controller.
+	 *
+	 * @var OrderCacheController
+	 */
+	private $order_cache_controller;
+
 	/**
 	 * Class constructor.
 	 */
@@ -88,12 +95,14 @@ final public function init(
 		OrdersTableDataStore $data_store,
 		DatabaseUtil $database_util,
 		PostsToOrdersMigrationController $posts_to_cot_migrator,
-		LegacyProxy $legacy_proxy
+		LegacyProxy $legacy_proxy,
+		OrderCacheController $order_cache_controller
 	) {
-		$this->data_store            = $data_store;
-		$this->database_util         = $database_util;
-		$this->posts_to_cot_migrator = $posts_to_cot_migrator;
-		$this->error_logger          = $legacy_proxy->call_function( 'wc_get_logger' );
+		$this->data_store             = $data_store;
+		$this->database_util          = $database_util;
+		$this->posts_to_cot_migrator  = $posts_to_cot_migrator;
+		$this->error_logger           = $legacy_proxy->call_function( 'wc_get_logger' );
+		$this->order_cache_controller = $order_cache_controller;
 	}
 
 	/**
@@ -336,7 +345,7 @@ public function cleanup_synchronization_state() {
 	 * @param array $batch Batch details.
 	 */
 	public function process_batch( array $batch ) : void {
-		$this->cache_controller->temporarily_disable_orders_cache_usage();
+		$this->order_cache_controller->temporarily_disable_orders_cache_usage();
 
 		if ( $this->custom_orders_table_is_authoritative() ) {
 			foreach ( $batch as $id ) {
@@ -353,7 +362,7 @@ public function process_batch( array $batch ) : void {
 		}
 		if ( 0 === $this->get_total_pending_count() ) {
 			$this->cleanup_synchronization_state();
-			$this->cache_controller->maybe_restore_orders_cache_usage();
+			$this->order_cache_controller->maybe_restore_orders_cache_usage();
 		}
 	}
 
diff --git a/plugins/woocommerce/src/Internal/DependencyManagement/ServiceProviders/OrdersDataStoreServiceProvider.php b/plugins/woocommerce/src/Internal/DependencyManagement/ServiceProviders/OrdersDataStoreServiceProvider.php
index 787ff605eadc..6759df084263 100644
--- a/plugins/woocommerce/src/Internal/DependencyManagement/ServiceProviders/OrdersDataStoreServiceProvider.php
+++ b/plugins/woocommerce/src/Internal/DependencyManagement/ServiceProviders/OrdersDataStoreServiceProvider.php
@@ -56,6 +56,7 @@ public function register() {
 				DatabaseUtil::class,
 				PostsToOrdersMigrationController::class,
 				LegacyProxy::class,
+				OrderCacheController::class,
 			)
 		);
 		$this->share( OrdersTableRefundDataStore::class )->addArguments( array( OrdersTableDataStoreMeta::class, DatabaseUtil::class, LegacyProxy::class ) );

From b41969aa35de9fdf6844a54d969f2e8fa2105502 Mon Sep 17 00:00:00 2001
From: Vedanshu Jain <vedanshu.jain.2012@gmail.com>
Date: Thu, 26 Jan 2023 12:14:50 +0530
Subject: [PATCH 15/22] Coding standard fixes.

---
 .../src/Internal/DataStores/Orders/DataSynchronizer.php          | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/woocommerce/src/Internal/DataStores/Orders/DataSynchronizer.php b/plugins/woocommerce/src/Internal/DataStores/Orders/DataSynchronizer.php
index 8ed2f9946f93..84e9e9cd9562 100644
--- a/plugins/woocommerce/src/Internal/DataStores/Orders/DataSynchronizer.php
+++ b/plugins/woocommerce/src/Internal/DataStores/Orders/DataSynchronizer.php
@@ -89,6 +89,7 @@ public function __construct() {
 	 * @param DatabaseUtil                     $database_util The database util class to use.
 	 * @param PostsToOrdersMigrationController $posts_to_cot_migrator The posts to COT migration class to use.
 	 * @param LegacyProxy                      $legacy_proxy The legacy proxy instance to use.
+	 * @param OrderCacheController             $order_cache_controller The order cache controller instance to use.
 	 * @internal
 	 */
 	final public function init(

From c678ce72486efecd0ca88bbf909c374e0284fe44 Mon Sep 17 00:00:00 2001
From: Vedanshu Jain <vedanshu.jain.2012@gmail.com>
Date: Fri, 3 Feb 2023 14:14:26 +0530
Subject: [PATCH 16/22] Remove get_from_datastore as it was not being used.

---
 plugins/woocommerce/src/Caches/OrderCache.php | 12 -------
 .../woocommerce/src/Caching/ObjectCache.php   | 12 +------
 .../tests/php/src/Caching/ObjectCacheTest.php | 32 -------------------
 3 files changed, 1 insertion(+), 55 deletions(-)

diff --git a/plugins/woocommerce/src/Caches/OrderCache.php b/plugins/woocommerce/src/Caches/OrderCache.php
index e64d55e9ed6d..6e2b8d3c16fe 100644
--- a/plugins/woocommerce/src/Caches/OrderCache.php
+++ b/plugins/woocommerce/src/Caches/OrderCache.php
@@ -41,16 +41,4 @@ protected function validate( $object ): ?array {
 
 		return null;
 	}
-
-	/**
-	 * Get an object from an authoritative data store.
-	 * This is used by 'get' if the object isn't cached and no custom object retrieval callback is suupplied.
-	 *
-	 * @param int|string $id The id of the object to get.
-	 *
-	 * @return array|object|null The retrieved object, or null if it's not possible to retrieve an object by the given id.
-	 */
-	protected function get_from_datastore( $id ) {
-		return null;
-	}
 }
diff --git a/plugins/woocommerce/src/Caching/ObjectCache.php b/plugins/woocommerce/src/Caching/ObjectCache.php
index 8fc5acfbafe2..925509d17b4b 100644
--- a/plugins/woocommerce/src/Caching/ObjectCache.php
+++ b/plugins/woocommerce/src/Caching/ObjectCache.php
@@ -235,10 +235,9 @@ public function get( $id, int $expiration = self::DEFAULT_EXPIRATION, callable $
 
 		$data = $this->get_cache_engine()->get_cached_object( $id, $this->get_object_type() );
 		if ( null === $data ) {
+			$object = null;
 			if ( $get_from_datastore_callback ) {
 				$object = $get_from_datastore_callback( $id );
-			} else {
-				$object = $this->get_from_datastore( $id );
 			}
 
 			if ( null === $object ) {
@@ -297,15 +296,6 @@ abstract protected function get_object_id( $object );
 	 */
 	abstract protected function validate( $object ): ?array;
 
-	/**
-	 * Get an object from an authoritative data store.
-	 * This is used by 'get' if the object isn't cached and no custom object retrieval callback is suupplied.
-	 *
-	 * @param int|string $id The id of the object to get.
-	 * @return array|object|null The retrieved object, or null if it's not possible to retrieve an object by the given id.
-	 */
-	abstract protected function get_from_datastore( $id );
-
 	/**
 	 * Get the instance of the cache engine to use.
 	 *
diff --git a/plugins/woocommerce/tests/php/src/Caching/ObjectCacheTest.php b/plugins/woocommerce/tests/php/src/Caching/ObjectCacheTest.php
index 2c59cc51220e..66c91c92c0cc 100644
--- a/plugins/woocommerce/tests/php/src/Caching/ObjectCacheTest.php
+++ b/plugins/woocommerce/tests/php/src/Caching/ObjectCacheTest.php
@@ -426,38 +426,6 @@ public function test_try_getting_not_cached_object_with_callback() {
 		$this->assertEquals( $expected, $this->sut->get( 'the_id' ) );
 	}
 
-	/**
-	 * @testdox 'get' uses the 'get_from_datastore' method if there's no object cached under the passed id, and caches the object retrieved.
-	 */
-	public function test_try_getting_not_cached_object_get_from_datastore_implemented() {
-		// phpcs:disable Squiz.Commenting
-
-		$sut = new class() extends ObjectCache {
-			public function get_object_type(): string {
-				return 'the_type';
-			}
-
-			protected function get_from_datastore( $id ) {
-				return array( 'id' => $id );
-			}
-
-			protected function get_object_id( $object ) {
-			}
-
-			protected function validate( $object ) : ?array {
-				return null;
-			}
-		};
-
-		// phpcs:enable Squiz.Commenting
-
-		$result = $sut->get( 'the_id' );
-
-		$expected = array( 'id' => 'the_id' );
-		$this->assertEquals( $expected, $result );
-		$this->assertEquals( $expected, $sut->get( 'the_id' ) );
-	}
-
 	/**
 	 * @testdox 'remove' removes a cached object and returns true, or returns false if there's no cached object under the passed id.
 	 */

From b5ae765b9311a88d94b24154358fbdde59e872d6 Mon Sep 17 00:00:00 2001
From: Vedanshu Jain <vedanshu.jain.2012@gmail.com>
Date: Fri, 3 Feb 2023 14:17:54 +0530
Subject: [PATCH 17/22] Use correct class name.

---
 plugins/woocommerce/src/Caches/OrderCache.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/woocommerce/src/Caches/OrderCache.php b/plugins/woocommerce/src/Caches/OrderCache.php
index 6e2b8d3c16fe..6f49fa308dd9 100644
--- a/plugins/woocommerce/src/Caches/OrderCache.php
+++ b/plugins/woocommerce/src/Caches/OrderCache.php
@@ -35,8 +35,8 @@ protected function get_object_id( $object ) {
 	 * @return string[]|null An array of error messages, or null if the object is valid.
 	 */
 	protected function validate( $object ): ?array {
-		if ( ! $object instanceof \WC_Abstract_Legacy_Order ) {
-			return array( 'The supplied order is not an instance of WC_Order, ' . gettype( $object ) );
+		if ( ! $object instanceof \WC_Abstract_Order ) {
+			return array( 'The supplied order is not an instance of WC_Abstract_Order, ' . gettype( $object ) );
 		}
 
 		return null;

From 7feaed74fac8a3ab360ab8c0561f1a3c045ab99e Mon Sep 17 00:00:00 2001
From: Cluster CIS <37690192+clustercis@users.noreply.github.com>
Date: Wed, 22 Feb 2023 13:43:57 +0200
Subject: [PATCH 18/22] Fix selectors for quantity element in variable products
 (#36871)

Fixes bug introduced in PR #36087 that changes jQuery selectors for quantity input in variable products.

The previous logic is reinstated so that $qty points to the div wrapper, and $qty_input points to the input element inside.

Otherwise, as is in the current version, $qty_input is undefined and the min/max attributes are not updated.

This PR also addresses the original issue #36086 by restricting the selector of the div wrapper to only be the one containing input[name=quantity] (the .qty class filter is also kept to avoid any potential malfunctions of existing code).
---
 .../changelog/fix-36855-qty-selector-in-variables         | 4 ++++
 .../client/legacy/js/frontend/add-to-cart-variation.js    | 8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)
 create mode 100644 plugins/woocommerce/changelog/fix-36855-qty-selector-in-variables

diff --git a/plugins/woocommerce/changelog/fix-36855-qty-selector-in-variables b/plugins/woocommerce/changelog/fix-36855-qty-selector-in-variables
new file mode 100644
index 000000000000..1f55fad5c172
--- /dev/null
+++ b/plugins/woocommerce/changelog/fix-36855-qty-selector-in-variables
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Fix no enforcing of min/max limits in quantity selector of variable products.
diff --git a/plugins/woocommerce/client/legacy/js/frontend/add-to-cart-variation.js b/plugins/woocommerce/client/legacy/js/frontend/add-to-cart-variation.js
index 29b5086fedac..d5e6bfa26a6f 100644
--- a/plugins/woocommerce/client/legacy/js/frontend/add-to-cart-variation.js
+++ b/plugins/woocommerce/client/legacy/js/frontend/add-to-cart-variation.js
@@ -263,7 +263,8 @@
 			$dimensions    = form.$product.find(
 				'.product_dimensions, .woocommerce-product-attributes-item--dimensions .woocommerce-product-attributes-item__value'
 			),
-			$qty           = form.$singleVariationWrap.find( '.quantity input[name="quantity"]' ),
+			$qty_input     = form.$singleVariationWrap.find( '.quantity input.qty[name="quantity"]' ),
+			$qty           = $qty_input.closest( '.quantity' ),
 			purchasable    = true,
 			variation_id   = '',
 			template       = false,
@@ -308,12 +309,11 @@
 
 		// Hide or show qty input
 		if ( variation.is_sold_individually === 'yes' ) {
-			$qty.find( 'input.qty' ).val( '1' ).attr( 'min', '1' ).attr( 'max', '' ).trigger( 'change' );
+			$qty_input.val( '1' ).attr( 'min', '1' ).attr( 'max', '' ).trigger( 'change' );
 			$qty.hide();
 		} else {
 
-			var $qty_input = $qty.find( 'input.qty' ),
-				qty_val    = parseFloat( $qty_input.val() );
+			var qty_val    = parseFloat( $qty_input.val() );
 
 			if ( isNaN( qty_val ) ) {
 				qty_val = variation.min_qty;

From b0e5db0bfea18dd9cffba0902b5832254b85e954 Mon Sep 17 00:00:00 2001
From: Luigi Teschio <gigitux@gmail.com>
Date: Wed, 22 Feb 2023 15:51:04 +0100
Subject: [PATCH 19/22] Bump WooCommerce blocks package to 9.6.2 (#36919)

bump WooCommerce blocks package to 9.6.2
---
 .../changelog/update-woocommerce-blocks-9.6.2      |  4 ++++
 plugins/woocommerce/composer.json                  |  2 +-
 plugins/woocommerce/composer.lock                  | 14 +++++++-------
 3 files changed, 12 insertions(+), 8 deletions(-)
 create mode 100644 plugins/woocommerce/changelog/update-woocommerce-blocks-9.6.2

diff --git a/plugins/woocommerce/changelog/update-woocommerce-blocks-9.6.2 b/plugins/woocommerce/changelog/update-woocommerce-blocks-9.6.2
new file mode 100644
index 000000000000..70c4f39490e6
--- /dev/null
+++ b/plugins/woocommerce/changelog/update-woocommerce-blocks-9.6.2
@@ -0,0 +1,4 @@
+Significance: patch
+Type: update
+
+Update WooCommerce Blocks to 9.6.2
diff --git a/plugins/woocommerce/composer.json b/plugins/woocommerce/composer.json
index 5de733b5fb58..ed3eebd8f0bd 100644
--- a/plugins/woocommerce/composer.json
+++ b/plugins/woocommerce/composer.json
@@ -21,7 +21,7 @@
 		"maxmind-db/reader": "^1.11",
 		"pelago/emogrifier": "^6.0",
 		"woocommerce/action-scheduler": "3.5.4",
-		"woocommerce/woocommerce-blocks": "9.6.1"
+		"woocommerce/woocommerce-blocks": "9.6.2"
 	},
 	"require-dev": {
 		"automattic/jetpack-changelogger": "^3.3.0",
diff --git a/plugins/woocommerce/composer.lock b/plugins/woocommerce/composer.lock
index f5bb0f5fc816..c05363821643 100644
--- a/plugins/woocommerce/composer.lock
+++ b/plugins/woocommerce/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": "092f7722dc1ab046fc4204f3a8d6ef5e",
+    "content-hash": "3114b2ae01803fb5d37d2e848b566b8e",
     "packages": [
         {
             "name": "automattic/jetpack-autoloader",
@@ -628,16 +628,16 @@
         },
         {
             "name": "woocommerce/woocommerce-blocks",
-            "version": "v9.6.1",
+            "version": "v9.6.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/woocommerce/woocommerce-blocks.git",
-                "reference": "5fae67e162c5300ca5da5ebeb4403005492483ac"
+                "reference": "1eb30afa09310d0dcbe8be1222ac3e5214c60328"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/woocommerce/woocommerce-blocks/zipball/5fae67e162c5300ca5da5ebeb4403005492483ac",
-                "reference": "5fae67e162c5300ca5da5ebeb4403005492483ac",
+                "url": "https://api.github.com/repos/woocommerce/woocommerce-blocks/zipball/1eb30afa09310d0dcbe8be1222ac3e5214c60328",
+                "reference": "1eb30afa09310d0dcbe8be1222ac3e5214c60328",
                 "shasum": ""
             },
             "require": {
@@ -683,9 +683,9 @@
             ],
             "support": {
                 "issues": "https://github.com/woocommerce/woocommerce-blocks/issues",
-                "source": "https://github.com/woocommerce/woocommerce-blocks/tree/v9.6.1"
+                "source": "https://github.com/woocommerce/woocommerce-blocks/tree/v9.6.2"
             },
-            "time": "2023-02-17T14:57:23+00:00"
+            "time": "2023-02-22T13:56:14+00:00"
         }
     ],
     "packages-dev": [

From 7fdd0f496f5488bed4f3ad3404022980dcded2f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20L=C3=B3pez=20Ariza?=
 <45979455+alopezari@users.noreply.github.com>
Date: Thu, 23 Feb 2023 00:00:58 +0100
Subject: [PATCH 20/22] Remove check to skip testing instructions if needed in
 PR template and add final check to confirm that testing instructions were
 added. (#36916)

* Remove check to skip testing instructions if needed from PR template and add final check to confirm that testing instructions were added.

* Update Pull Request template documentation to be consistent with the removal of the checkbox to skip testing instructions.

---------

Co-authored-by: Jonathan Lane <lanej0@users.noreply.github.com>
---
 .github/PULL_REQUEST_TEMPLATE.md | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 2ad59418aac5..3b1ff6841c6c 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -14,15 +14,11 @@
 
 Closes # .
 
-<!-- The next section is mandatory. If your PR doesn't require testing, please indicate that you are purposefully omitting instructions. -->
-
-- [ ] This PR is a very minor change/addition and does not require testing instructions (if checked you can ignore/remove the next section).
-
 <!-- Begin testing instructions -->
 
 ### How to test the changes in this Pull Request:
 
-<!-- Otherwise, please include detailed instructions on how these changes can be tested. Please, make sure to review and follow the guide for writing high-quality testing instructions below. -->
+<!-- Please include detailed instructions on how these changes can be tested, make sure to review and follow the guide for writing high-quality testing instructions below. -->
 
 - [ ] Have you followed the [Writing high-quality testing instructions guide](https://github.com/woocommerce/woocommerce/wiki/Writing-high-quality-testing-instructions)?
 
@@ -37,6 +33,7 @@ Closes # .
 -   [ ] Have you added an explanation of what your changes do and why you'd like us to include them?
 -   [ ] Have you written new tests for your changes, as applicable?
 -   [ ] Have you created a changelog file for each project being changed, ie `pnpm --filter=<project> changelog add`?
+-   [ ] Have you included testing instructions?
 
 <!-- Mark completed items with an [x] -->
 

From 87d79f15a3144132354edec3cc84636d863302b1 Mon Sep 17 00:00:00 2001
From: Joshua T Flowers <joshuatf@gmail.com>
Date: Thu, 23 Feb 2023 09:48:49 -0800
Subject: [PATCH 21/22] Move product editor utils to product editor package
 (#36730)

* Move product editor utils to product editor package

* Add changelog entries

* Move remaining utils

* Move util import/exports to separate index file
---
 .../js/product-editor/changelog/update-36719  |  4 +
 packages/js/product-editor/package.json       | 12 ++-
 packages/js/product-editor/src/index.ts       |  5 ++
 .../js/product-editor/src/utils/constants.ts  |  9 ++
 .../utils/format-currency-display-value.ts    | 39 ++++++++
 .../src/utils/get-checkbox-tracks.ts          | 24 +++++
 .../src/utils/get-currency-symbol-props.ts    | 26 ++++++
 .../src}/utils/get-derived-product-type.ts    |  0
 .../src}/utils/get-product-status.ts          |  0
 .../src}/utils/get-product-stock-status.ts    |  0
 .../src}/utils/get-product-title.ts           |  0
 .../src}/utils/get-product-variation-title.ts |  2 +-
 packages/js/product-editor/src/utils/index.ts | 34 +++++++
 .../utils/prevent-leaving-product-form.ts     |  0
 .../utils/test/get-derived-product-type.ts    |  0
 .../src}/utils/test/get-product-status.ts     |  0
 .../test/get-product-stock-status.test.ts     |  0
 .../src}/utils/test/get-product-title.test.ts |  0
 .../utils/test/get-product-variation-title.ts |  0
 .../test/prevent-leaving-product-form.test.ts |  0
 .../js/product-editor/typings/global.d.ts     |  9 ++
 .../products/fields/variations/variations.tsx |  8 +-
 .../details-section/details-field-feature.tsx |  2 +-
 .../inventory-field-stock-limit.tsx           |  6 +-
 .../inventory-field-track-quantity.tsx        |  2 +-
 .../pricing-section/pricing-field-list.tsx    |  2 +-
 .../pricing-section/pricing-field-sale.tsx    |  2 +-
 .../hooks/use-product-variations-helper.ts    |  6 +-
 .../client/products/product-form-actions.tsx  |  2 +-
 .../product-settings/product-settings.tsx     |  2 +-
 .../client/products/product-status-badge.tsx  |  8 +-
 .../client/products/product-title.tsx         | 10 +--
 .../product-variation-form-actions.tsx        |  2 +-
 .../product-variation-details-section.tsx     |  2 +-
 .../client/products/sections/utils.ts         | 81 -----------------
 .../client/products/use-product-helper.ts     |  6 +-
 plugins/woocommerce/changelog/update-36719    |  4 +
 pnpm-lock.yaml                                | 89 +++++++++++++------
 38 files changed, 253 insertions(+), 145 deletions(-)
 create mode 100644 packages/js/product-editor/changelog/update-36719
 create mode 100644 packages/js/product-editor/src/utils/constants.ts
 create mode 100644 packages/js/product-editor/src/utils/format-currency-display-value.ts
 create mode 100644 packages/js/product-editor/src/utils/get-checkbox-tracks.ts
 create mode 100644 packages/js/product-editor/src/utils/get-currency-symbol-props.ts
 rename {plugins/woocommerce-admin/client/products => packages/js/product-editor/src}/utils/get-derived-product-type.ts (100%)
 rename {plugins/woocommerce-admin/client/products => packages/js/product-editor/src}/utils/get-product-status.ts (100%)
 rename {plugins/woocommerce-admin/client/products => packages/js/product-editor/src}/utils/get-product-stock-status.ts (100%)
 rename {plugins/woocommerce-admin/client/products => packages/js/product-editor/src}/utils/get-product-title.ts (100%)
 rename {plugins/woocommerce-admin/client/products => packages/js/product-editor/src}/utils/get-product-variation-title.ts (94%)
 create mode 100644 packages/js/product-editor/src/utils/index.ts
 rename {plugins/woocommerce-admin/client/products => packages/js/product-editor/src}/utils/prevent-leaving-product-form.ts (100%)
 rename {plugins/woocommerce-admin/client/products => packages/js/product-editor/src}/utils/test/get-derived-product-type.ts (100%)
 rename {plugins/woocommerce-admin/client/products => packages/js/product-editor/src}/utils/test/get-product-status.ts (100%)
 rename {plugins/woocommerce-admin/client/products => packages/js/product-editor/src}/utils/test/get-product-stock-status.test.ts (100%)
 rename {plugins/woocommerce-admin/client/products => packages/js/product-editor/src}/utils/test/get-product-title.test.ts (100%)
 rename {plugins/woocommerce-admin/client/products => packages/js/product-editor/src}/utils/test/get-product-variation-title.ts (100%)
 rename {plugins/woocommerce-admin/client/products => packages/js/product-editor/src}/utils/test/prevent-leaving-product-form.test.ts (100%)
 create mode 100644 packages/js/product-editor/typings/global.d.ts
 delete mode 100644 plugins/woocommerce-admin/client/products/sections/utils.ts
 create mode 100644 plugins/woocommerce/changelog/update-36719

diff --git a/packages/js/product-editor/changelog/update-36719 b/packages/js/product-editor/changelog/update-36719
new file mode 100644
index 000000000000..07d610d51f85
--- /dev/null
+++ b/packages/js/product-editor/changelog/update-36719
@@ -0,0 +1,4 @@
+Significance: minor
+Type: add
+
+Add product editor utils
diff --git a/packages/js/product-editor/package.json b/packages/js/product-editor/package.json
index abb3c6d7361e..d75fb9e56f1f 100644
--- a/packages/js/product-editor/package.json
+++ b/packages/js/product-editor/package.json
@@ -29,10 +29,15 @@
 	},
 	"dependencies": {
 		"@woocommerce/components": "workspace:*",
+		"@woocommerce/data": "workspace:^4.1.0",
+		"@woocommerce/tracks": "workspace:^1.3.0",
 		"@wordpress/components": "^19.5.0",
-		"@wordpress/element": "^4.1.1"
+		"@wordpress/element": "^4.1.1",
+		"@wordpress/i18n": "^4.26.0",
+		"react-router-dom": "^6.3.0"
 	},
 	"devDependencies": {
+		"@types/react": "^17.0.2",
 		"@types/wordpress__components": "^19.10.1",
 		"@woocommerce/eslint-plugin": "workspace:*",
 		"@woocommerce/internal-style-build": "workspace:*",
@@ -42,6 +47,7 @@
 		"jest": "^27.5.1",
 		"jest-cli": "^27.5.1",
 		"postcss-loader": "^3.0.0",
+		"react": "^17.0.2",
 		"sass-loader": "^10.2.1",
 		"ts-jest": "^27.1.3",
 		"typescript": "^4.8.3",
@@ -60,5 +66,9 @@
 		"start": "concurrently \"tsc --build --watch\" \"webpack --watch\"",
 		"prepack": "pnpm run clean && pnpm run build",
 		"lint:fix": "eslint src --fix"
+	},
+	"peerDependencies": {
+		"@types/react": "^17.0.2",
+		"react": "^17.0.2"
 	}
 }
diff --git a/packages/js/product-editor/src/index.ts b/packages/js/product-editor/src/index.ts
index e38787183bf7..8734d1e1479f 100644
--- a/packages/js/product-editor/src/index.ts
+++ b/packages/js/product-editor/src/index.ts
@@ -2,3 +2,8 @@ export {
 	ProductSectionLayout as __experimentalProductSectionLayout,
 	ProductFieldSection as __experimentalProductFieldSection,
 } from './product-section-layout';
+
+/**
+ * Utils
+ */
+export * from './utils';
diff --git a/packages/js/product-editor/src/utils/constants.ts b/packages/js/product-editor/src/utils/constants.ts
new file mode 100644
index 000000000000..0aa72fd516ad
--- /dev/null
+++ b/packages/js/product-editor/src/utils/constants.ts
@@ -0,0 +1,9 @@
+export const NUMBERS_AND_ALLOWED_CHARS = '[^-0-9%s1%s2]';
+export const NUMBERS_AND_DECIMAL_SEPARATOR = '[^-\\d\\%s]+';
+export const ONLY_ONE_DECIMAL_SEPARATOR = '[%s](?=%s*[%s])';
+// This should never be a real slug value of any existing shipping class
+export const ADD_NEW_SHIPPING_CLASS_OPTION_VALUE =
+	'__ADD_NEW_SHIPPING_CLASS_OPTION__';
+export const UNCATEGORIZED_CATEGORY_SLUG = 'uncategorized';
+export const PRODUCT_VARIATION_TITLE_LIMIT = 32;
+export const STANDARD_RATE_TAX_CLASS_SLUG = 'standard';
diff --git a/packages/js/product-editor/src/utils/format-currency-display-value.ts b/packages/js/product-editor/src/utils/format-currency-display-value.ts
new file mode 100644
index 000000000000..8950006929be
--- /dev/null
+++ b/packages/js/product-editor/src/utils/format-currency-display-value.ts
@@ -0,0 +1,39 @@
+/**
+ * Internal dependencies
+ */
+import { NUMBERS_AND_ALLOWED_CHARS } from './constants';
+
+type CurrencyConfig = {
+	code: string;
+	symbol: string;
+	symbolPosition: string;
+	decimalSeparator: string;
+	priceFormat: string;
+	thousandSeparator: string;
+	precision: number;
+};
+
+/**
+ * Cleans and formats the currency value shown to the user.
+ *
+ * @param {string} value          Form value.
+ * @param {Object} currencyConfig Currency context.
+ * @return {string} Display value.
+ */
+export const formatCurrencyDisplayValue = (
+	value: string,
+	currencyConfig: CurrencyConfig,
+	format: ( number: number | string ) => string
+) => {
+	const { decimalSeparator, thousandSeparator } = currencyConfig;
+
+	const regex = new RegExp(
+		NUMBERS_AND_ALLOWED_CHARS.replace( '%s1', decimalSeparator ).replace(
+			'%s2',
+			thousandSeparator
+		),
+		'g'
+	);
+
+	return value === undefined ? value : format( value ).replace( regex, '' );
+};
diff --git a/packages/js/product-editor/src/utils/get-checkbox-tracks.ts b/packages/js/product-editor/src/utils/get-checkbox-tracks.ts
new file mode 100644
index 000000000000..8d219c91681b
--- /dev/null
+++ b/packages/js/product-editor/src/utils/get-checkbox-tracks.ts
@@ -0,0 +1,24 @@
+/**
+ * External dependencies
+ */
+import { ChangeEvent } from 'react';
+import { Product } from '@woocommerce/data';
+import { recordEvent } from '@woocommerce/tracks';
+
+/**
+ * Get additional props to be passed to all checkbox inputs.
+ *
+ * @param  name Name of the checkbox.
+ * @return Props.
+ */
+export function getCheckboxTracks< T = Product >( name: string ) {
+	return {
+		onChange: (
+			isChecked: ChangeEvent< HTMLInputElement > | T[ keyof T ]
+		) => {
+			recordEvent( `product_checkbox_${ name }`, {
+				checked: isChecked,
+			} );
+		},
+	};
+}
diff --git a/packages/js/product-editor/src/utils/get-currency-symbol-props.ts b/packages/js/product-editor/src/utils/get-currency-symbol-props.ts
new file mode 100644
index 000000000000..6064b28133d4
--- /dev/null
+++ b/packages/js/product-editor/src/utils/get-currency-symbol-props.ts
@@ -0,0 +1,26 @@
+type CurrencyConfig = {
+	code: string;
+	symbol: string;
+	symbolPosition: string;
+	decimalSeparator: string;
+	priceFormat: string;
+	thousandSeparator: string;
+	precision: number;
+};
+
+/**
+ * Get input props for currency related values and symbol positions.
+ *
+ * @param {Object} currencyConfig - Currency context
+ * @return {Object} Props.
+ */
+export const getCurrencySymbolProps = ( currencyConfig: CurrencyConfig ) => {
+	const { symbol, symbolPosition } = currencyConfig;
+	const currencyPosition = symbolPosition.includes( 'left' )
+		? 'prefix'
+		: 'suffix';
+
+	return {
+		[ currencyPosition ]: symbol,
+	};
+};
diff --git a/plugins/woocommerce-admin/client/products/utils/get-derived-product-type.ts b/packages/js/product-editor/src/utils/get-derived-product-type.ts
similarity index 100%
rename from plugins/woocommerce-admin/client/products/utils/get-derived-product-type.ts
rename to packages/js/product-editor/src/utils/get-derived-product-type.ts
diff --git a/plugins/woocommerce-admin/client/products/utils/get-product-status.ts b/packages/js/product-editor/src/utils/get-product-status.ts
similarity index 100%
rename from plugins/woocommerce-admin/client/products/utils/get-product-status.ts
rename to packages/js/product-editor/src/utils/get-product-status.ts
diff --git a/plugins/woocommerce-admin/client/products/utils/get-product-stock-status.ts b/packages/js/product-editor/src/utils/get-product-stock-status.ts
similarity index 100%
rename from plugins/woocommerce-admin/client/products/utils/get-product-stock-status.ts
rename to packages/js/product-editor/src/utils/get-product-stock-status.ts
diff --git a/plugins/woocommerce-admin/client/products/utils/get-product-title.ts b/packages/js/product-editor/src/utils/get-product-title.ts
similarity index 100%
rename from plugins/woocommerce-admin/client/products/utils/get-product-title.ts
rename to packages/js/product-editor/src/utils/get-product-title.ts
diff --git a/plugins/woocommerce-admin/client/products/utils/get-product-variation-title.ts b/packages/js/product-editor/src/utils/get-product-variation-title.ts
similarity index 94%
rename from plugins/woocommerce-admin/client/products/utils/get-product-variation-title.ts
rename to packages/js/product-editor/src/utils/get-product-variation-title.ts
index a15a79436cd2..0480311c1bdf 100644
--- a/plugins/woocommerce-admin/client/products/utils/get-product-variation-title.ts
+++ b/packages/js/product-editor/src/utils/get-product-variation-title.ts
@@ -6,7 +6,7 @@ import { ProductVariation } from '@woocommerce/data';
 /**
  * Internal dependencies
  */
-import { PRODUCT_VARIATION_TITLE_LIMIT } from '../constants';
+import { PRODUCT_VARIATION_TITLE_LIMIT } from './constants';
 
 /**
  * Get the product variation title for use in the header.
diff --git a/packages/js/product-editor/src/utils/index.ts b/packages/js/product-editor/src/utils/index.ts
new file mode 100644
index 000000000000..58624bb402e4
--- /dev/null
+++ b/packages/js/product-editor/src/utils/index.ts
@@ -0,0 +1,34 @@
+/**
+ * Internal dependencies
+ */
+import { formatCurrencyDisplayValue } from './format-currency-display-value';
+import { getCheckboxTracks } from './get-checkbox-tracks';
+import { getCurrencySymbolProps } from './get-currency-symbol-props';
+import { getDerivedProductType } from './get-derived-product-type';
+import { getProductStatus, PRODUCT_STATUS_LABELS } from './get-product-status';
+import {
+	getProductStockStatus,
+	getProductStockStatusClass,
+} from './get-product-stock-status';
+import { getProductTitle, AUTO_DRAFT_NAME } from './get-product-title';
+import {
+	getProductVariationTitle,
+	getTruncatedProductVariationTitle,
+} from './get-product-variation-title';
+import { preventLeavingProductForm } from './prevent-leaving-product-form';
+
+export {
+	AUTO_DRAFT_NAME,
+	formatCurrencyDisplayValue,
+	getCheckboxTracks,
+	getCurrencySymbolProps,
+	getDerivedProductType,
+	getProductStatus,
+	getProductStockStatus,
+	getProductStockStatusClass,
+	getProductTitle,
+	getProductVariationTitle,
+	getTruncatedProductVariationTitle,
+	preventLeavingProductForm,
+	PRODUCT_STATUS_LABELS,
+};
diff --git a/plugins/woocommerce-admin/client/products/utils/prevent-leaving-product-form.ts b/packages/js/product-editor/src/utils/prevent-leaving-product-form.ts
similarity index 100%
rename from plugins/woocommerce-admin/client/products/utils/prevent-leaving-product-form.ts
rename to packages/js/product-editor/src/utils/prevent-leaving-product-form.ts
diff --git a/plugins/woocommerce-admin/client/products/utils/test/get-derived-product-type.ts b/packages/js/product-editor/src/utils/test/get-derived-product-type.ts
similarity index 100%
rename from plugins/woocommerce-admin/client/products/utils/test/get-derived-product-type.ts
rename to packages/js/product-editor/src/utils/test/get-derived-product-type.ts
diff --git a/plugins/woocommerce-admin/client/products/utils/test/get-product-status.ts b/packages/js/product-editor/src/utils/test/get-product-status.ts
similarity index 100%
rename from plugins/woocommerce-admin/client/products/utils/test/get-product-status.ts
rename to packages/js/product-editor/src/utils/test/get-product-status.ts
diff --git a/plugins/woocommerce-admin/client/products/utils/test/get-product-stock-status.test.ts b/packages/js/product-editor/src/utils/test/get-product-stock-status.test.ts
similarity index 100%
rename from plugins/woocommerce-admin/client/products/utils/test/get-product-stock-status.test.ts
rename to packages/js/product-editor/src/utils/test/get-product-stock-status.test.ts
diff --git a/plugins/woocommerce-admin/client/products/utils/test/get-product-title.test.ts b/packages/js/product-editor/src/utils/test/get-product-title.test.ts
similarity index 100%
rename from plugins/woocommerce-admin/client/products/utils/test/get-product-title.test.ts
rename to packages/js/product-editor/src/utils/test/get-product-title.test.ts
diff --git a/plugins/woocommerce-admin/client/products/utils/test/get-product-variation-title.ts b/packages/js/product-editor/src/utils/test/get-product-variation-title.ts
similarity index 100%
rename from plugins/woocommerce-admin/client/products/utils/test/get-product-variation-title.ts
rename to packages/js/product-editor/src/utils/test/get-product-variation-title.ts
diff --git a/plugins/woocommerce-admin/client/products/utils/test/prevent-leaving-product-form.test.ts b/packages/js/product-editor/src/utils/test/prevent-leaving-product-form.test.ts
similarity index 100%
rename from plugins/woocommerce-admin/client/products/utils/test/prevent-leaving-product-form.test.ts
rename to packages/js/product-editor/src/utils/test/prevent-leaving-product-form.test.ts
diff --git a/packages/js/product-editor/typings/global.d.ts b/packages/js/product-editor/typings/global.d.ts
new file mode 100644
index 000000000000..69abbdeff5eb
--- /dev/null
+++ b/packages/js/product-editor/typings/global.d.ts
@@ -0,0 +1,9 @@
+declare global {
+	interface Window {
+		wcAdminFeatures: Record< string, boolean >;
+	}
+}
+
+/*~ If your module exports nothing, you'll need this line. Otherwise, delete it */
+export {};
+
diff --git a/plugins/woocommerce-admin/client/products/fields/variations/variations.tsx b/plugins/woocommerce-admin/client/products/fields/variations/variations.tsx
index 5076f08090d8..16298715f470 100644
--- a/plugins/woocommerce-admin/client/products/fields/variations/variations.tsx
+++ b/plugins/woocommerce-admin/client/products/fields/variations/variations.tsx
@@ -8,6 +8,10 @@ import {
 	Product,
 	ProductVariation,
 } from '@woocommerce/data';
+import {
+	getProductStockStatus,
+	getProductStockStatusClass,
+} from '@woocommerce/product-editor';
 import {
 	Link,
 	ListItem,
@@ -31,10 +35,6 @@ import useVariationsOrder from '~/products/hooks/use-variations-order';
 import HiddenIcon from '~/products/images/hidden-icon';
 import VisibleIcon from '~/products/images/visible-icon';
 import { CurrencyContext } from '../../../lib/currency-context';
-import {
-	getProductStockStatus,
-	getProductStockStatusClass,
-} from '../../utils/get-product-stock-status';
 import './variations.scss';
 
 /**
diff --git a/plugins/woocommerce-admin/client/products/fills/details-section/details-field-feature.tsx b/plugins/woocommerce-admin/client/products/fills/details-section/details-field-feature.tsx
index afbae52275da..4f1feb8e9105 100644
--- a/plugins/woocommerce-admin/client/products/fills/details-section/details-field-feature.tsx
+++ b/plugins/woocommerce-admin/client/products/fills/details-section/details-field-feature.tsx
@@ -8,6 +8,7 @@ import {
 	Link,
 	__experimentalTooltip as Tooltip,
 } from '@woocommerce/components';
+import { getCheckboxTracks } from '@woocommerce/product-editor';
 import interpolateComponents from '@automattic/interpolate-components';
 import { Product } from '@woocommerce/data';
 import { recordEvent } from '@woocommerce/tracks';
@@ -15,7 +16,6 @@ import { recordEvent } from '@woocommerce/tracks';
 /**
  * Internal dependencies
  */
-import { getCheckboxTracks } from '../../sections/utils';
 import { PRODUCT_DETAILS_SLUG } from '../constants';
 
 export const DetailsFeatureField = () => {
diff --git a/plugins/woocommerce-admin/client/products/fills/inventory-section/inventory-field-stock-limit.tsx b/plugins/woocommerce-admin/client/products/fills/inventory-section/inventory-field-stock-limit.tsx
index 9eaa49752467..d373ca9d2f3a 100644
--- a/plugins/woocommerce-admin/client/products/fills/inventory-section/inventory-field-stock-limit.tsx
+++ b/plugins/woocommerce-admin/client/products/fills/inventory-section/inventory-field-stock-limit.tsx
@@ -4,13 +4,9 @@
 import { __ } from '@wordpress/i18n';
 import { useFormContext } from '@woocommerce/components';
 import { CheckboxControl } from '@wordpress/components';
+import { getCheckboxTracks } from '@woocommerce/product-editor';
 import { Product } from '@woocommerce/data';
 
-/**
- * Internal dependencies
- */
-import { getCheckboxTracks } from '../../sections/utils';
-
 export const InventoryStockLimitField = () => {
 	const { getCheckboxControlProps } = useFormContext< Product >();
 
diff --git a/plugins/woocommerce-admin/client/products/fills/inventory-section/inventory-field-track-quantity.tsx b/plugins/woocommerce-admin/client/products/fills/inventory-section/inventory-field-track-quantity.tsx
index a2c42f8e6938..ee1ba6789b63 100644
--- a/plugins/woocommerce-admin/client/products/fills/inventory-section/inventory-field-track-quantity.tsx
+++ b/plugins/woocommerce-admin/client/products/fills/inventory-section/inventory-field-track-quantity.tsx
@@ -6,6 +6,7 @@ import {
 	useFormContext,
 	__experimentalConditionalWrapper as ConditionalWrapper,
 } from '@woocommerce/components';
+import { getCheckboxTracks } from '@woocommerce/product-editor';
 import { Tooltip, ToggleControl } from '@wordpress/components';
 import { Product } from '@woocommerce/data';
 
@@ -13,7 +14,6 @@ import { Product } from '@woocommerce/data';
  * Internal dependencies
  */
 import { getAdminSetting } from '~/utils/admin-settings';
-import { getCheckboxTracks } from '../../sections/utils';
 
 export const InventoryTrackQuantityField = () => {
 	const { getCheckboxControlProps } = useFormContext< Product >();
diff --git a/plugins/woocommerce-admin/client/products/fills/pricing-section/pricing-field-list.tsx b/plugins/woocommerce-admin/client/products/fills/pricing-section/pricing-field-list.tsx
index 67f5c971df6b..fb089980caba 100644
--- a/plugins/woocommerce-admin/client/products/fills/pricing-section/pricing-field-list.tsx
+++ b/plugins/woocommerce-admin/client/products/fills/pricing-section/pricing-field-list.tsx
@@ -2,6 +2,7 @@
  * External dependencies
  */
 import { __ } from '@wordpress/i18n';
+import { formatCurrencyDisplayValue } from '@woocommerce/product-editor';
 import { useFormContext, Link } from '@woocommerce/components';
 import { recordEvent } from '@woocommerce/tracks';
 import { useContext } from '@wordpress/element';
@@ -18,7 +19,6 @@ import {
  * Internal dependencies
  */
 import { CurrencyInputProps } from './pricing-section-fills';
-import { formatCurrencyDisplayValue } from '../../sections/utils';
 import { CurrencyContext } from '../../../lib/currency-context';
 import { ADMIN_URL } from '~/utils/admin-settings';
 
diff --git a/plugins/woocommerce-admin/client/products/fills/pricing-section/pricing-field-sale.tsx b/plugins/woocommerce-admin/client/products/fills/pricing-section/pricing-field-sale.tsx
index 4cd274c27433..b46361f5fbf2 100644
--- a/plugins/woocommerce-admin/client/products/fills/pricing-section/pricing-field-sale.tsx
+++ b/plugins/woocommerce-admin/client/products/fills/pricing-section/pricing-field-sale.tsx
@@ -14,6 +14,7 @@ import { Product, OPTIONS_STORE_NAME } from '@woocommerce/data';
 import { useSelect } from '@wordpress/data';
 import interpolateComponents from '@automattic/interpolate-components';
 import { format as formatDate } from '@wordpress/date';
+import { formatCurrencyDisplayValue } from '@woocommerce/product-editor';
 import moment from 'moment';
 import {
 	BaseControl,
@@ -26,7 +27,6 @@ import {
  * Internal dependencies
  */
 import { CurrencyInputProps } from './pricing-section-fills';
-import { formatCurrencyDisplayValue } from '../../sections/utils';
 import { CurrencyContext } from '../../../lib/currency-context';
 
 type PricingListFieldProps = {
diff --git a/plugins/woocommerce-admin/client/products/hooks/use-product-variations-helper.ts b/plugins/woocommerce-admin/client/products/hooks/use-product-variations-helper.ts
index 0b40861f5ce7..f999a67be3e2 100644
--- a/plugins/woocommerce-admin/client/products/hooks/use-product-variations-helper.ts
+++ b/plugins/woocommerce-admin/client/products/hooks/use-product-variations-helper.ts
@@ -1,6 +1,7 @@
 /**
  * External dependencies
  */
+import { AUTO_DRAFT_NAME } from '@woocommerce/product-editor';
 import { useDispatch } from '@wordpress/data';
 import { useCallback, useState } from '@wordpress/element';
 import {
@@ -10,11 +11,6 @@ import {
 } from '@woocommerce/data';
 import { useFormContext } from '@woocommerce/components';
 
-/**
- * Internal dependencies
- */
-import { AUTO_DRAFT_NAME } from '../utils/get-product-title';
-
 export function useProductVariationsHelper() {
 	const {
 		generateProductVariations: _generateProductVariations,
diff --git a/plugins/woocommerce-admin/client/products/product-form-actions.tsx b/plugins/woocommerce-admin/client/products/product-form-actions.tsx
index 63274767afb6..19fb65153dbe 100644
--- a/plugins/woocommerce-admin/client/products/product-form-actions.tsx
+++ b/plugins/woocommerce-admin/client/products/product-form-actions.tsx
@@ -12,6 +12,7 @@ import {
 import { chevronDown, check, Icon } from '@wordpress/icons';
 import { registerPlugin } from '@wordpress/plugins';
 import { useFormContext } from '@woocommerce/components';
+import { preventLeavingProductForm } from '@woocommerce/product-editor';
 import { Product } from '@woocommerce/data';
 import { recordEvent } from '@woocommerce/tracks';
 import { navigateTo } from '@woocommerce/navigation';
@@ -24,7 +25,6 @@ import { store } from '@wordpress/viewport';
 /**
  * Internal dependencies
  */
-import { preventLeavingProductForm } from './utils/prevent-leaving-product-form';
 import usePreventLeavingPage from '~/hooks/usePreventLeavingPage';
 import { WooHeaderItem } from '~/header/utils';
 import { useProductHelper } from './use-product-helper';
diff --git a/plugins/woocommerce-admin/client/products/product-settings/product-settings.tsx b/plugins/woocommerce-admin/client/products/product-settings/product-settings.tsx
index f33d1b9d427f..26f054373108 100644
--- a/plugins/woocommerce-admin/client/products/product-settings/product-settings.tsx
+++ b/plugins/woocommerce-admin/client/products/product-settings/product-settings.tsx
@@ -11,6 +11,7 @@ import {
 	TextControl,
 } from '@wordpress/components';
 import { closeSmall, cog } from '@wordpress/icons';
+import { getCheckboxTracks } from '@woocommerce/product-editor';
 import { Product } from '@woocommerce/data';
 import { useFormContext } from '@woocommerce/components';
 import { useState } from '@wordpress/element';
@@ -18,7 +19,6 @@ import { useState } from '@wordpress/element';
 /**
  * Internal dependencies
  */
-import { getCheckboxTracks } from '../sections/utils';
 import { WooHeaderItem } from '~/header/utils';
 import './product-settings.scss';
 
diff --git a/plugins/woocommerce-admin/client/products/product-status-badge.tsx b/plugins/woocommerce-admin/client/products/product-status-badge.tsx
index c031b2e93fe5..aea5368b6e4a 100644
--- a/plugins/woocommerce-admin/client/products/product-status-badge.tsx
+++ b/plugins/woocommerce-admin/client/products/product-status-badge.tsx
@@ -7,14 +7,14 @@ import { Pill } from '@woocommerce/components';
 import { PRODUCTS_STORE_NAME, WCDataSelector } from '@woocommerce/data';
 import { useParams } from 'react-router-dom';
 import { useSelect } from '@wordpress/data';
+import {
+	getProductStatus,
+	PRODUCT_STATUS_LABELS,
+} from '@woocommerce/product-editor';
 
 /**
  * Internal dependencies
  */
-import {
-	getProductStatus,
-	PRODUCT_STATUS_LABELS,
-} from './utils/get-product-status';
 import './product-status-badge.scss';
 
 export const ProductStatusBadge: React.FC = () => {
diff --git a/plugins/woocommerce-admin/client/products/product-title.tsx b/plugins/woocommerce-admin/client/products/product-title.tsx
index 7a377c657c37..b05c6a7e5155 100644
--- a/plugins/woocommerce-admin/client/products/product-title.tsx
+++ b/plugins/woocommerce-admin/client/products/product-title.tsx
@@ -10,6 +10,11 @@ import {
 } from '@woocommerce/data';
 import { getAdminLink } from '@woocommerce/settings';
 import { getNewPath } from '@woocommerce/navigation';
+import {
+	getProductTitle,
+	getProductVariationTitle,
+	getTruncatedProductVariationTitle,
+} from '@woocommerce/product-editor';
 import { useFormContext } from '@woocommerce/components';
 import { useParams } from 'react-router-dom';
 import { useSelect } from '@wordpress/data';
@@ -17,11 +22,6 @@ import { useSelect } from '@wordpress/data';
 /**
  * Internal dependencies
  */
-import { getProductTitle } from './utils/get-product-title';
-import {
-	getProductVariationTitle,
-	getTruncatedProductVariationTitle,
-} from './utils/get-product-variation-title';
 import { ProductBreadcrumbs } from './product-breadcrumbs';
 import { ProductStatusBadge } from './product-status-badge';
 import { WooHeaderPageTitle } from '~/header/utils';
diff --git a/plugins/woocommerce-admin/client/products/product-variation-form-actions.tsx b/plugins/woocommerce-admin/client/products/product-variation-form-actions.tsx
index f059f1bf4aae..d4c029837465 100644
--- a/plugins/woocommerce-admin/client/products/product-variation-form-actions.tsx
+++ b/plugins/woocommerce-admin/client/products/product-variation-form-actions.tsx
@@ -7,6 +7,7 @@ import {
 	EXPERIMENTAL_PRODUCT_VARIATIONS_STORE_NAME,
 	ProductVariation,
 } from '@woocommerce/data';
+import { preventLeavingProductForm } from '@woocommerce/product-editor';
 import { registerPlugin } from '@wordpress/plugins';
 import { useDispatch } from '@wordpress/data';
 import { useFormContext } from '@woocommerce/components';
@@ -16,7 +17,6 @@ import { useState } from '@wordpress/element';
 /**
  * Internal dependencies
  */
-import { preventLeavingProductForm } from './utils/prevent-leaving-product-form';
 import usePreventLeavingPage from '~/hooks/usePreventLeavingPage';
 import { WooHeaderItem } from '~/header/utils';
 import './product-form-actions.scss';
diff --git a/plugins/woocommerce-admin/client/products/sections/product-variation-details-section.tsx b/plugins/woocommerce-admin/client/products/sections/product-variation-details-section.tsx
index 7886d844bb16..6b0687d8c6d3 100644
--- a/plugins/woocommerce-admin/client/products/sections/product-variation-details-section.tsx
+++ b/plugins/woocommerce-admin/client/products/sections/product-variation-details-section.tsx
@@ -9,6 +9,7 @@ import {
 	CardBody,
 	BaseControl,
 } from '@wordpress/components';
+import { getCheckboxTracks } from '@woocommerce/product-editor';
 import { MediaItem } from '@wordpress/media-utils';
 import {
 	useFormContext,
@@ -21,7 +22,6 @@ import { useState } from '@wordpress/element';
 /**
  * Internal dependencies
  */
-import { getCheckboxTracks } from './utils';
 import { ProductSectionLayout } from '../layout/product-section-layout';
 import { SingleImageField } from '../fields/single-image-field';
 
diff --git a/plugins/woocommerce-admin/client/products/sections/utils.ts b/plugins/woocommerce-admin/client/products/sections/utils.ts
deleted file mode 100644
index ab56552bcf6d..000000000000
--- a/plugins/woocommerce-admin/client/products/sections/utils.ts
+++ /dev/null
@@ -1,81 +0,0 @@
-/**
- * External dependencies
- */
-import { ChangeEvent } from 'react';
-import { Product } from '@woocommerce/data';
-import { recordEvent } from '@woocommerce/tracks';
-
-/**
- * Internal dependencies
- */
-import { NUMBERS_AND_ALLOWED_CHARS } from '../constants';
-
-type CurrencyConfig = {
-	code: string;
-	symbol: string;
-	symbolPosition: string;
-	decimalSeparator: string;
-	priceFormat: string;
-	thousandSeparator: string;
-	precision: number;
-};
-
-/**
- * Get additional props to be passed to all checkbox inputs.
- *
- * @param name Name of the checkbox.
- * @return Props.
- */
-export function getCheckboxTracks< T = Product >( name: string ) {
-	return {
-		onChange: (
-			isChecked: ChangeEvent< HTMLInputElement > | T[ keyof T ]
-		) => {
-			recordEvent( `product_checkbox_${ name }`, {
-				checked: isChecked,
-			} );
-		},
-	};
-}
-
-/**
- * Get input props for currency related values and symbol positions.
- *
- * @param {Object} currencyConfig - Currency context
- * @return {Object} Props.
- */
-export const getCurrencySymbolProps = ( currencyConfig: CurrencyConfig ) => {
-	const { symbol, symbolPosition } = currencyConfig;
-	const currencyPosition = symbolPosition.includes( 'left' )
-		? 'prefix'
-		: 'suffix';
-
-	return {
-		[ currencyPosition ]: symbol,
-	};
-};
-
-/**
- * Cleans and formats the currency value shown to the user.
- *
- * @param {string} value          Form value.
- * @param {Object} currencyConfig Currency context.
- * @return {string} Display value.
- */
-export const formatCurrencyDisplayValue = (
-	value: string,
-	currencyConfig: CurrencyConfig,
-	format: ( number: number | string ) => string
-) => {
-	const { decimalSeparator, thousandSeparator } = currencyConfig;
-
-	const regex = new RegExp(
-		NUMBERS_AND_ALLOWED_CHARS.replace( '%s1', decimalSeparator ).replace(
-			'%s2',
-			thousandSeparator
-		),
-		'g'
-	);
-
-	return value === undefined ? value : format( value ).replace( regex, '' );
-};
diff --git a/plugins/woocommerce-admin/client/products/use-product-helper.ts b/plugins/woocommerce-admin/client/products/use-product-helper.ts
index d40129be55b7..57d02daf7112 100644
--- a/plugins/woocommerce-admin/client/products/use-product-helper.ts
+++ b/plugins/woocommerce-admin/client/products/use-product-helper.ts
@@ -2,6 +2,10 @@
  * External dependencies
  */
 import { __ } from '@wordpress/i18n';
+import {
+	AUTO_DRAFT_NAME,
+	getDerivedProductType,
+} from '@woocommerce/product-editor';
 import { useDispatch } from '@wordpress/data';
 import { useCallback, useContext, useState } from '@wordpress/element';
 import * as WooNumber from '@woocommerce/number';
@@ -20,9 +24,7 @@ import { recordEvent } from '@woocommerce/tracks';
 /**
  * Internal dependencies
  */
-import { AUTO_DRAFT_NAME } from './utils/get-product-title';
 import { CurrencyContext } from '../lib/currency-context';
-import { getDerivedProductType } from './utils/get-derived-product-type';
 import {
 	NUMBERS_AND_DECIMAL_SEPARATOR,
 	ONLY_ONE_DECIMAL_SEPARATOR,
diff --git a/plugins/woocommerce/changelog/update-36719 b/plugins/woocommerce/changelog/update-36719
new file mode 100644
index 000000000000..896dc558a69e
--- /dev/null
+++ b/plugins/woocommerce/changelog/update-36719
@@ -0,0 +1,4 @@
+Significance: minor
+Type: dev
+
+Move product utils into product editor package
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 5f3b91b64a37..bf50de3b1ef8 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1291,18 +1291,24 @@ importers:
 
   packages/js/product-editor:
     specifiers:
+      '@types/react': ^17.0.2
       '@types/wordpress__components': ^19.10.1
       '@woocommerce/components': workspace:*
+      '@woocommerce/data': workspace:^4.1.0
       '@woocommerce/eslint-plugin': workspace:*
       '@woocommerce/internal-style-build': workspace:*
+      '@woocommerce/tracks': workspace:^1.3.0
       '@wordpress/browserslist-config': ^4.1.1
       '@wordpress/components': ^19.5.0
       '@wordpress/element': ^4.1.1
+      '@wordpress/i18n': ^4.26.0
       css-loader: ^3.6.0
       eslint: ^8.32.0
       jest: ^27.5.1
       jest-cli: ^27.5.1
       postcss-loader: ^3.0.0
+      react: ^17.0.2
+      react-router-dom: ^6.3.0
       sass-loader: ^10.2.1
       ts-jest: ^27.1.3
       typescript: ^4.8.3
@@ -1310,9 +1316,14 @@ importers:
       webpack-cli: ^3.3.12
     dependencies:
       '@woocommerce/components': link:../components
-      '@wordpress/components': 19.12.0_rysvg2ttzfworbkpz2ftlx73d4
+      '@woocommerce/data': link:../data
+      '@woocommerce/tracks': link:../tracks
+      '@wordpress/components': 19.12.0_y6y2satmlys6ddgpljj6f5uzae
       '@wordpress/element': 4.20.0
+      '@wordpress/i18n': 4.26.0
+      react-router-dom: 6.3.0_prpqlkd37azqwypxturxi7uyci
     devDependencies:
+      '@types/react': 17.0.50
       '@types/wordpress__components': 19.10.1_prpqlkd37azqwypxturxi7uyci
       '@woocommerce/eslint-plugin': link:../eslint-plugin
       '@woocommerce/internal-style-build': link:../internal-style-build
@@ -1322,6 +1333,7 @@ importers:
       jest: 27.5.1
       jest-cli: 27.5.1
       postcss-loader: 3.0.0
+      react: 17.0.2
       sass-loader: 10.2.1_webpack@5.70.0
       ts-jest: 27.1.3_77oryishcckaigojnzbhxsiona
       typescript: 4.8.4
@@ -7749,7 +7761,7 @@ packages:
     dependencies:
       '@floating-ui/core': 1.0.1
 
-  /@floating-ui/react-dom/0.6.3_hiunvzosbwliizyirxfy6hjyim:
+  /@floating-ui/react-dom/0.6.3_eh3i7lxcgsnewksy5lf2odhkg4:
     resolution: {integrity: sha512-hC+pS5D6AgS2wWjbmSQ6UR6Kpy+drvWGJIri6e1EDGADTPsCaa4KzCgmCczHrQeInx9tqs81EyDmbKJYY2swKg==}
     peerDependencies:
       react: '>=16.8.0'
@@ -7757,13 +7769,13 @@ packages:
     dependencies:
       '@floating-ui/dom': 0.4.5
       react: 17.0.2
-      react-dom: 17.0.2_react@17.0.2
+      react-dom: 16.14.0_react@17.0.2
       use-isomorphic-layout-effect: 1.1.1_pxzommwrsowkd4kgag6q3sluym
     transitivePeerDependencies:
       - '@types/react'
     dev: false
 
-  /@floating-ui/react-dom/0.6.3_prpqlkd37azqwypxturxi7uyci:
+  /@floating-ui/react-dom/0.6.3_hiunvzosbwliizyirxfy6hjyim:
     resolution: {integrity: sha512-hC+pS5D6AgS2wWjbmSQ6UR6Kpy+drvWGJIri6e1EDGADTPsCaa4KzCgmCczHrQeInx9tqs81EyDmbKJYY2swKg==}
     peerDependencies:
       react: '>=16.8.0'
@@ -7771,8 +7783,8 @@ packages:
     dependencies:
       '@floating-ui/dom': 0.4.5
       react: 17.0.2
-      react-dom: 16.14.0_react@17.0.2
-      use-isomorphic-layout-effect: 1.1.1_react@17.0.2
+      react-dom: 17.0.2_react@17.0.2
+      use-isomorphic-layout-effect: 1.1.1_pxzommwrsowkd4kgag6q3sluym
     transitivePeerDependencies:
       - '@types/react'
     dev: false
@@ -14362,7 +14374,7 @@ packages:
     dependencies:
       '@babel/runtime': 7.19.0
       '@wordpress/dom-ready': 3.19.0
-      '@wordpress/i18n': 4.19.0
+      '@wordpress/i18n': 4.26.0
 
   /@wordpress/a11y/3.4.1:
     resolution: {integrity: sha512-SjeLO8x/Y/QAcKBrvyJiu8KVAPckRLNwuFfgX7zCGM8vBfg+Depj94Hp55ARLjq0oXHg7EWKxSdzNkvmTz8AIA==}
@@ -14946,7 +14958,7 @@ packages:
       - react-with-direction
     dev: false
 
-  /@wordpress/components/19.12.0_rysvg2ttzfworbkpz2ftlx73d4:
+  /@wordpress/components/19.12.0_tufdcic6wklrwyy3rhbsbktylu:
     resolution: {integrity: sha512-Ac1+aIMM7NDgN3G7i5kcaETSvZfeqB4U6PubApPmM6FdBF5VfkYUZeqNcC7cuJdveyokRrqHg11/l+DcJGA7/g==}
     engines: {node: '>=12'}
     peerDependencies:
@@ -14956,11 +14968,11 @@ packages:
       '@babel/runtime': 7.19.0
       '@emotion/cache': 11.10.5
       '@emotion/css': 11.7.1_@babel+core@7.17.8
-      '@emotion/react': 11.10.5_mcptgafjogap2nfvnfqvfwh6uu
+      '@emotion/react': 11.10.5_lvgioobbs7lf3pr6y4xfpughau
       '@emotion/serialize': 1.1.1
-      '@emotion/styled': 11.8.1_c2qm47vaialpqni522adyu6za4
+      '@emotion/styled': 11.8.1_hhesyqfwklnojgamcachhyxace
       '@emotion/utils': 1.0.0
-      '@floating-ui/react-dom': 0.6.3_prpqlkd37azqwypxturxi7uyci
+      '@floating-ui/react-dom': 0.6.3_hiunvzosbwliizyirxfy6hjyim
       '@use-gesture/react': 10.2.10_react@17.0.2
       '@wordpress/a11y': 3.19.0
       '@wordpress/compose': 5.17.0_react@17.0.2
@@ -14981,18 +14993,18 @@ packages:
       colord: 2.9.2
       dom-scroll-into-view: 1.2.1
       downshift: 6.1.12_react@17.0.2
-      framer-motion: 6.2.8_prpqlkd37azqwypxturxi7uyci
+      framer-motion: 6.2.8_sfoxds7t5ydpegc3knd667wn6m
       gradient-parser: 0.1.5
       highlight-words-core: 1.2.2
       lodash: 4.17.21
       memize: 1.1.0
       moment: 2.29.1
-      re-resizable: 6.9.5_prpqlkd37azqwypxturxi7uyci
+      re-resizable: 6.9.5_sfoxds7t5ydpegc3knd667wn6m
       react: 17.0.2
-      react-colorful: 5.5.1_prpqlkd37azqwypxturxi7uyci
-      react-dates: 21.8.0_itvjtpkzdblwka3tnmrs5t5e6y
-      react-dom: 16.14.0_react@17.0.2
-      reakit: 1.3.11_prpqlkd37azqwypxturxi7uyci
+      react-colorful: 5.5.1_sfoxds7t5ydpegc3knd667wn6m
+      react-dates: 21.8.0_ruqm5uqcpfavftrrblmrkdsf44
+      react-dom: 17.0.2_react@17.0.2
+      reakit: 1.3.11_sfoxds7t5ydpegc3knd667wn6m
       uuid: 8.3.2
     transitivePeerDependencies:
       - '@babel/core'
@@ -15000,7 +15012,7 @@ packages:
       - react-with-direction
     dev: false
 
-  /@wordpress/components/19.12.0_tufdcic6wklrwyy3rhbsbktylu:
+  /@wordpress/components/19.12.0_y6y2satmlys6ddgpljj6f5uzae:
     resolution: {integrity: sha512-Ac1+aIMM7NDgN3G7i5kcaETSvZfeqB4U6PubApPmM6FdBF5VfkYUZeqNcC7cuJdveyokRrqHg11/l+DcJGA7/g==}
     engines: {node: '>=12'}
     peerDependencies:
@@ -15014,7 +15026,7 @@ packages:
       '@emotion/serialize': 1.1.1
       '@emotion/styled': 11.8.1_hhesyqfwklnojgamcachhyxace
       '@emotion/utils': 1.0.0
-      '@floating-ui/react-dom': 0.6.3_hiunvzosbwliizyirxfy6hjyim
+      '@floating-ui/react-dom': 0.6.3_eh3i7lxcgsnewksy5lf2odhkg4
       '@use-gesture/react': 10.2.10_react@17.0.2
       '@wordpress/a11y': 3.19.0
       '@wordpress/compose': 5.17.0_react@17.0.2
@@ -15024,7 +15036,7 @@ packages:
       '@wordpress/element': 4.20.0
       '@wordpress/escape-html': 2.22.0
       '@wordpress/hooks': 3.19.0
-      '@wordpress/i18n': 4.19.0
+      '@wordpress/i18n': 4.26.0
       '@wordpress/icons': 9.10.0
       '@wordpress/is-shallow-equal': 4.19.0
       '@wordpress/keycodes': 3.19.0
@@ -15035,18 +15047,18 @@ packages:
       colord: 2.9.2
       dom-scroll-into-view: 1.2.1
       downshift: 6.1.12_react@17.0.2
-      framer-motion: 6.2.8_sfoxds7t5ydpegc3knd667wn6m
+      framer-motion: 6.2.8_prpqlkd37azqwypxturxi7uyci
       gradient-parser: 0.1.5
       highlight-words-core: 1.2.2
       lodash: 4.17.21
       memize: 1.1.0
       moment: 2.29.1
-      re-resizable: 6.9.5_sfoxds7t5ydpegc3knd667wn6m
+      re-resizable: 6.9.5_prpqlkd37azqwypxturxi7uyci
       react: 17.0.2
-      react-colorful: 5.5.1_sfoxds7t5ydpegc3knd667wn6m
-      react-dates: 21.8.0_ruqm5uqcpfavftrrblmrkdsf44
-      react-dom: 17.0.2_react@17.0.2
-      reakit: 1.3.11_sfoxds7t5ydpegc3knd667wn6m
+      react-colorful: 5.5.1_prpqlkd37azqwypxturxi7uyci
+      react-dates: 21.8.0_itvjtpkzdblwka3tnmrs5t5e6y
+      react-dom: 16.14.0_react@17.0.2
+      reakit: 1.3.11_prpqlkd37azqwypxturxi7uyci
       uuid: 8.3.2
     transitivePeerDependencies:
       - '@babel/core'
@@ -16067,6 +16079,12 @@ packages:
       '@babel/runtime': 7.19.0
     dev: false
 
+  /@wordpress/hooks/3.26.0:
+    resolution: {integrity: sha512-NYFnKttKLdkr7OZMqqRgsuQy1LMHjK7tkrGO9NWgrGkvwsaWEIn0hI65za9/TJnUccEBMwl9knsiGA4Fwe7dAA==}
+    engines: {node: '>=12'}
+    dependencies:
+      '@babel/runtime': 7.19.0
+
   /@wordpress/hooks/3.4.1:
     resolution: {integrity: sha512-+RODEvxNsx3KW5nvk4KbnYMNFYvWA4Fduf784Ht7PJoL2L3z63Wm2blRh7a21hDEFHGPgWkne0f3Fgr/dqalHA==}
     engines: {node: '>=12'}
@@ -16146,6 +16164,18 @@ packages:
       sprintf-js: 1.1.2
       tannin: 1.2.0
 
+  /@wordpress/i18n/4.26.0:
+    resolution: {integrity: sha512-W94aIByO+3YraI7fJbk+3STnz3e0hhrtBPPjKK1XvT4+3RZiKPaVN2Y8mvCCknbaAILCT+CixUBJOgq6m6bwjQ==}
+    engines: {node: '>=12'}
+    hasBin: true
+    dependencies:
+      '@babel/runtime': 7.19.0
+      '@wordpress/hooks': 3.26.0
+      gettext-parser: 1.4.0
+      memize: 1.1.0
+      sprintf-js: 1.1.2
+      tannin: 1.2.0
+
   /@wordpress/i18n/4.4.1:
     resolution: {integrity: sha512-cDD3dxynq0P+HwB1dwUD2xpmjTr55oyuB0Mybcr8N4sTrbl/bDj5VRrh8bdps7KSqIdM4OuMtxJKLbg3y5CktA==}
     engines: {node: '>=12'}
@@ -16393,7 +16423,7 @@ packages:
     engines: {node: '>=12'}
     dependencies:
       '@babel/runtime': 7.19.0
-      '@wordpress/i18n': 4.19.0
+      '@wordpress/i18n': 4.26.0
       change-case: 4.1.2
       lodash: 4.17.21
 
@@ -16730,7 +16760,7 @@ packages:
       '@wordpress/deprecated': 3.19.0
       '@wordpress/element': 4.20.0
       '@wordpress/escape-html': 2.22.0
-      '@wordpress/i18n': 4.19.0
+      '@wordpress/i18n': 4.26.0
       '@wordpress/keycodes': 3.19.0
       memize: 1.1.0
       react: 17.0.2
@@ -25625,7 +25655,7 @@ packages:
   /history/5.3.0:
     resolution: {integrity: sha512-ZqaKwjjrAYUYfLG+htGaIIZ4nioX2L70ZUMIFysS3xvBsSG4x/n1V6TXV3N8ZYNuFGlDirFg32T7B6WOUPDYcQ==}
     dependencies:
-      '@babel/runtime': 7.17.7
+      '@babel/runtime': 7.19.0
 
   /hjson/1.8.4:
     resolution: {integrity: sha1-C8j/sCGY0hjEm1iZGxH2BIUBHTY=}
@@ -39168,6 +39198,7 @@ packages:
         optional: true
     dependencies:
       react: 17.0.2
+    dev: true
 
   /use-latest/1.2.0_pxzommwrsowkd4kgag6q3sluym:
     resolution: {integrity: sha512-d2TEuG6nSLKQLAfW3By8mKr8HurOlTkul0sOpxbClIv4SQ4iOd7BYr7VIzdbktUCnv7dua/60xzd8igMU6jmyw==}

From 756fe32c048a6c8e4e81d33147398340e93adc84 Mon Sep 17 00:00:00 2001
From: Fernando Marichal <fernando.marichal@automattic.com>
Date: Thu, 23 Feb 2023 15:49:24 -0300
Subject: [PATCH 22/22] Create spotlight on analytics revenue report (#36653)

* Add `RevenueReportDateTour` component

* Add changelog

* Fix styles

* Rename RevenueReportDateTour to ReportDateTour to use it in two different reports: Orders and Revenue

* Change default sort date to date_paid

# Conflicts:
#	plugins/woocommerce/src/Admin/API/Reports/Orders/Stats/DataStore.php

* Update changelog

* Assign date_column_name before calling parent constructor

* Remove date_type default value from configuration and show tour only if user didn't assign a value

---------

Co-authored-by: Fernando Marichal <contacto@fernandomarichal.com>
Co-authored-by: Nathan Schneider <nsschneider1@gmail.com>
---
 .../client/analytics/report/orders/index.js   |   9 ++
 .../client/analytics/report/revenue/index.js  |   9 ++
 .../client/analytics/settings/config.js       |   6 +-
 .../client/guided-tours/report-date-tour.scss |   7 ++
 .../client/guided-tours/report-date-tour.tsx  | 100 ++++++++++++++++++
 ...pdate-35887_spotlight_on_analytics_revenue |   4 +
 .../API/Reports/Orders/Stats/DataStore.php    |   2 +-
 .../src/Internal/Admin/Settings.php           |   1 -
 8 files changed, 135 insertions(+), 3 deletions(-)
 create mode 100644 plugins/woocommerce-admin/client/guided-tours/report-date-tour.scss
 create mode 100644 plugins/woocommerce-admin/client/guided-tours/report-date-tour.tsx
 create mode 100644 plugins/woocommerce/changelog/update-35887_spotlight_on_analytics_revenue

diff --git a/plugins/woocommerce-admin/client/analytics/report/orders/index.js b/plugins/woocommerce-admin/client/analytics/report/orders/index.js
index 93358fb841b2..d447aa0e4ebf 100644
--- a/plugins/woocommerce-admin/client/analytics/report/orders/index.js
+++ b/plugins/woocommerce-admin/client/analytics/report/orders/index.js
@@ -3,6 +3,7 @@
  */
 import { Component, Fragment } from '@wordpress/element';
 import PropTypes from 'prop-types';
+import { __ } from '@wordpress/i18n';
 
 /**
  * Internal dependencies
@@ -13,6 +14,7 @@ import OrdersReportTable from './table';
 import ReportChart from '../../components/report-chart';
 import ReportSummary from '../../components/report-summary';
 import ReportFilters from '../../components/report-filters';
+import { ReportDateTour } from '~/guided-tours/report-date-tour';
 
 export default class OrdersReport extends Component {
 	render() {
@@ -49,6 +51,13 @@ export default class OrdersReport extends Component {
 					filters={ filters }
 					advancedFilters={ advancedFilters }
 				/>
+				<ReportDateTour
+					optionName="woocommerce_orders_report_date_tour_shown"
+					headingText={ __(
+						'Orders are now reported based on the payment dates ✅',
+						'woocommerce'
+					) }
+				/>
 			</Fragment>
 		);
 	}
diff --git a/plugins/woocommerce-admin/client/analytics/report/revenue/index.js b/plugins/woocommerce-admin/client/analytics/report/revenue/index.js
index f7a68728bac7..18f604222a12 100644
--- a/plugins/woocommerce-admin/client/analytics/report/revenue/index.js
+++ b/plugins/woocommerce-admin/client/analytics/report/revenue/index.js
@@ -3,6 +3,7 @@
  */
 import { Component, Fragment } from '@wordpress/element';
 import PropTypes from 'prop-types';
+import { __ } from '@wordpress/i18n';
 
 /**
  * Internal dependencies
@@ -13,6 +14,7 @@ import ReportChart from '../../components/report-chart';
 import ReportSummary from '../../components/report-summary';
 import RevenueReportTable from './table';
 import ReportFilters from '../../components/report-filters';
+import { ReportDateTour } from '~/guided-tours/report-date-tour';
 
 export default class RevenueReport extends Component {
 	render() {
@@ -49,6 +51,13 @@ export default class RevenueReport extends Component {
 					filters={ filters }
 					advancedFilters={ advancedFilters }
 				/>
+				<ReportDateTour
+					optionName="woocommerce_revenue_report_date_tour_shown"
+					headingText={ __(
+						'Revenue is now reported from paid orders ✅',
+						'woocommerce'
+					) }
+				/>
 			</Fragment>
 		);
 	}
diff --git a/plugins/woocommerce-admin/client/analytics/settings/config.js b/plugins/woocommerce-admin/client/analytics/settings/config.js
index 1de8237aa9f2..4ecc1e39c02a 100644
--- a/plugins/woocommerce-admin/client/analytics/settings/config.js
+++ b/plugins/woocommerce-admin/client/analytics/settings/config.js
@@ -123,6 +123,11 @@ export const config = applyFilters( SETTINGS_FILTER, {
 		label: __( 'Date type:', 'woocommerce' ),
 		inputType: 'select',
 		options: [
+			{
+				label: __( 'Select a date type', 'woocommerce' ),
+				value: '',
+				disabled: true,
+			},
 			{
 				label: __( 'Date created', 'woocommerce' ),
 				value: 'date_created',
@@ -143,6 +148,5 @@ export const config = applyFilters( SETTINGS_FILTER, {
 			'Database date field considered for Revenue and Orders reports',
 			'woocommerce'
 		),
-		defaultValue: 'date_created',
 	},
 } );
diff --git a/plugins/woocommerce-admin/client/guided-tours/report-date-tour.scss b/plugins/woocommerce-admin/client/guided-tours/report-date-tour.scss
new file mode 100644
index 000000000000..c99748afa846
--- /dev/null
+++ b/plugins/woocommerce-admin/client/guided-tours/report-date-tour.scss
@@ -0,0 +1,7 @@
+.woocommerce-revenue-report-date-tour {
+	h2.woocommerce-tour-kit-step__heading {
+		font-size: 1.5em;
+		line-height: 1.5em;
+		letter-spacing: 0.4px;
+	}
+}
diff --git a/plugins/woocommerce-admin/client/guided-tours/report-date-tour.tsx b/plugins/woocommerce-admin/client/guided-tours/report-date-tour.tsx
new file mode 100644
index 000000000000..65fc92327e24
--- /dev/null
+++ b/plugins/woocommerce-admin/client/guided-tours/report-date-tour.tsx
@@ -0,0 +1,100 @@
+/**
+ * External dependencies
+ */
+import { TourKit, TourKitTypes } from '@woocommerce/components';
+import { __ } from '@wordpress/i18n';
+import { OPTIONS_STORE_NAME } from '@woocommerce/data';
+import {
+	createElement,
+	createInterpolateElement,
+	useState,
+} from '@wordpress/element';
+import { useSelect, useDispatch } from '@wordpress/data';
+import { getAdminLink } from '@woocommerce/settings';
+
+/**
+ * Internal dependencies
+ */
+import './report-date-tour.scss';
+
+const DATE_TYPE_OPTION = 'woocommerce_date_type';
+
+export const ReportDateTour: React.FC< {
+	optionName: string;
+	headingText: string;
+} > = ( { optionName, headingText } ) => {
+	const [ isDismissed, setIsDismissed ] = useState( false );
+	const { updateOptions } = useDispatch( OPTIONS_STORE_NAME );
+
+	const { shouldShowTour, isResolving } = useSelect( ( select ) => {
+		const { getOption, hasFinishedResolution } =
+			select( OPTIONS_STORE_NAME );
+		return {
+			shouldShowTour:
+				getOption( optionName ) !== 'yes' &&
+				getOption( DATE_TYPE_OPTION ) === false,
+			isResolving: ! (
+				hasFinishedResolution( 'getOption', [ optionName ] ) &&
+				hasFinishedResolution( 'getOption', [ DATE_TYPE_OPTION ] )
+			),
+		};
+	} );
+
+	if ( isDismissed || ! shouldShowTour || isResolving ) {
+		return null;
+	}
+
+	const config: TourKitTypes.WooConfig = {
+		steps: [
+			{
+				referenceElements: {
+					desktop:
+						'.woocommerce-filters-filter > .components-dropdown',
+				},
+				focusElement: {
+					desktop:
+						'.woocommerce-filters-filter > .components-dropdown',
+				},
+				meta: {
+					name: 'product-feedback-',
+					heading: headingText,
+					descriptions: {
+						desktop: createInterpolateElement(
+							__(
+								'We now collect orders in this table based on when the payment went through, rather than when they were placed. You can change this in <link>settings</link>.',
+								'woocommerce'
+							),
+							{
+								link: createElement( 'a', {
+									href: getAdminLink(
+										'admin.php?page=wc-admin&path=/analytics/settings'
+									),
+									'aria-label': __(
+										'Analytics date settings',
+										'woocommerce'
+									),
+								} ),
+							}
+						),
+					},
+					primaryButton: {
+						text: __( 'Got it', 'woocommerce' ),
+					},
+				},
+				options: {
+					classNames: {
+						desktop: 'woocommerce-revenue-report-date-tour',
+					},
+				},
+			},
+		],
+		closeHandler: () => {
+			updateOptions( {
+				[ optionName ]: 'yes',
+			} );
+			setIsDismissed( true );
+		},
+	};
+
+	return <TourKit config={ config } />;
+};
diff --git a/plugins/woocommerce/changelog/update-35887_spotlight_on_analytics_revenue b/plugins/woocommerce/changelog/update-35887_spotlight_on_analytics_revenue
new file mode 100644
index 000000000000..49596b65370f
--- /dev/null
+++ b/plugins/woocommerce/changelog/update-35887_spotlight_on_analytics_revenue
@@ -0,0 +1,4 @@
+Significance: major
+Type: update
+
+Change the default date used on Revenue and Orders report to 'date_paid' and create spotlight on both reports
diff --git a/plugins/woocommerce/src/Admin/API/Reports/Orders/Stats/DataStore.php b/plugins/woocommerce/src/Admin/API/Reports/Orders/Stats/DataStore.php
index 6902dee9eafe..53ab9ad08c7d 100644
--- a/plugins/woocommerce/src/Admin/API/Reports/Orders/Stats/DataStore.php
+++ b/plugins/woocommerce/src/Admin/API/Reports/Orders/Stats/DataStore.php
@@ -73,7 +73,7 @@ class DataStore extends ReportsDataStore implements DataStoreInterface {
 	 * Dynamically sets the date column name based on configuration
 	 */
 	public function __construct() {
-		$this->date_column_name = get_option( 'woocommerce_date_type', 'date_created' );
+		$this->date_column_name = get_option( 'woocommerce_date_type', 'date_paid' );
 		parent::__construct();
 	}
 
diff --git a/plugins/woocommerce/src/Internal/Admin/Settings.php b/plugins/woocommerce/src/Internal/Admin/Settings.php
index 772e43831347..516fb1f294b2 100644
--- a/plugins/woocommerce/src/Internal/Admin/Settings.php
+++ b/plugins/woocommerce/src/Internal/Admin/Settings.php
@@ -293,7 +293,6 @@ public function add_settings( $settings ) {
 			'option_key'  => 'woocommerce_date_type',
 			'label'       => __( 'Date Type', 'woocommerce' ),
 			'description' => __( 'Database date field considered for Revenue and Orders reports', 'woocommerce' ),
-			'default'     => 'date_created',
 			'type'        => 'select',
 			'options'     => array(
 				'date_created'   => 'date_created',