Updates to 3.3.1

codewurker · Aug 23, 2024 · f8f78d0 · f8f78d0
1 parent 3d7300f
commit f8f78d0
Show file tree

Hide file tree

Showing 8 changed files with 122 additions and 105 deletions.
diff --git a/changelog.txt b/changelog.txt
@@ -1,5 +1,8 @@
 *** Table Rate Shipping Changelog ***
 
+2024-08-22 - version 3.3.1
+* Tweak - Using namespace for new classes.
+
 2024-07-16 - version 3.3.0
 * Add - Compatibility with WooPayments Multi-currency tool.
 

diff --git a/includes/class-blocks-integration.php b/includes/class-blocks-integration.php
@@ -5,10 +5,17 @@
  * @package WooCommerce_Table_Rate_Shipping
  */
 
-defined( 'ABSPATH' ) || exit;
+namespace WooCommerce\Shipping\Table_Rate;
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
 
 use Automattic\WooCommerce\Blocks\Integrations\IntegrationInterface;
 
+/**
+ * Class for WooCommerce Blocks integration.
+ */
 class Blocks_Integration implements IntegrationInterface {
 
 	/**

diff --git a/includes/class-store-api-extension.php b/includes/class-store-api-extension.php
@@ -7,9 +7,16 @@
  * @package WooCommerce_Table_Rate_Shipping
  */
 
+namespace WooCommerce\Shipping\Table_Rate;
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
 use Automattic\WooCommerce\StoreApi\StoreApi;
 use Automattic\WooCommerce\StoreApi\Schemas\ExtendSchema;
 use Automattic\WooCommerce\StoreApi\Schemas\V1\CartSchema;
+use WC_Table_Rate_Shipping;
 
 /**
  * Store API Extension.

diff --git a/includes/class-wc-shipping-table-rate.php b/includes/class-wc-shipping-table-rate.php
@@ -5,8 +5,6 @@
  * @package WooCommerce_Table_Rate_Shipping
  */
 
-require_once WC_TABLE_RATE_SHIPPING_MAIN_ABSPATH . 'includes/class-helpers.php';
-
 use WooCommerce\Shipping\Table_Rate\Helpers;
 
 if ( ! defined( 'ABSPATH' ) ) {

diff --git a/includes/class-wc-table-rate-shipping.php b/includes/class-wc-table-rate-shipping.php
@@ -9,6 +9,9 @@
 	exit;
 }
 
+use WooCommerce\Shipping\Table_Rate\Store_API_Extension;
+use WooCommerce\Shipping\Table_Rate\Blocks_Integration;
+
 /**
  * Main Class.
  */
@@ -103,6 +106,7 @@ public function init() {
 			return;
 		}
 
+		require_once WC_TABLE_RATE_SHIPPING_MAIN_ABSPATH . 'includes/class-helpers.php';
 		include_once WC_TABLE_RATE_SHIPPING_MAIN_ABSPATH . 'includes/functions-ajax.php';
 		include_once WC_TABLE_RATE_SHIPPING_MAIN_ABSPATH . 'includes/functions-admin.php';
 

diff --git a/includes/functions-admin.php b/includes/functions-admin.php
@@ -5,8 +5,6 @@
  * @package WooCommerce_Table_Rate_Shipping
  */
 
-require_once WC_TABLE_RATE_SHIPPING_MAIN_ABSPATH . 'includes/class-helpers.php';
-
 use WooCommerce\Shipping\Table_Rate\Helpers;
 
 if ( ! defined( 'ABSPATH' ) ) {