Merge pull request #31 from godaddy-wordpress/mwc-11022/hpos-compatibility

HPOS support in Extra Product Sorting Options

Author: unfulvio-godaddy

.editorconfig

@@ -0,0 +1,21 @@
+# This file is for unifying the coding style for different editors and IDEs
+# editorconfig.org
+
+# WordPress Coding Standards
+# http://make.wordpress.org/core/handbook/coding-standards/
+
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+indent_style = tab
+
+[{.jshintrc,*.json,*.toml,*.yml}]
+indent_style = space
+indent_size = 2
+
+[{*.txt}]
+end_of_line = crlf

includes/class-wc-eso-customizer-checkbox-multiple.php

@@ -19,7 +19,7 @@
  *  upon which this class is based.
  *
  * @author    SkyVerge
- * @copyright Copyright (c) 2014-2021, SkyVerge, Inc.
+ * @copyright Copyright (c) 2014-2023, SkyVerge, Inc.
  * @license   http://www.gnu.org/licenses/gpl-3.0.html GNU General Public License v3.0
  */
 

readme.md

@@ -6,8 +6,8 @@ Extra Product Sorting Options for WooCommerce provides options that extend the d
 
 ### Requirements
 
- - WooCommerce 3.0.9 or newer
- - WordPress 4.4 or newer
+ - WooCommerce 3.9.4 or newer
+ - WordPress 5.6 or newer
 
 ### Quick links & info
 

readme.txt

@@ -2,10 +2,10 @@
 Contributors: skyverge, beka.rice, tamarazuk
 Tags: woocommerce, sorting, product sorting, orderby
 Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&[email protected]&item_name=Donation+for+WooCommerce+Extra+Product+Sorting
-Requires at least: 4.4
+Requires at least: 5.6
 Tested up to: 6.0.1
-Stable Tag: 2.9.1
-Requires PHP: 5.6
+Stable Tag: 2.10.0-dev.1
+Requires PHP: 7.4
 License: GPLv3
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
 
@@ -15,7 +15,7 @@ Rename the default product sorting option, add up to 5 new sorting options inclu
 
 Extra Product Sorting Options for WooCommerce provides options that extend the default WooCommerce orderby options on the shop page. You can optionally set a new name for the default sorting (helpful if you've used this to create a custom sorting order), and can enable up to **5 new sorting options**: alphabetical, reverse alphabetical, on sale, review count, and availability product sorting. You can also remove core sorting options, or remove the sorting dropdown completely.
 
-> **Requires: PHP 5.6, WooCommerce 3.5+ and WordPress 4.4+**
+> **Requires: PHP 7.4, WooCommerce 3.9+ and WordPress 5.6+**
 
 = Features =
 Includes options to:
@@ -90,6 +90,10 @@ Yes you can! Join in on our [GitHub repository](https://github.com/skyverge/wooc
 
 == Changelog ==
 
+= 2023.nn.nn - version 2.10.0-dev.1 =
+ * Misc - Add compatibility for WooCommerce High Performance Order Storage (HPOS)
+ * Misc - Require PHP 7.4+, WordPress 5.6+ and WooCommerce 3.9+
+
 = 2022.07.31 - version 2.9.1 =
  * Misc - Rename to Extra Product Sorting Options for WooCommerce
 

woocommerce-extra-product-sorting-options.php

@@ -5,21 +5,21 @@
  * Description: Rename default sorting and optionally extra product sorting options.
  * Author: SkyVerge
  * Author URI: http://www.skyverge.com/
- * Version: 2.9.1
+ * Version: 2.10.0-dev.1
  * Text Domain: woocommerce-extra-product-sorting-options
  * Domain Path: /i18n/languages/
  *
- * Copyright: (c) 2014-2021, SkyVerge, Inc. ([email protected])
+ * Copyright: (c) 2014-2023, SkyVerge, Inc. ([email protected])
  *
  * License: GNU General Public License v3.0
  * License URI: http://www.gnu.org/licenses/gpl-3.0.html
  *
  * @author    SkyVerge
  * @category  Admin
- * @copyright Copyright (c) 2014-2021, SkyVerge, Inc.
+ * @copyright Copyright (c) 2014-2023, SkyVerge, Inc.
  * @license   http://www.gnu.org/licenses/gpl-3.0.html GNU General Public License v3.0
  *
- * WC requires at least: 3.5.0
+ * WC requires at least: 3.9.4
  * WC tested up to: 6.7.0
  */
 
@@ -43,10 +43,10 @@ class WC_Extra_Sorting_Options {
 
 
 	/** plugin version number */
-	const VERSION = '2.9.1';
+	const VERSION = '2.10.0-dev.1';
 
 	/** required WooCommerce version number */
-	const MIN_WOOCOMMERCE_VERSION = '3.5.0';
+	const MIN_WOOCOMMERCE_VERSION = '3.9.4';
 
 	/** @var WC_Extra_Sorting_Options single instance of this plugin */
 	protected static $instance;
@@ -87,25 +87,26 @@ public function __construct() {
 			// run every time
 			$this->install();
 		}
+
+		// handle HPOS compatibility
+		add_action( 'before_woocommerce_init', [ $this, 'handle_hpos_compatibility' ] );
 	}
 
 
 	/**
-	 * Adds Settings to WooCommerce Settings > Products page after "Default Product Sorting" setting.
+	 * Declares HPOS compatibility.
 	 *
-	 * @since 1.0.0
-	 * @deprecated 2.9.0
+	 * @since 2.10.0-dev.1
 	 *
-	 * @TODO remove this deprecated method by April 2022 or by version 3.0.0 {FN 2021-04-14}
+	 * @internal
 	 *
-	 * @param array $settings the current product settings
-	 * @return array updated settings
+	 * @return void
 	 */
-	public function add_settings( $settings ) {
-
-		wc_deprecated_function( __METHOD__ ,'2.9.0' );
-
-		return $settings;
+	public function handle_hpos_compatibility()
+	{
+		if ( class_exists(\Automattic\WooCommerce\Utilities\FeaturesUtil::class ) ) {
+			\Automattic\WooCommerce\Utilities\FeaturesUtil::declare_compatibility( 'custom_order_tables', plugin_basename( __FILE__ ), true );
+		}
 	}
 
 
@@ -232,24 +233,6 @@ public function sanitize_option_list( $values ) {
 	}
 
 
-	/**
-	 * Gets the set of settings options.
-	 *
-	 * @since 2.7.0
-	 * @deprecated 2.9.0
-	 *
-	 * @TODO remove this method by version 3.0.0 or by April 2022 {FN 2021-04-14}
-	 *
-	 * @return array settings options
-	 */
-	protected function get_settings_options() {
-
-		wc_deprecated_function( __METHOD__, '2.9.0' );
-
-		return $this->get_extra_sorting_setting_options();
-	}
-
-
 	/**
 	 * Gets sorting options as settings options.
 	 *