Force array type for valid states (woocommerce#4975)

jonny-bull · Dec 16, 2021 · 67d2e6a · 67d2e6a
1 parent 7ae4b3c
commit 67d2e6a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/StoreApi/Schemas/BillingAddressSchema.php b/src/StoreApi/Schemas/BillingAddressSchema.php
@@ -95,7 +95,7 @@ public function get_item_response( $address ) {
 		if ( ( $address instanceof \WC_Customer || $address instanceof \WC_Order ) ) {
 			$billing_country = $address->get_billing_country();
 			$billing_state   = $address->get_billing_state();
-			$valid_states    = wc()->countries->get_states( $billing_country );
+			$valid_states    = array_filter( (array) wc()->countries->get_states( $billing_country ) );
 
 			if ( ! empty( $billing_state ) && count( $valid_states ) && ! in_array( $billing_state, $valid_states, true ) ) {
 				$billing_state = '';

diff --git a/src/StoreApi/Schemas/ShippingAddressSchema.php b/src/StoreApi/Schemas/ShippingAddressSchema.php
@@ -44,7 +44,7 @@ public function get_item_response( $address ) {
 
 			$shipping_country = $address->get_shipping_country();
 			$shipping_state   = $address->get_shipping_state();
-			$valid_states     = wc()->countries->get_states( $shipping_country );
+			$valid_states     = array_filter( (array) wc()->countries->get_states( $shipping_country ) );
 
 			if ( ! empty( $shipping_state ) && count( $valid_states ) && ! in_array( $shipping_state, $valid_states, true ) ) {
 				$shipping_state = '';