rename validation file

woocommerce · Feb 16, 2023 · a9bd740 · a9bd740
1 parent 8083368
commit a9bd740
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 17 deletions.
diff --git a/src/StoreApi/Routes/V1/CartUpdateCustomer.php b/src/StoreApi/Routes/V1/CartUpdateCustomer.php
@@ -3,6 +3,7 @@
 
 use Automattic\WooCommerce\StoreApi\Utilities\DraftOrderTrait;
 use Automattic\WooCommerce\StoreApi\Utilities\CartController;
+use Automattic\WooCommerce\StoreApi\Utilities\ValidationUtils;
 
 /**
  * CartUpdateCustomer class.
@@ -216,11 +217,11 @@ protected function get_route_post_response( \WP_REST_Request $request ) {
 	 * @return array
 	 */
 	protected function get_customer_billing_address( \WC_Customer $customer ) {
-		$controller      = new CustomerController();
+		$validation_util = new ValidationUtils();
 		$billing_country = $customer->get_billing_country();
 		$billing_state   = $customer->get_billing_state();
 
-		if ( ! $controller->validate_state( $billing_state, $billing_country ) ) {
+		if ( ! $validation_util->validate_state( $billing_state, $billing_country ) ) {
 			$billing_state = '';
 		}
 		return [

diff --git a/src/StoreApi/Schemas/V1/AbstractAddressSchema.php b/src/StoreApi/Schemas/V1/AbstractAddressSchema.php
@@ -1,7 +1,7 @@
 <?php
 namespace Automattic\WooCommerce\StoreApi\Schemas\V1;
 
-use Automattic\WooCommerce\StoreApi\Utilities\CustomerController;
+use Automattic\WooCommerce\StoreApi\Utilities\ValidationUtils;
 
 /**
  * AddressSchema class.
@@ -89,7 +89,7 @@ public function get_properties() {
 	 * @return array
 	 */
 	public function sanitize_callback( $address, $request, $param ) {
-		$controller = new CustomerController();
+		$validation_util = new ValidationUtils();
 
 		$address               = array_merge( array_fill_keys( array_keys( $this->get_properties() ), '' ), (array) $address );
 		$address['country']    = wc_strtoupper( wc_clean( wp_unslash( $address['country'] ) ) );
@@ -99,7 +99,7 @@ public function sanitize_callback( $address, $request, $param ) {
 		$address['address_1']  = wc_clean( wp_unslash( $address['address_1'] ) );
 		$address['address_2']  = wc_clean( wp_unslash( $address['address_2'] ) );
 		$address['city']       = wc_clean( wp_unslash( $address['city'] ) );
-		$address['state']      = $controller->format_state( wc_clean( wp_unslash( $address['state'] ) ), $address['country'] );
+		$address['state']      = $validation_util->format_state( wc_clean( wp_unslash( $address['state'] ) ), $address['country'] );
 		$address['postcode']   = $address['postcode'] ? wc_format_postcode( wc_clean( wp_unslash( $address['postcode'] ) ), $address['country'] ) : '';
 		$address['phone']      = wc_clean( wp_unslash( $address['phone'] ) );
 		return $address;
@@ -116,9 +116,9 @@ public function sanitize_callback( $address, $request, $param ) {
 	 * @return true|\WP_Error
 	 */
 	public function validate_callback( $address, $request, $param ) {
-		$errors     = new \WP_Error();
-		$address    = $this->sanitize_callback( $address, $request, $param );
-		$controller = new CustomerController();
+		$errors          = new \WP_Error();
+		$address         = $this->sanitize_callback( $address, $request, $param );
+		$validation_util = new ValidationUtils();
 
 		if ( ! empty( $address['country'] ) && ! in_array( $address['country'], array_keys( wc()->countries->get_countries() ), true ) ) {
 			$errors->add(
@@ -132,7 +132,7 @@ public function validate_callback( $address, $request, $param ) {
 			return $errors;
 		}
 
-		if ( ! empty( $address['state'] ) && ! $controller->validate_state( $address['state'], $address['country'] ) ) {
+		if ( ! empty( $address['state'] ) && ! $validation_util->validate_state( $address['state'], $address['country'] ) ) {
 			$errors->add(
 				'invalid_state',
 				sprintf(

diff --git a/src/StoreApi/Schemas/V1/BillingAddressSchema.php b/src/StoreApi/Schemas/V1/BillingAddressSchema.php
@@ -2,7 +2,7 @@
 namespace Automattic\WooCommerce\StoreApi\Schemas\V1;
 
 use Automattic\WooCommerce\StoreApi\Exceptions\RouteException;
-use Automattic\WooCommerce\StoreApi\Utilities\CustomerController;
+use Automattic\WooCommerce\StoreApi\Utilities\ValidationUtils;
 
 /**
  * BillingAddressSchema class.
@@ -90,13 +90,13 @@ public function validate_callback( $address, $request, $param ) {
 	 * @return stdClass
 	 */
 	public function get_item_response( $address ) {
-		$controller = new CustomerController();
+		$validation_util = new ValidationUtils();
 
 		if ( ( $address instanceof \WC_Customer || $address instanceof \WC_Order ) ) {
 			$billing_country = $address->get_billing_country();
 			$billing_state   = $address->get_billing_state();
 
-			if ( ! $controller->validate_state( $billing_state, $billing_country ) ) {
+			if ( ! $validation_util->validate_state( $billing_state, $billing_country ) ) {
 				$billing_state = '';
 			}
 

diff --git a/src/StoreApi/Schemas/V1/ShippingAddressSchema.php b/src/StoreApi/Schemas/V1/ShippingAddressSchema.php
@@ -2,7 +2,7 @@
 namespace Automattic\WooCommerce\StoreApi\Schemas\V1;
 
 use Automattic\WooCommerce\StoreApi\Exceptions\RouteException;
-use Automattic\WooCommerce\StoreApi\Utilities\CustomerController;
+use Automattic\WooCommerce\StoreApi\Utilities\ValidationUtils;
 
 /**
  * ShippingAddressSchema class.
@@ -33,12 +33,12 @@ class ShippingAddressSchema extends AbstractAddressSchema {
 	 * @return stdClass
 	 */
 	public function get_item_response( $address ) {
-		$controller = new CustomerController();
+		$validation_util = new ValidationUtils();
 		if ( ( $address instanceof \WC_Customer || $address instanceof \WC_Order ) ) {
 			$shipping_country = $address->get_shipping_country();
 			$shipping_state   = $address->get_shipping_state();
 
-			if ( ! $controller->validate_state( $shipping_state, $shipping_country ) ) {
+			if ( ! $validation_util->validate_state( $shipping_state, $shipping_country ) ) {
 				$shipping_state = '';
 			}
 

diff --git a/...StoreApi/Utilities/CustomerController.php → src/StoreApi/Utilities/ValidationUtils.php b/...StoreApi/Utilities/CustomerController.php → src/StoreApi/Utilities/ValidationUtils.php
@@ -5,10 +5,10 @@
 use Automattic\WooCommerce\StoreApi\Exceptions\RouteException;
 
 /**
- * CustomerController class.
+ * ValidationUtils class.
  * Helper class which validates and update customer info.
  */
-class CustomerController {
+class ValidationUtils {
 	/**
 	 * Get list of states for a country.
 	 *