diff --git a/plugins/woocommerce-blocks/src/Library.php b/plugins/woocommerce-blocks/src/Library.php index 5ff6c82a4e4..ea0572576a2 100644 --- a/plugins/woocommerce-blocks/src/Library.php +++ b/plugins/woocommerce-blocks/src/Library.php @@ -9,10 +9,7 @@ namespace Automattic\WooCommerce\Blocks; defined( 'ABSPATH' ) || exit; -use Automattic\WooCommerce\Blocks\Payments\PaymentResult; -use Automattic\WooCommerce\Blocks\Payments\PaymentContext; use Automattic\WooCommerce\Blocks\Payments\PaymentMethodRegistry; -use Automattic\WooCommerce\Blocks\RestApi\StoreApi\Utilities\NoticeHandler; /** * Library class. @@ -32,7 +29,6 @@ class Library { add_filter( 'woocommerce_register_shop_order_post_statuses', array( __CLASS__, 'register_draft_order_post_status' ) ); add_filter( 'woocommerce_valid_order_statuses_for_payment', array( __CLASS__, 'append_draft_order_post_status' ) ); add_action( 'woocommerce_cleanup_draft_orders', array( __CLASS__, 'delete_expired_draft_orders' ) ); - add_action( 'woocommerce_rest_checkout_process_payment_with_context', array( __CLASS__, 'process_legacy_payment' ), 999, 2 ); } /** @@ -206,55 +202,4 @@ class Library { " ); } - - /** - * Attempt to process a payment for the checkout API if no payment methods support the - * woocommerce_rest_checkout_process_payment_with_context action. - * - * @param PaymentContext $context Holds context for the payment. - * @param PaymentResult $result Result of the payment. - */ - public static function process_legacy_payment( PaymentContext $context, PaymentResult &$result ) { - if ( $result->status ) { - return; - } - - // phpcs:ignore WordPress.Security.NonceVerification - $post_data = $_POST; - - // Set constants. - wc_maybe_define_constant( 'WOOCOMMERCE_CHECKOUT', true ); - - // Add the payment data from the API to the POST global. - $_POST = $context->payment_data; - - // Call the process payment method of the chosen gatway. - $payment_method_object = $context->get_payment_method_instance(); - - if ( ! $payment_method_object instanceof \WC_Payment_Gateway ) { - return; - } - - $payment_method_object->validate_fields(); - - // If errors were thrown, we need to abort. - NoticeHandler::convert_notices_to_exceptions( 'woocommerce_rest_payment_error' ); - - // Process Payment. - $gateway_result = $payment_method_object->process_payment( $context->order->get_id() ); - - // Restore $_POST data. - $_POST = $post_data; - - // If `process_payment` added notices, clear them. Notices are not displayed from the API -- payment should fail, - // and a generic notice will be shown instead if payment failed. - wc_clear_notices(); - - // Handle result. - $result->set_status( isset( $gateway_result['result'] ) && 'success' === $gateway_result['result'] ? 'success' : 'failure' ); - - // set payment_details from result. - $result->set_payment_details( array_merge( $result->payment_details, $gateway_result ) ); - $result->set_redirect_url( $gateway_result['redirect'] ); - } } diff --git a/plugins/woocommerce-blocks/src/RestApi.php b/plugins/woocommerce-blocks/src/RestApi.php index d3873f097e0..f1bc5cd5720 100644 --- a/plugins/woocommerce-blocks/src/RestApi.php +++ b/plugins/woocommerce-blocks/src/RestApi.php @@ -9,8 +9,12 @@ namespace Automattic\WooCommerce\Blocks; defined( 'ABSPATH' ) || exit; -use \Automattic\WooCommerce\Blocks\RestApi\StoreApi\RoutesController; -use \Automattic\WooCommerce\Blocks\RestApi\StoreApi\SchemaController; +use Automattic\WooCommerce\Blocks\StoreApi\RoutesController; +use Automattic\WooCommerce\Blocks\StoreApi\SchemaController; +use Automattic\WooCommerce\Blocks\Payments\PaymentResult; +use Automattic\WooCommerce\Blocks\Payments\PaymentContext; +use Automattic\WooCommerce\Blocks\Payments\PaymentMethodRegistry; +use Automattic\WooCommerce\Blocks\StoreApi\Utilities\NoticeHandler; /** * RestApi class. @@ -24,6 +28,7 @@ class RestApi { add_action( 'rest_api_init', array( __CLASS__, 'register_rest_routes' ), 10 ); add_filter( 'rest_authentication_errors', array( __CLASS__, 'maybe_init_cart_session' ), 1 ); add_filter( 'rest_authentication_errors', array( __CLASS__, 'store_api_authentication' ) ); + add_action( 'woocommerce_rest_checkout_process_payment_with_context', array( __CLASS__, 'process_legacy_payment' ), 999, 2 ); } /** @@ -129,4 +134,55 @@ class RestApi { 'product-reviews' => __NAMESPACE__ . '\RestApi\Controllers\ProductReviews', ]; } + + /** + * Attempt to process a payment for the checkout API if no payment methods support the + * woocommerce_rest_checkout_process_payment_with_context action. + * + * @param PaymentContext $context Holds context for the payment. + * @param PaymentResult $result Result of the payment. + */ + public static function process_legacy_payment( PaymentContext $context, PaymentResult &$result ) { + if ( $result->status ) { + return; + } + + // phpcs:ignore WordPress.Security.NonceVerification + $post_data = $_POST; + + // Set constants. + wc_maybe_define_constant( 'WOOCOMMERCE_CHECKOUT', true ); + + // Add the payment data from the API to the POST global. + $_POST = $context->payment_data; + + // Call the process payment method of the chosen gatway. + $payment_method_object = $context->get_payment_method_instance(); + + if ( ! $payment_method_object instanceof \WC_Payment_Gateway ) { + return; + } + + $payment_method_object->validate_fields(); + + // If errors were thrown, we need to abort. + NoticeHandler::convert_notices_to_exceptions( 'woocommerce_rest_payment_error' ); + + // Process Payment. + $gateway_result = $payment_method_object->process_payment( $context->order->get_id() ); + + // Restore $_POST data. + $_POST = $post_data; + + // If `process_payment` added notices, clear them. Notices are not displayed from the API -- payment should fail, + // and a generic notice will be shown instead if payment failed. + wc_clear_notices(); + + // Handle result. + $result->set_status( isset( $gateway_result['result'] ) && 'success' === $gateway_result['result'] ? 'success' : 'failure' ); + + // set payment_details from result. + $result->set_payment_details( array_merge( $result->payment_details, $gateway_result ) ); + $result->set_redirect_url( $gateway_result['redirect'] ); + } } diff --git a/plugins/woocommerce-blocks/src/RestApi/Controllers/Cart.php b/plugins/woocommerce-blocks/src/RestApi/Controllers/Cart.php index 42bc8d0ed30..6f7e6e04a1f 100644 --- a/plugins/woocommerce-blocks/src/RestApi/Controllers/Cart.php +++ b/plugins/woocommerce-blocks/src/RestApi/Controllers/Cart.php @@ -12,9 +12,9 @@ namespace Automattic\WooCommerce\Blocks\RestApi\Controllers; defined( 'ABSPATH' ) || exit; -use \WP_Error; -use \WP_REST_Server; -use \WP_REST_Controller; +use WP_Error; +use WP_REST_Server; +use WP_REST_Controller; /** * Cart API. diff --git a/plugins/woocommerce-blocks/src/RestApi/Controllers/ProductAttributeTerms.php b/plugins/woocommerce-blocks/src/RestApi/Controllers/ProductAttributeTerms.php index 978a05fcab3..9e609103129 100644 --- a/plugins/woocommerce-blocks/src/RestApi/Controllers/ProductAttributeTerms.php +++ b/plugins/woocommerce-blocks/src/RestApi/Controllers/ProductAttributeTerms.php @@ -12,7 +12,7 @@ namespace Automattic\WooCommerce\Blocks\RestApi\Controllers; defined( 'ABSPATH' ) || exit; -use \WC_REST_Product_Attribute_Terms_Controller; +use WC_REST_Product_Attribute_Terms_Controller; /** * REST API Product Attribute Terms controller class. diff --git a/plugins/woocommerce-blocks/src/RestApi/Controllers/ProductAttributes.php b/plugins/woocommerce-blocks/src/RestApi/Controllers/ProductAttributes.php index e28c2e6777a..c65df25a2f1 100644 --- a/plugins/woocommerce-blocks/src/RestApi/Controllers/ProductAttributes.php +++ b/plugins/woocommerce-blocks/src/RestApi/Controllers/ProductAttributes.php @@ -12,7 +12,7 @@ namespace Automattic\WooCommerce\Blocks\RestApi\Controllers; defined( 'ABSPATH' ) || exit; -use \WC_REST_Product_Attributes_Controller; +use WC_REST_Product_Attributes_Controller; /** * REST API Product Attributes controller class. diff --git a/plugins/woocommerce-blocks/src/RestApi/Controllers/ProductCategories.php b/plugins/woocommerce-blocks/src/RestApi/Controllers/ProductCategories.php index cb4ec7ecfca..0bff35ba959 100644 --- a/plugins/woocommerce-blocks/src/RestApi/Controllers/ProductCategories.php +++ b/plugins/woocommerce-blocks/src/RestApi/Controllers/ProductCategories.php @@ -12,7 +12,7 @@ namespace Automattic\WooCommerce\Blocks\RestApi\Controllers; defined( 'ABSPATH' ) || exit; -use \WC_REST_Product_Categories_Controller; +use WC_REST_Product_Categories_Controller; /** * REST API Product Categories controller class. diff --git a/plugins/woocommerce-blocks/src/RestApi/Controllers/ProductReviews.php b/plugins/woocommerce-blocks/src/RestApi/Controllers/ProductReviews.php index cab39e8463f..119000ad5c1 100644 --- a/plugins/woocommerce-blocks/src/RestApi/Controllers/ProductReviews.php +++ b/plugins/woocommerce-blocks/src/RestApi/Controllers/ProductReviews.php @@ -13,7 +13,7 @@ namespace Automattic\WooCommerce\Blocks\RestApi\Controllers; defined( 'ABSPATH' ) || exit; -use \WC_REST_Controller; +use WC_REST_Controller; /** * REST API Product Reviews controller class. diff --git a/plugins/woocommerce-blocks/src/RestApi/Controllers/ProductTags.php b/plugins/woocommerce-blocks/src/RestApi/Controllers/ProductTags.php index dfc5db594d7..51d2e790f4d 100644 --- a/plugins/woocommerce-blocks/src/RestApi/Controllers/ProductTags.php +++ b/plugins/woocommerce-blocks/src/RestApi/Controllers/ProductTags.php @@ -12,7 +12,7 @@ namespace Automattic\WooCommerce\Blocks\RestApi\Controllers; defined( 'ABSPATH' ) || exit; -use \WC_REST_Product_Tags_Controller; +use WC_REST_Product_Tags_Controller; /** * REST API Product Tags controller class. diff --git a/plugins/woocommerce-blocks/src/RestApi/Controllers/Products.php b/plugins/woocommerce-blocks/src/RestApi/Controllers/Products.php index 95e591b2a4d..126a1aa1f53 100644 --- a/plugins/woocommerce-blocks/src/RestApi/Controllers/Products.php +++ b/plugins/woocommerce-blocks/src/RestApi/Controllers/Products.php @@ -12,7 +12,7 @@ namespace Automattic\WooCommerce\Blocks\RestApi\Controllers; defined( 'ABSPATH' ) || exit; -use \WC_REST_Products_Controller; +use WC_REST_Products_Controller; use Automattic\WooCommerce\Blocks\RestApi\Utilities\ProductImages; /** diff --git a/plugins/woocommerce-blocks/src/RestApi/Controllers/Variations.php b/plugins/woocommerce-blocks/src/RestApi/Controllers/Variations.php index 1a836d8f6c4..a04a01f93d5 100644 --- a/plugins/woocommerce-blocks/src/RestApi/Controllers/Variations.php +++ b/plugins/woocommerce-blocks/src/RestApi/Controllers/Variations.php @@ -12,7 +12,7 @@ namespace Automattic\WooCommerce\Blocks\RestApi\Controllers; defined( 'ABSPATH' ) || exit; -use \WC_REST_Product_Variations_Controller; +use WC_REST_Product_Variations_Controller; /** * REST API variations controller class. diff --git a/plugins/woocommerce-blocks/src/RestApi/StoreApi/README.md b/plugins/woocommerce-blocks/src/StoreApi/README.md similarity index 100% rename from plugins/woocommerce-blocks/src/RestApi/StoreApi/README.md rename to plugins/woocommerce-blocks/src/StoreApi/README.md diff --git a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Routes/AbstractCartRoute.php b/plugins/woocommerce-blocks/src/StoreApi/Routes/AbstractCartRoute.php similarity index 94% rename from plugins/woocommerce-blocks/src/RestApi/StoreApi/Routes/AbstractCartRoute.php rename to plugins/woocommerce-blocks/src/StoreApi/Routes/AbstractCartRoute.php index 25dfdc9a477..f59fb4a5c0a 100644 --- a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Routes/AbstractCartRoute.php +++ b/plugins/woocommerce-blocks/src/StoreApi/Routes/AbstractCartRoute.php @@ -5,11 +5,11 @@ * @package WooCommerce/Blocks */ -namespace Automattic\WooCommerce\Blocks\RestApi\StoreApi\Routes; +namespace Automattic\WooCommerce\Blocks\StoreApi\Routes; defined( 'ABSPATH' ) || exit; -use Automattic\WooCommerce\Blocks\RestApi\StoreApi\Utilities\CartController; +use Automattic\WooCommerce\Blocks\StoreApi\Utilities\CartController; /** * Cart class. diff --git a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Routes/AbstractRoute.php b/plugins/woocommerce-blocks/src/StoreApi/Routes/AbstractRoute.php similarity index 98% rename from plugins/woocommerce-blocks/src/RestApi/StoreApi/Routes/AbstractRoute.php rename to plugins/woocommerce-blocks/src/StoreApi/Routes/AbstractRoute.php index 624190d4913..d47677dd572 100644 --- a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Routes/AbstractRoute.php +++ b/plugins/woocommerce-blocks/src/StoreApi/Routes/AbstractRoute.php @@ -6,11 +6,11 @@ * @package WooCommerce/Blocks */ -namespace Automattic\WooCommerce\Blocks\RestApi\StoreApi\Routes; +namespace Automattic\WooCommerce\Blocks\StoreApi\Routes; defined( 'ABSPATH' ) || exit; -use Automattic\WooCommerce\Blocks\RestApi\StoreApi\Schemas\AbstractSchema; +use Automattic\WooCommerce\Blocks\StoreApi\Schemas\AbstractSchema; /** * AbstractRoute class. diff --git a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Routes/Cart.php b/plugins/woocommerce-blocks/src/StoreApi/Routes/Cart.php similarity index 88% rename from plugins/woocommerce-blocks/src/RestApi/StoreApi/Routes/Cart.php rename to plugins/woocommerce-blocks/src/StoreApi/Routes/Cart.php index f498804b33b..55078dbf518 100644 --- a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Routes/Cart.php +++ b/plugins/woocommerce-blocks/src/StoreApi/Routes/Cart.php @@ -5,11 +5,11 @@ * @package WooCommerce/Blocks */ -namespace Automattic\WooCommerce\Blocks\RestApi\StoreApi\Routes; +namespace Automattic\WooCommerce\Blocks\StoreApi\Routes; defined( 'ABSPATH' ) || exit; -use Automattic\WooCommerce\Blocks\RestApi\StoreApi\Utilities\CartController; +use Automattic\WooCommerce\Blocks\StoreApi\Utilities\CartController; /** * Cart class. diff --git a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Routes/CartAddItem.php b/plugins/woocommerce-blocks/src/StoreApi/Routes/CartAddItem.php similarity index 95% rename from plugins/woocommerce-blocks/src/RestApi/StoreApi/Routes/CartAddItem.php rename to plugins/woocommerce-blocks/src/StoreApi/Routes/CartAddItem.php index e1ef1406b27..b9beb8e2c6c 100644 --- a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Routes/CartAddItem.php +++ b/plugins/woocommerce-blocks/src/StoreApi/Routes/CartAddItem.php @@ -5,11 +5,11 @@ * @package WooCommerce/Blocks */ -namespace Automattic\WooCommerce\Blocks\RestApi\StoreApi\Routes; +namespace Automattic\WooCommerce\Blocks\StoreApi\Routes; defined( 'ABSPATH' ) || exit; -use Automattic\WooCommerce\Blocks\RestApi\StoreApi\Utilities\CartController; +use Automattic\WooCommerce\Blocks\StoreApi\Utilities\CartController; /** * CartAddItem class. diff --git a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Routes/CartApplyCoupon.php b/plugins/woocommerce-blocks/src/StoreApi/Routes/CartApplyCoupon.php similarity index 92% rename from plugins/woocommerce-blocks/src/RestApi/StoreApi/Routes/CartApplyCoupon.php rename to plugins/woocommerce-blocks/src/StoreApi/Routes/CartApplyCoupon.php index f9ccf5aca65..6292b06b722 100644 --- a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Routes/CartApplyCoupon.php +++ b/plugins/woocommerce-blocks/src/StoreApi/Routes/CartApplyCoupon.php @@ -5,11 +5,11 @@ * @package WooCommerce/Blocks */ -namespace Automattic\WooCommerce\Blocks\RestApi\StoreApi\Routes; +namespace Automattic\WooCommerce\Blocks\StoreApi\Routes; defined( 'ABSPATH' ) || exit; -use Automattic\WooCommerce\Blocks\RestApi\StoreApi\Utilities\CartController; +use Automattic\WooCommerce\Blocks\StoreApi\Utilities\CartController; /** * CartApplyCoupon class. diff --git a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Routes/CartCoupons.php b/plugins/woocommerce-blocks/src/StoreApi/Routes/CartCoupons.php similarity index 96% rename from plugins/woocommerce-blocks/src/RestApi/StoreApi/Routes/CartCoupons.php rename to plugins/woocommerce-blocks/src/StoreApi/Routes/CartCoupons.php index 8c1eea7c51f..29c4b55e066 100644 --- a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Routes/CartCoupons.php +++ b/plugins/woocommerce-blocks/src/StoreApi/Routes/CartCoupons.php @@ -6,11 +6,11 @@ * @package WooCommerce/Blocks */ -namespace Automattic\WooCommerce\Blocks\RestApi\StoreApi\Routes; +namespace Automattic\WooCommerce\Blocks\StoreApi\Routes; defined( 'ABSPATH' ) || exit; -use Automattic\WooCommerce\Blocks\RestApi\StoreApi\Utilities\CartController; +use Automattic\WooCommerce\Blocks\StoreApi\Utilities\CartController; /** * CartCoupons class. diff --git a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Routes/CartCouponsByCode.php b/plugins/woocommerce-blocks/src/StoreApi/Routes/CartCouponsByCode.php similarity index 94% rename from plugins/woocommerce-blocks/src/RestApi/StoreApi/Routes/CartCouponsByCode.php rename to plugins/woocommerce-blocks/src/StoreApi/Routes/CartCouponsByCode.php index fc6bb165eef..8b29472452f 100644 --- a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Routes/CartCouponsByCode.php +++ b/plugins/woocommerce-blocks/src/StoreApi/Routes/CartCouponsByCode.php @@ -6,11 +6,11 @@ * @package WooCommerce/Blocks */ -namespace Automattic\WooCommerce\Blocks\RestApi\StoreApi\Routes; +namespace Automattic\WooCommerce\Blocks\StoreApi\Routes; defined( 'ABSPATH' ) || exit; -use Automattic\WooCommerce\Blocks\RestApi\StoreApi\Utilities\CartController; +use Automattic\WooCommerce\Blocks\StoreApi\Utilities\CartController; /** * CartCouponsByCode class. diff --git a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Routes/CartItems.php b/plugins/woocommerce-blocks/src/StoreApi/Routes/CartItems.php similarity index 96% rename from plugins/woocommerce-blocks/src/RestApi/StoreApi/Routes/CartItems.php rename to plugins/woocommerce-blocks/src/StoreApi/Routes/CartItems.php index 939fdc175b2..c48be34602e 100644 --- a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Routes/CartItems.php +++ b/plugins/woocommerce-blocks/src/StoreApi/Routes/CartItems.php @@ -6,11 +6,11 @@ * @package WooCommerce/Blocks */ -namespace Automattic\WooCommerce\Blocks\RestApi\StoreApi\Routes; +namespace Automattic\WooCommerce\Blocks\StoreApi\Routes; defined( 'ABSPATH' ) || exit; -use Automattic\WooCommerce\Blocks\RestApi\StoreApi\Utilities\CartController; +use Automattic\WooCommerce\Blocks\StoreApi\Utilities\CartController; /** * CartItems class. diff --git a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Routes/CartItemsByKey.php b/plugins/woocommerce-blocks/src/StoreApi/Routes/CartItemsByKey.php similarity index 96% rename from plugins/woocommerce-blocks/src/RestApi/StoreApi/Routes/CartItemsByKey.php rename to plugins/woocommerce-blocks/src/StoreApi/Routes/CartItemsByKey.php index 7daa9a4b4e2..d7d90a350b2 100644 --- a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Routes/CartItemsByKey.php +++ b/plugins/woocommerce-blocks/src/StoreApi/Routes/CartItemsByKey.php @@ -6,11 +6,11 @@ * @package WooCommerce/Blocks */ -namespace Automattic\WooCommerce\Blocks\RestApi\StoreApi\Routes; +namespace Automattic\WooCommerce\Blocks\StoreApi\Routes; defined( 'ABSPATH' ) || exit; -use Automattic\WooCommerce\Blocks\RestApi\StoreApi\Utilities\CartController; +use Automattic\WooCommerce\Blocks\StoreApi\Utilities\CartController; /** * CartItemsByKey class. diff --git a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Routes/CartRemoveCoupon.php b/plugins/woocommerce-blocks/src/StoreApi/Routes/CartRemoveCoupon.php similarity index 93% rename from plugins/woocommerce-blocks/src/RestApi/StoreApi/Routes/CartRemoveCoupon.php rename to plugins/woocommerce-blocks/src/StoreApi/Routes/CartRemoveCoupon.php index a62e5cff7bc..293385c9d5a 100644 --- a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Routes/CartRemoveCoupon.php +++ b/plugins/woocommerce-blocks/src/StoreApi/Routes/CartRemoveCoupon.php @@ -5,11 +5,11 @@ * @package WooCommerce/Blocks */ -namespace Automattic\WooCommerce\Blocks\RestApi\StoreApi\Routes; +namespace Automattic\WooCommerce\Blocks\StoreApi\Routes; defined( 'ABSPATH' ) || exit; -use Automattic\WooCommerce\Blocks\RestApi\StoreApi\Utilities\CartController; +use Automattic\WooCommerce\Blocks\StoreApi\Utilities\CartController; /** * CartRemoveCoupon class. diff --git a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Routes/CartRemoveItem.php b/plugins/woocommerce-blocks/src/StoreApi/Routes/CartRemoveItem.php similarity index 91% rename from plugins/woocommerce-blocks/src/RestApi/StoreApi/Routes/CartRemoveItem.php rename to plugins/woocommerce-blocks/src/StoreApi/Routes/CartRemoveItem.php index d413962c038..af3db3fcf30 100644 --- a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Routes/CartRemoveItem.php +++ b/plugins/woocommerce-blocks/src/StoreApi/Routes/CartRemoveItem.php @@ -5,11 +5,11 @@ * @package WooCommerce/Blocks */ -namespace Automattic\WooCommerce\Blocks\RestApi\StoreApi\Routes; +namespace Automattic\WooCommerce\Blocks\StoreApi\Routes; defined( 'ABSPATH' ) || exit; -use Automattic\WooCommerce\Blocks\RestApi\StoreApi\Utilities\CartController; +use Automattic\WooCommerce\Blocks\StoreApi\Utilities\CartController; /** * CartRemoveItem class. diff --git a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Routes/CartSelectShippingRate.php b/plugins/woocommerce-blocks/src/StoreApi/Routes/CartSelectShippingRate.php similarity index 94% rename from plugins/woocommerce-blocks/src/RestApi/StoreApi/Routes/CartSelectShippingRate.php rename to plugins/woocommerce-blocks/src/StoreApi/Routes/CartSelectShippingRate.php index 18da53d1afb..393adde1768 100644 --- a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Routes/CartSelectShippingRate.php +++ b/plugins/woocommerce-blocks/src/StoreApi/Routes/CartSelectShippingRate.php @@ -5,11 +5,11 @@ * @package WooCommerce/Blocks */ -namespace Automattic\WooCommerce\Blocks\RestApi\StoreApi\Routes; +namespace Automattic\WooCommerce\Blocks\StoreApi\Routes; defined( 'ABSPATH' ) || exit; -use Automattic\WooCommerce\Blocks\RestApi\StoreApi\Utilities\CartController; +use Automattic\WooCommerce\Blocks\StoreApi\Utilities\CartController; /** * CartSelectShippingRate class. diff --git a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Routes/CartUpdateItem.php b/plugins/woocommerce-blocks/src/StoreApi/Routes/CartUpdateItem.php similarity index 91% rename from plugins/woocommerce-blocks/src/RestApi/StoreApi/Routes/CartUpdateItem.php rename to plugins/woocommerce-blocks/src/StoreApi/Routes/CartUpdateItem.php index 7149f87934e..e8208b22fba 100644 --- a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Routes/CartUpdateItem.php +++ b/plugins/woocommerce-blocks/src/StoreApi/Routes/CartUpdateItem.php @@ -5,11 +5,11 @@ * @package WooCommerce/Blocks */ -namespace Automattic\WooCommerce\Blocks\RestApi\StoreApi\Routes; +namespace Automattic\WooCommerce\Blocks\StoreApi\Routes; defined( 'ABSPATH' ) || exit; -use Automattic\WooCommerce\Blocks\RestApi\StoreApi\Utilities\CartController; +use Automattic\WooCommerce\Blocks\StoreApi\Utilities\CartController; /** * CartUpdateItem class. diff --git a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Routes/CartUpdateShipping.php b/plugins/woocommerce-blocks/src/StoreApi/Routes/CartUpdateShipping.php similarity index 98% rename from plugins/woocommerce-blocks/src/RestApi/StoreApi/Routes/CartUpdateShipping.php rename to plugins/woocommerce-blocks/src/StoreApi/Routes/CartUpdateShipping.php index a5691b4f982..547af707baa 100644 --- a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Routes/CartUpdateShipping.php +++ b/plugins/woocommerce-blocks/src/StoreApi/Routes/CartUpdateShipping.php @@ -5,11 +5,11 @@ * @package WooCommerce/Blocks */ -namespace Automattic\WooCommerce\Blocks\RestApi\StoreApi\Routes; +namespace Automattic\WooCommerce\Blocks\StoreApi\Routes; defined( 'ABSPATH' ) || exit; -use Automattic\WooCommerce\Blocks\RestApi\StoreApi\Utilities\CartController; +use Automattic\WooCommerce\Blocks\StoreApi\Utilities\CartController; /** * CartUpdateShipping class. diff --git a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Routes/Checkout.php b/plugins/woocommerce-blocks/src/StoreApi/Routes/Checkout.php similarity index 97% rename from plugins/woocommerce-blocks/src/RestApi/StoreApi/Routes/Checkout.php rename to plugins/woocommerce-blocks/src/StoreApi/Routes/Checkout.php index d98fd729ce0..703eb4d50e9 100644 --- a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Routes/Checkout.php +++ b/plugins/woocommerce-blocks/src/StoreApi/Routes/Checkout.php @@ -5,14 +5,14 @@ * @package WooCommerce/Blocks */ -namespace Automattic\WooCommerce\Blocks\RestApi\StoreApi\Routes; +namespace Automattic\WooCommerce\Blocks\StoreApi\Routes; defined( 'ABSPATH' ) || exit; -use Automattic\WooCommerce\Blocks\RestApi\StoreApi\Utilities\CartController; -use Automattic\WooCommerce\Blocks\RestApi\StoreApi\Utilities\OrderController; -use Automattic\WooCommerce\Blocks\RestApi\StoreApi\Utilities\ReserveStock; -use Automattic\WooCommerce\Blocks\RestApi\StoreApi\Utilities\ReserveStockException; +use Automattic\WooCommerce\Blocks\StoreApi\Utilities\CartController; +use Automattic\WooCommerce\Blocks\StoreApi\Utilities\OrderController; +use Automattic\WooCommerce\Blocks\StoreApi\Utilities\ReserveStock; +use Automattic\WooCommerce\Blocks\StoreApi\Utilities\ReserveStockException; use Automattic\WooCommerce\Blocks\Payments\PaymentResult; use Automattic\WooCommerce\Blocks\Payments\PaymentContext; diff --git a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Routes/ProductAttributeTerms.php b/plugins/woocommerce-blocks/src/StoreApi/Routes/ProductAttributeTerms.php similarity index 96% rename from plugins/woocommerce-blocks/src/RestApi/StoreApi/Routes/ProductAttributeTerms.php rename to plugins/woocommerce-blocks/src/StoreApi/Routes/ProductAttributeTerms.php index 0a8657b9033..14aec19e398 100644 --- a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Routes/ProductAttributeTerms.php +++ b/plugins/woocommerce-blocks/src/StoreApi/Routes/ProductAttributeTerms.php @@ -6,11 +6,11 @@ * @package WooCommerce/Blocks */ -namespace Automattic\WooCommerce\Blocks\RestApi\StoreApi\Routes; +namespace Automattic\WooCommerce\Blocks\StoreApi\Routes; defined( 'ABSPATH' ) || exit; -use Automattic\WooCommerce\Blocks\RestApi\StoreApi\Utilities\TermQuery; +use Automattic\WooCommerce\Blocks\StoreApi\Utilities\TermQuery; /** * ProductAttributeTerms class. diff --git a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Routes/ProductAttributes.php b/plugins/woocommerce-blocks/src/StoreApi/Routes/ProductAttributes.php similarity index 95% rename from plugins/woocommerce-blocks/src/RestApi/StoreApi/Routes/ProductAttributes.php rename to plugins/woocommerce-blocks/src/StoreApi/Routes/ProductAttributes.php index dd624b38c86..e6363246744 100644 --- a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Routes/ProductAttributes.php +++ b/plugins/woocommerce-blocks/src/StoreApi/Routes/ProductAttributes.php @@ -6,7 +6,7 @@ * @package WooCommerce/Blocks */ -namespace Automattic\WooCommerce\Blocks\RestApi\StoreApi\Routes; +namespace Automattic\WooCommerce\Blocks\StoreApi\Routes; defined( 'ABSPATH' ) || exit; diff --git a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Routes/ProductAttributesById.php b/plugins/woocommerce-blocks/src/StoreApi/Routes/ProductAttributesById.php similarity index 96% rename from plugins/woocommerce-blocks/src/RestApi/StoreApi/Routes/ProductAttributesById.php rename to plugins/woocommerce-blocks/src/StoreApi/Routes/ProductAttributesById.php index 015eafaeabd..be41722c503 100644 --- a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Routes/ProductAttributesById.php +++ b/plugins/woocommerce-blocks/src/StoreApi/Routes/ProductAttributesById.php @@ -6,7 +6,7 @@ * @package WooCommerce/Blocks */ -namespace Automattic\WooCommerce\Blocks\RestApi\StoreApi\Routes; +namespace Automattic\WooCommerce\Blocks\StoreApi\Routes; defined( 'ABSPATH' ) || exit; diff --git a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Routes/ProductCollectionData.php b/plugins/woocommerce-blocks/src/StoreApi/Routes/ProductCollectionData.php similarity index 97% rename from plugins/woocommerce-blocks/src/RestApi/StoreApi/Routes/ProductCollectionData.php rename to plugins/woocommerce-blocks/src/StoreApi/Routes/ProductCollectionData.php index 90df397d014..0951c9d02a3 100644 --- a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Routes/ProductCollectionData.php +++ b/plugins/woocommerce-blocks/src/StoreApi/Routes/ProductCollectionData.php @@ -8,11 +8,11 @@ * @package WooCommerce/Blocks */ -namespace Automattic\WooCommerce\Blocks\RestApi\StoreApi\Routes; +namespace Automattic\WooCommerce\Blocks\StoreApi\Routes; defined( 'ABSPATH' ) || exit; -use Automattic\WooCommerce\Blocks\RestApi\StoreApi\Utilities\ProductQueryFilters; +use Automattic\WooCommerce\Blocks\StoreApi\Utilities\ProductQueryFilters; /** * ProductCollectionData route. diff --git a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Routes/Products.php b/plugins/woocommerce-blocks/src/StoreApi/Routes/Products.php similarity index 98% rename from plugins/woocommerce-blocks/src/RestApi/StoreApi/Routes/Products.php rename to plugins/woocommerce-blocks/src/StoreApi/Routes/Products.php index 24660bf8745..74b025065b2 100644 --- a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Routes/Products.php +++ b/plugins/woocommerce-blocks/src/StoreApi/Routes/Products.php @@ -6,12 +6,12 @@ * @package WooCommerce/Blocks */ -namespace Automattic\WooCommerce\Blocks\RestApi\StoreApi\Routes; +namespace Automattic\WooCommerce\Blocks\StoreApi\Routes; defined( 'ABSPATH' ) || exit; -use Automattic\WooCommerce\Blocks\RestApi\StoreApi\Utilities\Pagination; -use Automattic\WooCommerce\Blocks\RestApi\StoreApi\Utilities\ProductQuery; +use Automattic\WooCommerce\Blocks\StoreApi\Utilities\Pagination; +use Automattic\WooCommerce\Blocks\StoreApi\Utilities\ProductQuery; /** * Products class. diff --git a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Routes/ProductsById.php b/plugins/woocommerce-blocks/src/StoreApi/Routes/ProductsById.php similarity index 96% rename from plugins/woocommerce-blocks/src/RestApi/StoreApi/Routes/ProductsById.php rename to plugins/woocommerce-blocks/src/StoreApi/Routes/ProductsById.php index 0562f2e5bac..7e27c52298f 100644 --- a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Routes/ProductsById.php +++ b/plugins/woocommerce-blocks/src/StoreApi/Routes/ProductsById.php @@ -6,7 +6,7 @@ * @package WooCommerce/Blocks */ -namespace Automattic\WooCommerce\Blocks\RestApi\StoreApi\Routes; +namespace Automattic\WooCommerce\Blocks\StoreApi\Routes; defined( 'ABSPATH' ) || exit; diff --git a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Routes/RouteException.php b/plugins/woocommerce-blocks/src/StoreApi/Routes/RouteException.php similarity index 95% rename from plugins/woocommerce-blocks/src/RestApi/StoreApi/Routes/RouteException.php rename to plugins/woocommerce-blocks/src/StoreApi/Routes/RouteException.php index fbc736c63f5..dff98cb6b36 100644 --- a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Routes/RouteException.php +++ b/plugins/woocommerce-blocks/src/StoreApi/Routes/RouteException.php @@ -5,7 +5,7 @@ * @package WooCommerce/Blocks */ -namespace Automattic\WooCommerce\Blocks\RestApi\StoreApi\Routes; +namespace Automattic\WooCommerce\Blocks\StoreApi\Routes; /** * ReserveStockRouteExceptionException class. diff --git a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Routes/RouteInterface.php b/plugins/woocommerce-blocks/src/StoreApi/Routes/RouteInterface.php similarity index 88% rename from plugins/woocommerce-blocks/src/RestApi/StoreApi/Routes/RouteInterface.php rename to plugins/woocommerce-blocks/src/StoreApi/Routes/RouteInterface.php index 358d0ae1428..4330958392b 100644 --- a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Routes/RouteInterface.php +++ b/plugins/woocommerce-blocks/src/StoreApi/Routes/RouteInterface.php @@ -5,7 +5,7 @@ * @package WooCommerce/Blocks */ -namespace Automattic\WooCommerce\Blocks\RestApi\StoreApi\Routes; +namespace Automattic\WooCommerce\Blocks\StoreApi\Routes; defined( 'ABSPATH' ) || exit; diff --git a/plugins/woocommerce-blocks/src/RestApi/StoreApi/RoutesController.php b/plugins/woocommerce-blocks/src/StoreApi/RoutesController.php similarity index 98% rename from plugins/woocommerce-blocks/src/RestApi/StoreApi/RoutesController.php rename to plugins/woocommerce-blocks/src/StoreApi/RoutesController.php index c7f557975d4..955017b50b2 100644 --- a/plugins/woocommerce-blocks/src/RestApi/StoreApi/RoutesController.php +++ b/plugins/woocommerce-blocks/src/StoreApi/RoutesController.php @@ -6,7 +6,7 @@ * @package WooCommerce/Blocks */ -namespace Automattic\WooCommerce\Blocks\RestApi\StoreApi; +namespace Automattic\WooCommerce\Blocks\StoreApi; defined( 'ABSPATH' ) || exit; diff --git a/plugins/woocommerce-blocks/src/RestApi/StoreApi/SchemaController.php b/plugins/woocommerce-blocks/src/StoreApi/SchemaController.php similarity index 96% rename from plugins/woocommerce-blocks/src/RestApi/StoreApi/SchemaController.php rename to plugins/woocommerce-blocks/src/StoreApi/SchemaController.php index edafa846ca4..f98c8ed4b63 100644 --- a/plugins/woocommerce-blocks/src/RestApi/StoreApi/SchemaController.php +++ b/plugins/woocommerce-blocks/src/StoreApi/SchemaController.php @@ -6,7 +6,7 @@ * @package WooCommerce/Blocks */ -namespace Automattic\WooCommerce\Blocks\RestApi\StoreApi; +namespace Automattic\WooCommerce\Blocks\StoreApi; defined( 'ABSPATH' ) || exit; diff --git a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Schemas/AbstractSchema.php b/plugins/woocommerce-blocks/src/StoreApi/Schemas/AbstractSchema.php similarity index 99% rename from plugins/woocommerce-blocks/src/RestApi/StoreApi/Schemas/AbstractSchema.php rename to plugins/woocommerce-blocks/src/StoreApi/Schemas/AbstractSchema.php index 9ece7f8df47..6d6f3a9597a 100644 --- a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Schemas/AbstractSchema.php +++ b/plugins/woocommerce-blocks/src/StoreApi/Schemas/AbstractSchema.php @@ -7,7 +7,7 @@ * @package WooCommerce/Blocks */ -namespace Automattic\WooCommerce\Blocks\RestApi\StoreApi\Schemas; +namespace Automattic\WooCommerce\Blocks\StoreApi\Schemas; defined( 'ABSPATH' ) || exit; diff --git a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Schemas/BillingAddressSchema.php b/plugins/woocommerce-blocks/src/StoreApi/Schemas/BillingAddressSchema.php similarity index 98% rename from plugins/woocommerce-blocks/src/RestApi/StoreApi/Schemas/BillingAddressSchema.php rename to plugins/woocommerce-blocks/src/StoreApi/Schemas/BillingAddressSchema.php index e785f02ac59..c7f61948637 100644 --- a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Schemas/BillingAddressSchema.php +++ b/plugins/woocommerce-blocks/src/StoreApi/Schemas/BillingAddressSchema.php @@ -5,7 +5,7 @@ * @package WooCommerce/Blocks */ -namespace Automattic\WooCommerce\Blocks\RestApi\StoreApi\Schemas; +namespace Automattic\WooCommerce\Blocks\StoreApi\Schemas; defined( 'ABSPATH' ) || exit; diff --git a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Schemas/CartCouponSchema.php b/plugins/woocommerce-blocks/src/StoreApi/Schemas/CartCouponSchema.php similarity index 95% rename from plugins/woocommerce-blocks/src/RestApi/StoreApi/Schemas/CartCouponSchema.php rename to plugins/woocommerce-blocks/src/StoreApi/Schemas/CartCouponSchema.php index 5e88aa1c7c6..ca4f5cd82a1 100644 --- a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Schemas/CartCouponSchema.php +++ b/plugins/woocommerce-blocks/src/StoreApi/Schemas/CartCouponSchema.php @@ -5,11 +5,11 @@ * @package WooCommerce/Blocks */ -namespace Automattic\WooCommerce\Blocks\RestApi\StoreApi\Schemas; +namespace Automattic\WooCommerce\Blocks\StoreApi\Schemas; defined( 'ABSPATH' ) || exit; -use Automattic\WooCommerce\Blocks\RestApi\StoreApi\Utilities\CartController; +use Automattic\WooCommerce\Blocks\StoreApi\Utilities\CartController; /** * CartCouponSchema class. diff --git a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Schemas/CartItemSchema.php b/plugins/woocommerce-blocks/src/StoreApi/Schemas/CartItemSchema.php similarity index 99% rename from plugins/woocommerce-blocks/src/RestApi/StoreApi/Schemas/CartItemSchema.php rename to plugins/woocommerce-blocks/src/StoreApi/Schemas/CartItemSchema.php index 5c49ff127b5..0391dc31d8c 100644 --- a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Schemas/CartItemSchema.php +++ b/plugins/woocommerce-blocks/src/StoreApi/Schemas/CartItemSchema.php @@ -5,7 +5,7 @@ * @package WooCommerce/Blocks */ -namespace Automattic\WooCommerce\Blocks\RestApi\StoreApi\Schemas; +namespace Automattic\WooCommerce\Blocks\StoreApi\Schemas; defined( 'ABSPATH' ) || exit; @@ -406,7 +406,7 @@ class CartItemSchema extends ProductSchema { if ( \class_exists( '\Automattic\WooCommerce\Checkout\Helpers\ReserveStock' ) ) { $reserve_stock = new \Automattic\WooCommerce\Checkout\Helpers\ReserveStock(); } else { - $reserve_stock = new \Automattic\WooCommerce\Blocks\RestApi\StoreApi\Utilities\ReserveStock(); + $reserve_stock = new \Automattic\WooCommerce\Blocks\StoreApi\Utilities\ReserveStock(); } $reserved_stock = $reserve_stock->get_reserved_stock( $product, $draft_order ); diff --git a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Schemas/CartSchema.php b/plugins/woocommerce-blocks/src/StoreApi/Schemas/CartSchema.php similarity index 98% rename from plugins/woocommerce-blocks/src/RestApi/StoreApi/Schemas/CartSchema.php rename to plugins/woocommerce-blocks/src/StoreApi/Schemas/CartSchema.php index 6a666e32aa5..779ce55798a 100644 --- a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Schemas/CartSchema.php +++ b/plugins/woocommerce-blocks/src/StoreApi/Schemas/CartSchema.php @@ -5,9 +5,9 @@ * @package WooCommerce/Blocks */ -namespace Automattic\WooCommerce\Blocks\RestApi\StoreApi\Schemas; +namespace Automattic\WooCommerce\Blocks\StoreApi\Schemas; -use Automattic\WooCommerce\Blocks\RestApi\StoreApi\Utilities\CartController; +use Automattic\WooCommerce\Blocks\StoreApi\Utilities\CartController; defined( 'ABSPATH' ) || exit; diff --git a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Schemas/CartShippingRateSchema.php b/plugins/woocommerce-blocks/src/StoreApi/Schemas/CartShippingRateSchema.php similarity index 99% rename from plugins/woocommerce-blocks/src/RestApi/StoreApi/Schemas/CartShippingRateSchema.php rename to plugins/woocommerce-blocks/src/StoreApi/Schemas/CartShippingRateSchema.php index ad2e3070008..03ece797cdf 100644 --- a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Schemas/CartShippingRateSchema.php +++ b/plugins/woocommerce-blocks/src/StoreApi/Schemas/CartShippingRateSchema.php @@ -5,11 +5,11 @@ * @package WooCommerce/Blocks */ -namespace Automattic\WooCommerce\Blocks\RestApi\StoreApi\Schemas; +namespace Automattic\WooCommerce\Blocks\StoreApi\Schemas; defined( 'ABSPATH' ) || exit; -use \WC_Shipping_Rate as ShippingRate; +use WC_Shipping_Rate as ShippingRate; /** * CartShippingRateSchema class. diff --git a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Schemas/CheckoutSchema.php b/plugins/woocommerce-blocks/src/StoreApi/Schemas/CheckoutSchema.php similarity index 98% rename from plugins/woocommerce-blocks/src/RestApi/StoreApi/Schemas/CheckoutSchema.php rename to plugins/woocommerce-blocks/src/StoreApi/Schemas/CheckoutSchema.php index 33e75bc9c09..71a8412c105 100644 --- a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Schemas/CheckoutSchema.php +++ b/plugins/woocommerce-blocks/src/StoreApi/Schemas/CheckoutSchema.php @@ -5,7 +5,7 @@ * @package WooCommerce/Blocks */ -namespace Automattic\WooCommerce\Blocks\RestApi\StoreApi\Schemas; +namespace Automattic\WooCommerce\Blocks\StoreApi\Schemas; defined( 'ABSPATH' ) || exit; diff --git a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Schemas/ErrorSchema.php b/plugins/woocommerce-blocks/src/StoreApi/Schemas/ErrorSchema.php similarity index 94% rename from plugins/woocommerce-blocks/src/RestApi/StoreApi/Schemas/ErrorSchema.php rename to plugins/woocommerce-blocks/src/StoreApi/Schemas/ErrorSchema.php index e4c3ef29433..b778396b1af 100644 --- a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Schemas/ErrorSchema.php +++ b/plugins/woocommerce-blocks/src/StoreApi/Schemas/ErrorSchema.php @@ -5,7 +5,7 @@ * @package WooCommerce/Blocks */ -namespace Automattic\WooCommerce\Blocks\RestApi\StoreApi\Schemas; +namespace Automattic\WooCommerce\Blocks\StoreApi\Schemas; defined( 'ABSPATH' ) || exit; diff --git a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Schemas/OrderCouponSchema.php b/plugins/woocommerce-blocks/src/StoreApi/Schemas/OrderCouponSchema.php similarity index 96% rename from plugins/woocommerce-blocks/src/RestApi/StoreApi/Schemas/OrderCouponSchema.php rename to plugins/woocommerce-blocks/src/StoreApi/Schemas/OrderCouponSchema.php index 67d46802690..b332b9c64ea 100644 --- a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Schemas/OrderCouponSchema.php +++ b/plugins/woocommerce-blocks/src/StoreApi/Schemas/OrderCouponSchema.php @@ -5,7 +5,7 @@ * @package WooCommerce/Blocks */ -namespace Automattic\WooCommerce\Blocks\RestApi\StoreApi\Schemas; +namespace Automattic\WooCommerce\Blocks\StoreApi\Schemas; defined( 'ABSPATH' ) || exit; diff --git a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Schemas/OrderItemSchema.php b/plugins/woocommerce-blocks/src/StoreApi/Schemas/OrderItemSchema.php similarity index 99% rename from plugins/woocommerce-blocks/src/RestApi/StoreApi/Schemas/OrderItemSchema.php rename to plugins/woocommerce-blocks/src/StoreApi/Schemas/OrderItemSchema.php index ade3641cfce..6695ad104e2 100644 --- a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Schemas/OrderItemSchema.php +++ b/plugins/woocommerce-blocks/src/StoreApi/Schemas/OrderItemSchema.php @@ -5,7 +5,7 @@ * @package WooCommerce/Blocks */ -namespace Automattic\WooCommerce\Blocks\RestApi\StoreApi\Schemas; +namespace Automattic\WooCommerce\Blocks\StoreApi\Schemas; defined( 'ABSPATH' ) || exit; diff --git a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Schemas/OrderSchema.php b/plugins/woocommerce-blocks/src/StoreApi/Schemas/OrderSchema.php similarity index 99% rename from plugins/woocommerce-blocks/src/RestApi/StoreApi/Schemas/OrderSchema.php rename to plugins/woocommerce-blocks/src/StoreApi/Schemas/OrderSchema.php index 48d0205d2c2..77c1f946c7a 100644 --- a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Schemas/OrderSchema.php +++ b/plugins/woocommerce-blocks/src/StoreApi/Schemas/OrderSchema.php @@ -7,7 +7,7 @@ * @package WooCommerce/Blocks */ -namespace Automattic\WooCommerce\Blocks\RestApi\StoreApi\Schemas; +namespace Automattic\WooCommerce\Blocks\StoreApi\Schemas; defined( 'ABSPATH' ) || exit; diff --git a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Schemas/ProductAttributeSchema.php b/plugins/woocommerce-blocks/src/StoreApi/Schemas/ProductAttributeSchema.php similarity index 97% rename from plugins/woocommerce-blocks/src/RestApi/StoreApi/Schemas/ProductAttributeSchema.php rename to plugins/woocommerce-blocks/src/StoreApi/Schemas/ProductAttributeSchema.php index c059d6943e7..80d9680f180 100644 --- a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Schemas/ProductAttributeSchema.php +++ b/plugins/woocommerce-blocks/src/StoreApi/Schemas/ProductAttributeSchema.php @@ -5,7 +5,7 @@ * @package WooCommerce/Blocks */ -namespace Automattic\WooCommerce\Blocks\RestApi\StoreApi\Schemas; +namespace Automattic\WooCommerce\Blocks\StoreApi\Schemas; defined( 'ABSPATH' ) || exit; diff --git a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Schemas/ProductCollectionDataSchema.php b/plugins/woocommerce-blocks/src/StoreApi/Schemas/ProductCollectionDataSchema.php similarity index 98% rename from plugins/woocommerce-blocks/src/RestApi/StoreApi/Schemas/ProductCollectionDataSchema.php rename to plugins/woocommerce-blocks/src/StoreApi/Schemas/ProductCollectionDataSchema.php index ef706502fa4..a4d600f769f 100644 --- a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Schemas/ProductCollectionDataSchema.php +++ b/plugins/woocommerce-blocks/src/StoreApi/Schemas/ProductCollectionDataSchema.php @@ -5,7 +5,7 @@ * @package WooCommerce/Blocks */ -namespace Automattic\WooCommerce\Blocks\RestApi\StoreApi\Schemas; +namespace Automattic\WooCommerce\Blocks\StoreApi\Schemas; defined( 'ABSPATH' ) || exit; diff --git a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Schemas/ProductSchema.php b/plugins/woocommerce-blocks/src/StoreApi/Schemas/ProductSchema.php similarity index 99% rename from plugins/woocommerce-blocks/src/RestApi/StoreApi/Schemas/ProductSchema.php rename to plugins/woocommerce-blocks/src/StoreApi/Schemas/ProductSchema.php index ffc4829a7fa..eeac5a36d44 100644 --- a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Schemas/ProductSchema.php +++ b/plugins/woocommerce-blocks/src/StoreApi/Schemas/ProductSchema.php @@ -5,7 +5,7 @@ * @package WooCommerce/Blocks */ -namespace Automattic\WooCommerce\Blocks\RestApi\StoreApi\Schemas; +namespace Automattic\WooCommerce\Blocks\StoreApi\Schemas; defined( 'ABSPATH' ) || exit; diff --git a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Schemas/ShippingAddressSchema.php b/plugins/woocommerce-blocks/src/StoreApi/Schemas/ShippingAddressSchema.php similarity index 98% rename from plugins/woocommerce-blocks/src/RestApi/StoreApi/Schemas/ShippingAddressSchema.php rename to plugins/woocommerce-blocks/src/StoreApi/Schemas/ShippingAddressSchema.php index 6501a047a70..9fb3fa70319 100644 --- a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Schemas/ShippingAddressSchema.php +++ b/plugins/woocommerce-blocks/src/StoreApi/Schemas/ShippingAddressSchema.php @@ -5,7 +5,7 @@ * @package WooCommerce/Blocks */ -namespace Automattic\WooCommerce\Blocks\RestApi\StoreApi\Schemas; +namespace Automattic\WooCommerce\Blocks\StoreApi\Schemas; defined( 'ABSPATH' ) || exit; diff --git a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Schemas/TermSchema.php b/plugins/woocommerce-blocks/src/StoreApi/Schemas/TermSchema.php similarity index 96% rename from plugins/woocommerce-blocks/src/RestApi/StoreApi/Schemas/TermSchema.php rename to plugins/woocommerce-blocks/src/StoreApi/Schemas/TermSchema.php index 5222c5833f8..00ef903fedf 100644 --- a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Schemas/TermSchema.php +++ b/plugins/woocommerce-blocks/src/StoreApi/Schemas/TermSchema.php @@ -5,7 +5,7 @@ * @package WooCommerce/Blocks */ -namespace Automattic\WooCommerce\Blocks\RestApi\StoreApi\Schemas; +namespace Automattic\WooCommerce\Blocks\StoreApi\Schemas; defined( 'ABSPATH' ) || exit; diff --git a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Utilities/CartController.php b/plugins/woocommerce-blocks/src/StoreApi/Utilities/CartController.php similarity index 99% rename from plugins/woocommerce-blocks/src/RestApi/StoreApi/Utilities/CartController.php rename to plugins/woocommerce-blocks/src/StoreApi/Utilities/CartController.php index cd42814296d..271c5acf23e 100644 --- a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Utilities/CartController.php +++ b/plugins/woocommerce-blocks/src/StoreApi/Utilities/CartController.php @@ -5,12 +5,12 @@ * @package WooCommerce/Blocks */ -namespace Automattic\WooCommerce\Blocks\RestApi\StoreApi\Utilities; +namespace Automattic\WooCommerce\Blocks\StoreApi\Utilities; defined( 'ABSPATH' ) || exit; -use Automattic\WooCommerce\Blocks\RestApi\StoreApi\Routes\RouteException; -use Automattic\WooCommerce\Blocks\RestApi\StoreApi\Utilities\NoticeHandler; +use Automattic\WooCommerce\Blocks\StoreApi\Routes\RouteException; +use Automattic\WooCommerce\Blocks\StoreApi\Utilities\NoticeHandler; /** * Woo Cart Controller class. @@ -630,7 +630,7 @@ class CartController { if ( \class_exists( '\Automattic\WooCommerce\Checkout\Helpers\ReserveStock' ) ) { $reserve_stock_controller = new \Automattic\WooCommerce\Checkout\Helpers\ReserveStock(); } else { - $reserve_stock_controller = new \Automattic\WooCommerce\Blocks\RestApi\StoreApi\Utilities\ReserveStock(); + $reserve_stock_controller = new \Automattic\WooCommerce\Blocks\StoreApi\Utilities\ReserveStock(); } $draft_order = wc()->session->get( 'store_api_draft_order', 0 ); diff --git a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Utilities/NoticeHandler.php b/plugins/woocommerce-blocks/src/StoreApi/Utilities/NoticeHandler.php similarity index 88% rename from plugins/woocommerce-blocks/src/RestApi/StoreApi/Utilities/NoticeHandler.php rename to plugins/woocommerce-blocks/src/StoreApi/Utilities/NoticeHandler.php index 451d18140cc..003de3880d7 100644 --- a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Utilities/NoticeHandler.php +++ b/plugins/woocommerce-blocks/src/StoreApi/Utilities/NoticeHandler.php @@ -5,11 +5,11 @@ * @package WooCommerce/Blocks */ -namespace Automattic\WooCommerce\Blocks\RestApi\StoreApi\Utilities; +namespace Automattic\WooCommerce\Blocks\StoreApi\Utilities; defined( 'ABSPATH' ) || exit; -use Automattic\WooCommerce\Blocks\RestApi\StoreApi\Routes\RouteException; +use Automattic\WooCommerce\Blocks\StoreApi\Routes\RouteException; /** * NoticeHandler class. diff --git a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Utilities/OrderController.php b/plugins/woocommerce-blocks/src/StoreApi/Utilities/OrderController.php similarity index 98% rename from plugins/woocommerce-blocks/src/RestApi/StoreApi/Utilities/OrderController.php rename to plugins/woocommerce-blocks/src/StoreApi/Utilities/OrderController.php index 84a40eaef12..bcc485685ab 100644 --- a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Utilities/OrderController.php +++ b/plugins/woocommerce-blocks/src/StoreApi/Utilities/OrderController.php @@ -5,11 +5,11 @@ * @package WooCommerce/Blocks */ -namespace Automattic\WooCommerce\Blocks\RestApi\StoreApi\Utilities; +namespace Automattic\WooCommerce\Blocks\StoreApi\Utilities; defined( 'ABSPATH' ) || exit; -use Automattic\WooCommerce\Blocks\RestApi\StoreApi\Routes\RouteException; +use Automattic\WooCommerce\Blocks\StoreApi\Routes\RouteException; /** * OrderController class. diff --git a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Utilities/Pagination.php b/plugins/woocommerce-blocks/src/StoreApi/Utilities/Pagination.php similarity index 96% rename from plugins/woocommerce-blocks/src/RestApi/StoreApi/Utilities/Pagination.php rename to plugins/woocommerce-blocks/src/StoreApi/Utilities/Pagination.php index ebe2bb6ed33..20cc01d82dc 100644 --- a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Utilities/Pagination.php +++ b/plugins/woocommerce-blocks/src/StoreApi/Utilities/Pagination.php @@ -5,7 +5,7 @@ * @package Automattic/WooCommerce/RestApi */ -namespace Automattic\WooCommerce\Blocks\RestApi\StoreApi\Utilities; +namespace Automattic\WooCommerce\Blocks\StoreApi\Utilities; defined( 'ABSPATH' ) || exit; diff --git a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Utilities/ProductFiltering.php b/plugins/woocommerce-blocks/src/StoreApi/Utilities/ProductFiltering.php similarity index 97% rename from plugins/woocommerce-blocks/src/RestApi/StoreApi/Utilities/ProductFiltering.php rename to plugins/woocommerce-blocks/src/StoreApi/Utilities/ProductFiltering.php index cb5b76446c4..df8e83648d9 100644 --- a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Utilities/ProductFiltering.php +++ b/plugins/woocommerce-blocks/src/StoreApi/Utilities/ProductFiltering.php @@ -5,11 +5,11 @@ * @package Automattic/WooCommerce/RestApi */ -namespace Automattic\WooCommerce\Blocks\RestApi\StoreApi\Utilities; +namespace Automattic\WooCommerce\Blocks\StoreApi\Utilities; defined( 'ABSPATH' ) || exit; -use Automattic\WooCommerce\Blocks\RestApi\StoreApi\Utilities\ProductQuery; +use Automattic\WooCommerce\Blocks\StoreApi\Utilities\ProductQuery; /** * Product Query filters class. diff --git a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Utilities/ProductQuery.php b/plugins/woocommerce-blocks/src/StoreApi/Utilities/ProductQuery.php similarity index 99% rename from plugins/woocommerce-blocks/src/RestApi/StoreApi/Utilities/ProductQuery.php rename to plugins/woocommerce-blocks/src/StoreApi/Utilities/ProductQuery.php index a1cec201df4..920d1533882 100644 --- a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Utilities/ProductQuery.php +++ b/plugins/woocommerce-blocks/src/StoreApi/Utilities/ProductQuery.php @@ -5,11 +5,11 @@ * @package WooCommerce/Blocks */ -namespace Automattic\WooCommerce\Blocks\RestApi\StoreApi\Utilities; +namespace Automattic\WooCommerce\Blocks\StoreApi\Utilities; defined( 'ABSPATH' ) || exit; -use \WC_Tax; +use WC_Tax; /** * Product Query class. diff --git a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Utilities/ReserveStock.php b/plugins/woocommerce-blocks/src/StoreApi/Utilities/ReserveStock.php similarity index 98% rename from plugins/woocommerce-blocks/src/RestApi/StoreApi/Utilities/ReserveStock.php rename to plugins/woocommerce-blocks/src/StoreApi/Utilities/ReserveStock.php index f78a2fa1c3a..ea23c5649d7 100644 --- a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Utilities/ReserveStock.php +++ b/plugins/woocommerce-blocks/src/StoreApi/Utilities/ReserveStock.php @@ -5,7 +5,7 @@ * @package WooCommerce/Blocks */ -namespace Automattic\WooCommerce\Blocks\RestApi\StoreApi\Utilities; +namespace Automattic\WooCommerce\Blocks\StoreApi\Utilities; defined( 'ABSPATH' ) || exit; diff --git a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Utilities/ReserveStockException.php b/plugins/woocommerce-blocks/src/StoreApi/Utilities/ReserveStockException.php similarity index 94% rename from plugins/woocommerce-blocks/src/RestApi/StoreApi/Utilities/ReserveStockException.php rename to plugins/woocommerce-blocks/src/StoreApi/Utilities/ReserveStockException.php index d2808439f56..04a18cbfab1 100644 --- a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Utilities/ReserveStockException.php +++ b/plugins/woocommerce-blocks/src/StoreApi/Utilities/ReserveStockException.php @@ -5,7 +5,7 @@ * @package WooCommerce/Blocks */ -namespace Automattic\WooCommerce\Blocks\RestApi\StoreApi\Utilities; +namespace Automattic\WooCommerce\Blocks\StoreApi\Utilities; /** * ReserveStockException class. diff --git a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Utilities/TermQuery.php b/plugins/woocommerce-blocks/src/StoreApi/Utilities/TermQuery.php similarity index 93% rename from plugins/woocommerce-blocks/src/RestApi/StoreApi/Utilities/TermQuery.php rename to plugins/woocommerce-blocks/src/StoreApi/Utilities/TermQuery.php index 76ee6381c6a..ed15ef80e8e 100644 --- a/plugins/woocommerce-blocks/src/RestApi/StoreApi/Utilities/TermQuery.php +++ b/plugins/woocommerce-blocks/src/StoreApi/Utilities/TermQuery.php @@ -5,7 +5,7 @@ * @package WooCommerce/Blocks */ -namespace Automattic\WooCommerce\Blocks\RestApi\StoreApi\Utilities; +namespace Automattic\WooCommerce\Blocks\StoreApi\Utilities; defined( 'ABSPATH' ) || exit; diff --git a/plugins/woocommerce-blocks/src/RestApi/StoreApi/docs/cart-coupons.md b/plugins/woocommerce-blocks/src/StoreApi/docs/cart-coupons.md similarity index 100% rename from plugins/woocommerce-blocks/src/RestApi/StoreApi/docs/cart-coupons.md rename to plugins/woocommerce-blocks/src/StoreApi/docs/cart-coupons.md diff --git a/plugins/woocommerce-blocks/src/RestApi/StoreApi/docs/cart-items.md b/plugins/woocommerce-blocks/src/StoreApi/docs/cart-items.md similarity index 100% rename from plugins/woocommerce-blocks/src/RestApi/StoreApi/docs/cart-items.md rename to plugins/woocommerce-blocks/src/StoreApi/docs/cart-items.md diff --git a/plugins/woocommerce-blocks/src/RestApi/StoreApi/docs/cart.md b/plugins/woocommerce-blocks/src/StoreApi/docs/cart.md similarity index 100% rename from plugins/woocommerce-blocks/src/RestApi/StoreApi/docs/cart.md rename to plugins/woocommerce-blocks/src/StoreApi/docs/cart.md diff --git a/plugins/woocommerce-blocks/src/RestApi/StoreApi/docs/checkout.md b/plugins/woocommerce-blocks/src/StoreApi/docs/checkout.md similarity index 100% rename from plugins/woocommerce-blocks/src/RestApi/StoreApi/docs/checkout.md rename to plugins/woocommerce-blocks/src/StoreApi/docs/checkout.md diff --git a/plugins/woocommerce-blocks/src/RestApi/StoreApi/docs/nonce-tokens.md b/plugins/woocommerce-blocks/src/StoreApi/docs/nonce-tokens.md similarity index 100% rename from plugins/woocommerce-blocks/src/RestApi/StoreApi/docs/nonce-tokens.md rename to plugins/woocommerce-blocks/src/StoreApi/docs/nonce-tokens.md diff --git a/plugins/woocommerce-blocks/src/RestApi/StoreApi/docs/product-attribute-terms.md b/plugins/woocommerce-blocks/src/StoreApi/docs/product-attribute-terms.md similarity index 100% rename from plugins/woocommerce-blocks/src/RestApi/StoreApi/docs/product-attribute-terms.md rename to plugins/woocommerce-blocks/src/StoreApi/docs/product-attribute-terms.md diff --git a/plugins/woocommerce-blocks/src/RestApi/StoreApi/docs/product-attributes.md b/plugins/woocommerce-blocks/src/StoreApi/docs/product-attributes.md similarity index 100% rename from plugins/woocommerce-blocks/src/RestApi/StoreApi/docs/product-attributes.md rename to plugins/woocommerce-blocks/src/StoreApi/docs/product-attributes.md diff --git a/plugins/woocommerce-blocks/src/RestApi/StoreApi/docs/product-collection-data.md b/plugins/woocommerce-blocks/src/StoreApi/docs/product-collection-data.md similarity index 100% rename from plugins/woocommerce-blocks/src/RestApi/StoreApi/docs/product-collection-data.md rename to plugins/woocommerce-blocks/src/StoreApi/docs/product-collection-data.md diff --git a/plugins/woocommerce-blocks/src/RestApi/StoreApi/docs/products.md b/plugins/woocommerce-blocks/src/StoreApi/docs/products.md similarity index 100% rename from plugins/woocommerce-blocks/src/RestApi/StoreApi/docs/products.md rename to plugins/woocommerce-blocks/src/StoreApi/docs/products.md diff --git a/plugins/woocommerce-blocks/src/Utils/BlocksWpQuery.php b/plugins/woocommerce-blocks/src/Utils/BlocksWpQuery.php index cee9f91973b..cdc6ad04809 100644 --- a/plugins/woocommerce-blocks/src/Utils/BlocksWpQuery.php +++ b/plugins/woocommerce-blocks/src/Utils/BlocksWpQuery.php @@ -9,7 +9,7 @@ namespace Automattic\WooCommerce\Blocks\Utils; -use \WP_Query; +use WP_Query; defined( 'ABSPATH' ) || exit; diff --git a/plugins/woocommerce-blocks/tests/php/RestApi/StoreApi/Routes/Cart.php b/plugins/woocommerce-blocks/tests/php/StoreApi/Routes/Cart.php similarity index 97% rename from plugins/woocommerce-blocks/tests/php/RestApi/StoreApi/Routes/Cart.php rename to plugins/woocommerce-blocks/tests/php/StoreApi/Routes/Cart.php index cbb15365a1a..e72f9894074 100644 --- a/plugins/woocommerce-blocks/tests/php/RestApi/StoreApi/Routes/Cart.php +++ b/plugins/woocommerce-blocks/tests/php/StoreApi/Routes/Cart.php @@ -5,7 +5,7 @@ * @package WooCommerce\Blocks\Tests */ -namespace Automattic\WooCommerce\Blocks\Tests\RestApi\StoreApi\Controllers; +namespace Automattic\WooCommerce\Blocks\Tests\StoreApi\Controllers; use \WP_REST_Request; use \WC_REST_Unit_Test_Case as TestCase; @@ -352,7 +352,7 @@ class Cart extends TestCase { * Test conversion of cart item to rest response. */ public function test_prepare_item_for_response() { - $routes = new \Automattic\WooCommerce\Blocks\RestApi\StoreApi\RoutesController( new \Automattic\WooCommerce\Blocks\RestApi\StoreApi\SchemaController() ); + $routes = new \Automattic\WooCommerce\Blocks\StoreApi\RoutesController( new \Automattic\WooCommerce\Blocks\StoreApi\SchemaController() ); $controller = $routes->get( 'cart' ); $cart = wc()->cart; $response = $controller->prepare_item_for_response( $cart, new \WP_REST_Request() ); @@ -372,7 +372,7 @@ class Cart extends TestCase { * Test schema matches responses. */ public function test_schema_matches_response() { - $routes = new \Automattic\WooCommerce\Blocks\RestApi\StoreApi\RoutesController( new \Automattic\WooCommerce\Blocks\RestApi\StoreApi\SchemaController() ); + $routes = new \Automattic\WooCommerce\Blocks\StoreApi\RoutesController( new \Automattic\WooCommerce\Blocks\StoreApi\SchemaController() ); $controller = $routes->get( 'cart' ); $schema = $controller->get_item_schema(); $cart = wc()->cart; diff --git a/plugins/woocommerce-blocks/tests/php/RestApi/StoreApi/Routes/CartCoupons.php b/plugins/woocommerce-blocks/tests/php/StoreApi/Routes/CartCoupons.php similarity index 93% rename from plugins/woocommerce-blocks/tests/php/RestApi/StoreApi/Routes/CartCoupons.php rename to plugins/woocommerce-blocks/tests/php/StoreApi/Routes/CartCoupons.php index 6617823fc23..9d9df25bb20 100644 --- a/plugins/woocommerce-blocks/tests/php/RestApi/StoreApi/Routes/CartCoupons.php +++ b/plugins/woocommerce-blocks/tests/php/StoreApi/Routes/CartCoupons.php @@ -5,7 +5,7 @@ * @package WooCommerce\Blocks\Tests */ -namespace Automattic\WooCommerce\Blocks\Tests\RestApi\StoreApi\Controllers; +namespace Automattic\WooCommerce\Blocks\Tests\StoreApi\Controllers; use \WP_REST_Request; use \WC_REST_Unit_Test_Case as TestCase; @@ -156,7 +156,7 @@ class CartCoupons extends TestCase { * Test conversion of cart item to rest response. */ public function test_prepare_item_for_response() { - $routes = new \Automattic\WooCommerce\Blocks\RestApi\StoreApi\RoutesController( new \Automattic\WooCommerce\Blocks\RestApi\StoreApi\SchemaController() ); + $routes = new \Automattic\WooCommerce\Blocks\StoreApi\RoutesController( new \Automattic\WooCommerce\Blocks\StoreApi\SchemaController() ); $controller = $routes->get( 'cart-coupons' ); $response = $controller->prepare_item_for_response( $this->coupon->get_code(), new \WP_REST_Request() ); @@ -170,7 +170,7 @@ class CartCoupons extends TestCase { * Test schema matches responses. */ public function test_schema_matches_response() { - $routes = new \Automattic\WooCommerce\Blocks\RestApi\StoreApi\RoutesController( new \Automattic\WooCommerce\Blocks\RestApi\StoreApi\SchemaController() ); + $routes = new \Automattic\WooCommerce\Blocks\StoreApi\RoutesController( new \Automattic\WooCommerce\Blocks\StoreApi\SchemaController() ); $controller = $routes->get( 'cart-coupons' ); $schema = $controller->get_item_schema(); $response = $controller->prepare_item_for_response( $this->coupon->get_code(), new \WP_REST_Request() ); diff --git a/plugins/woocommerce-blocks/tests/php/RestApi/StoreApi/Routes/CartItems.php b/plugins/woocommerce-blocks/tests/php/StoreApi/Routes/CartItems.php similarity index 95% rename from plugins/woocommerce-blocks/tests/php/RestApi/StoreApi/Routes/CartItems.php rename to plugins/woocommerce-blocks/tests/php/StoreApi/Routes/CartItems.php index a4ff1fa5f51..d8fb3830272 100644 --- a/plugins/woocommerce-blocks/tests/php/RestApi/StoreApi/Routes/CartItems.php +++ b/plugins/woocommerce-blocks/tests/php/StoreApi/Routes/CartItems.php @@ -5,7 +5,7 @@ * @package WooCommerce\Blocks\Tests */ -namespace Automattic\WooCommerce\Blocks\Tests\RestApi\StoreApi\Controllers; +namespace Automattic\WooCommerce\Blocks\Tests\StoreApi\Controllers; use \WP_REST_Request; use \WC_REST_Unit_Test_Case as TestCase; @@ -212,7 +212,7 @@ class CartItems extends TestCase { * Test conversion of cart item to rest response. */ public function test_prepare_item_for_response() { - $routes = new \Automattic\WooCommerce\Blocks\RestApi\StoreApi\RoutesController( new \Automattic\WooCommerce\Blocks\RestApi\StoreApi\SchemaController() ); + $routes = new \Automattic\WooCommerce\Blocks\StoreApi\RoutesController( new \Automattic\WooCommerce\Blocks\StoreApi\SchemaController() ); $controller = $routes->get( 'cart-items' ); $cart = wc()->cart->get_cart(); $response = $controller->prepare_item_for_response( current( $cart ), new \WP_REST_Request() ); @@ -238,7 +238,7 @@ class CartItems extends TestCase { * Tests schema of both products in cart to cover as much schema as possible. */ public function test_schema_matches_response() { - $routes = new \Automattic\WooCommerce\Blocks\RestApi\StoreApi\RoutesController( new \Automattic\WooCommerce\Blocks\RestApi\StoreApi\SchemaController() ); + $routes = new \Automattic\WooCommerce\Blocks\StoreApi\RoutesController( new \Automattic\WooCommerce\Blocks\StoreApi\SchemaController() ); $controller = $routes->get( 'cart-items' ); $schema = $controller->get_item_schema(); $cart = wc()->cart->get_cart(); diff --git a/plugins/woocommerce-blocks/tests/php/RestApi/StoreApi/Routes/ProductAttributeTerms.php b/plugins/woocommerce-blocks/tests/php/StoreApi/Routes/ProductAttributeTerms.php similarity index 84% rename from plugins/woocommerce-blocks/tests/php/RestApi/StoreApi/Routes/ProductAttributeTerms.php rename to plugins/woocommerce-blocks/tests/php/StoreApi/Routes/ProductAttributeTerms.php index f5399eb6ae5..805145871dd 100644 --- a/plugins/woocommerce-blocks/tests/php/RestApi/StoreApi/Routes/ProductAttributeTerms.php +++ b/plugins/woocommerce-blocks/tests/php/StoreApi/Routes/ProductAttributeTerms.php @@ -5,7 +5,7 @@ * @package WooCommerce\Blocks\Tests */ -namespace Automattic\WooCommerce\Blocks\Tests\RestApi\StoreApi\Controllers; +namespace Automattic\WooCommerce\Blocks\Tests\StoreApi\Controllers; use \WP_REST_Request; use \WC_REST_Unit_Test_Case as TestCase; @@ -68,8 +68,8 @@ class ProductAttributeTerms extends TestCase { * Test conversion of product to rest response. */ public function test_prepare_item_for_response() { - $schema = new \Automattic\WooCommerce\Blocks\RestApi\StoreApi\Schemas\TermSchema(); - $controller = new \Automattic\WooCommerce\Blocks\RestApi\StoreApi\Routes\ProductAttributeTerms( $schema ); + $schema = new \Automattic\WooCommerce\Blocks\StoreApi\Schemas\TermSchema(); + $controller = new \Automattic\WooCommerce\Blocks\StoreApi\Routes\ProductAttributeTerms( $schema ); $response = $controller->prepare_item_for_response( get_term_by( 'name', 'test', 'pa_size' ), new \WP_REST_Request() ); $data = $response->get_data(); @@ -84,7 +84,7 @@ class ProductAttributeTerms extends TestCase { * Test collection params getter. */ public function test_get_collection_params() { - $routes = new \Automattic\WooCommerce\Blocks\RestApi\StoreApi\RoutesController( new \Automattic\WooCommerce\Blocks\RestApi\StoreApi\SchemaController() ); + $routes = new \Automattic\WooCommerce\Blocks\StoreApi\RoutesController( new \Automattic\WooCommerce\Blocks\StoreApi\SchemaController() ); $controller = $routes->get( 'product-attribute-terms' ); $params = $controller->get_collection_params(); @@ -97,7 +97,7 @@ class ProductAttributeTerms extends TestCase { * Test schema matches responses. */ public function test_schema_matches_response() { - $routes = new \Automattic\WooCommerce\Blocks\RestApi\StoreApi\RoutesController( new \Automattic\WooCommerce\Blocks\RestApi\StoreApi\SchemaController() ); + $routes = new \Automattic\WooCommerce\Blocks\StoreApi\RoutesController( new \Automattic\WooCommerce\Blocks\StoreApi\SchemaController() ); $controller = $routes->get( 'product-attribute-terms' ); $schema = $controller->get_item_schema(); $response = $controller->prepare_item_for_response( get_term_by( 'name', 'test', 'pa_size' ), new \WP_REST_Request() ); diff --git a/plugins/woocommerce-blocks/tests/php/RestApi/StoreApi/Routes/ProductAttributes.php b/plugins/woocommerce-blocks/tests/php/StoreApi/Routes/ProductAttributes.php similarity index 90% rename from plugins/woocommerce-blocks/tests/php/RestApi/StoreApi/Routes/ProductAttributes.php rename to plugins/woocommerce-blocks/tests/php/StoreApi/Routes/ProductAttributes.php index 7ca83ac004e..bae6d7fdcfc 100644 --- a/plugins/woocommerce-blocks/tests/php/RestApi/StoreApi/Routes/ProductAttributes.php +++ b/plugins/woocommerce-blocks/tests/php/StoreApi/Routes/ProductAttributes.php @@ -5,7 +5,7 @@ * @package WooCommerce\Blocks\Tests */ -namespace Automattic\WooCommerce\Blocks\Tests\RestApi\StoreApi\Controllers; +namespace Automattic\WooCommerce\Blocks\Tests\StoreApi\Controllers; use \WP_REST_Request; use \WC_REST_Unit_Test_Case as TestCase; @@ -78,7 +78,7 @@ class ProductAttributes extends TestCase { * Test conversion of product to rest response. */ public function test_prepare_item_for_response() { - $routes = new \Automattic\WooCommerce\Blocks\RestApi\StoreApi\RoutesController( new \Automattic\WooCommerce\Blocks\RestApi\StoreApi\SchemaController() ); + $routes = new \Automattic\WooCommerce\Blocks\StoreApi\RoutesController( new \Automattic\WooCommerce\Blocks\StoreApi\SchemaController() ); $controller = $routes->get( 'product-attributes' ); $response = $controller->prepare_item_for_response( $this->attributes[0], new \WP_REST_Request() ); $data = $response->get_data(); @@ -95,7 +95,7 @@ class ProductAttributes extends TestCase { * Test schema matches responses. */ public function test_schema_matches_response() { - $routes = new \Automattic\WooCommerce\Blocks\RestApi\StoreApi\RoutesController( new \Automattic\WooCommerce\Blocks\RestApi\StoreApi\SchemaController() ); + $routes = new \Automattic\WooCommerce\Blocks\StoreApi\RoutesController( new \Automattic\WooCommerce\Blocks\StoreApi\SchemaController() ); $controller = $routes->get( 'product-attributes' ); $schema = $controller->get_item_schema(); $response = $controller->prepare_item_for_response( $this->attributes[0], new \WP_REST_Request() ); diff --git a/plugins/woocommerce-blocks/tests/php/RestApi/StoreApi/Routes/ProductCollectionData.php b/plugins/woocommerce-blocks/tests/php/StoreApi/Routes/ProductCollectionData.php similarity index 93% rename from plugins/woocommerce-blocks/tests/php/RestApi/StoreApi/Routes/ProductCollectionData.php rename to plugins/woocommerce-blocks/tests/php/StoreApi/Routes/ProductCollectionData.php index 50dc4912547..d66c8af244b 100644 --- a/plugins/woocommerce-blocks/tests/php/RestApi/StoreApi/Routes/ProductCollectionData.php +++ b/plugins/woocommerce-blocks/tests/php/StoreApi/Routes/ProductCollectionData.php @@ -5,7 +5,7 @@ * @package WooCommerce\Blocks\Tests */ -namespace Automattic\WooCommerce\Blocks\Tests\RestApi\StoreApi\Controllers; +namespace Automattic\WooCommerce\Blocks\Tests\StoreApi\Controllers; use \WP_REST_Request; use \WC_REST_Unit_Test_Case as TestCase; @@ -163,7 +163,7 @@ class ProductCollectionData extends TestCase { * Test collection params getter. */ public function test_get_collection_params() { - $routes = new \Automattic\WooCommerce\Blocks\RestApi\StoreApi\RoutesController( new \Automattic\WooCommerce\Blocks\RestApi\StoreApi\SchemaController() ); + $routes = new \Automattic\WooCommerce\Blocks\StoreApi\RoutesController( new \Automattic\WooCommerce\Blocks\StoreApi\SchemaController() ); $controller = $routes->get( 'product-collection-data' ); $params = $controller->get_collection_params(); @@ -178,7 +178,7 @@ class ProductCollectionData extends TestCase { public function test_schema_matches_response() { ProductHelper::create_variation_product(); - $routes = new \Automattic\WooCommerce\Blocks\RestApi\StoreApi\RoutesController( new \Automattic\WooCommerce\Blocks\RestApi\StoreApi\SchemaController() ); + $routes = new \Automattic\WooCommerce\Blocks\StoreApi\RoutesController( new \Automattic\WooCommerce\Blocks\StoreApi\SchemaController() ); $controller = $routes->get( 'product-collection-data' ); $schema = $controller->get_item_schema(); diff --git a/plugins/woocommerce-blocks/tests/php/RestApi/StoreApi/Routes/Products.php b/plugins/woocommerce-blocks/tests/php/StoreApi/Routes/Products.php similarity index 92% rename from plugins/woocommerce-blocks/tests/php/RestApi/StoreApi/Routes/Products.php rename to plugins/woocommerce-blocks/tests/php/StoreApi/Routes/Products.php index 9ad34d06d05..57637d4f425 100644 --- a/plugins/woocommerce-blocks/tests/php/RestApi/StoreApi/Routes/Products.php +++ b/plugins/woocommerce-blocks/tests/php/StoreApi/Routes/Products.php @@ -5,7 +5,7 @@ * @package WooCommerce\Blocks\Tests */ -namespace Automattic\WooCommerce\Blocks\Tests\RestApi\StoreApi\Controllers; +namespace Automattic\WooCommerce\Blocks\Tests\StoreApi\Controllers; use \WP_REST_Request; use \WC_REST_Unit_Test_Case as TestCase; @@ -103,8 +103,8 @@ class Products extends TestCase { * Test conversion of prdouct to rest response. */ public function test_prepare_item_for_response() { - $schemas = new \Automattic\WooCommerce\Blocks\RestApi\StoreApi\SchemaController(); - $routes = new \Automattic\WooCommerce\Blocks\RestApi\StoreApi\RoutesController( $schemas ); + $schemas = new \Automattic\WooCommerce\Blocks\StoreApi\SchemaController(); + $routes = new \Automattic\WooCommerce\Blocks\StoreApi\RoutesController( $schemas ); $schema = $schemas->get( 'product' ); $controller = $routes->get( 'products' ); $response = $controller->prepare_item_for_response( $this->products[0], new \WP_REST_Request() ); @@ -131,7 +131,7 @@ class Products extends TestCase { * Test collection params getter. */ public function test_get_collection_params() { - $routes = new \Automattic\WooCommerce\Blocks\RestApi\StoreApi\RoutesController( new \Automattic\WooCommerce\Blocks\RestApi\StoreApi\SchemaController() ); + $routes = new \Automattic\WooCommerce\Blocks\StoreApi\RoutesController( new \Automattic\WooCommerce\Blocks\StoreApi\SchemaController() ); $controller = $routes->get( 'products' ); $params = $controller->get_collection_params(); @@ -169,7 +169,7 @@ class Products extends TestCase { * Test schema matches responses. */ public function test_schema_matches_response() { - $routes = new \Automattic\WooCommerce\Blocks\RestApi\StoreApi\RoutesController( new \Automattic\WooCommerce\Blocks\RestApi\StoreApi\SchemaController() ); + $routes = new \Automattic\WooCommerce\Blocks\StoreApi\RoutesController( new \Automattic\WooCommerce\Blocks\StoreApi\SchemaController() ); $controller = $routes->get( 'products' ); $schema = $controller->get_item_schema(); $response = $controller->prepare_item_for_response( $this->products[0], new \WP_REST_Request() ); diff --git a/plugins/woocommerce-blocks/tests/php/RestApi/StoreApi/Utilities/ReserveStock.php b/plugins/woocommerce-blocks/tests/php/StoreApi/Utilities/ReserveStock.php similarity index 90% rename from plugins/woocommerce-blocks/tests/php/RestApi/StoreApi/Utilities/ReserveStock.php rename to plugins/woocommerce-blocks/tests/php/StoreApi/Utilities/ReserveStock.php index 25f728529f3..25a528884bb 100644 --- a/plugins/woocommerce-blocks/tests/php/RestApi/StoreApi/Utilities/ReserveStock.php +++ b/plugins/woocommerce-blocks/tests/php/StoreApi/Utilities/ReserveStock.php @@ -5,12 +5,12 @@ * @package WooCommerce\Blocks\Tests */ -namespace Automattic\WooCommerce\Blocks\Tests\RestApi\StoreApi\Utilities; +namespace Automattic\WooCommerce\Blocks\Tests\StoreApi\Utilities; use PHPUnit\Framework\TestCase; use \WC_Helper_Order as OrderHelper; use \WC_Helper_Product as ProductHelper; -use Automattic\WooCommerce\Blocks\RestApi\StoreApi\Utilities\ReserveStock; +use Automattic\WooCommerce\Blocks\StoreApi\Utilities\ReserveStock; /** * ReserveStock Utility Tests. @@ -47,7 +47,7 @@ class ReserveStockTests extends TestCase { /** * Test that trying to reserve stock too much throws an exception. * - * @expectedException Automattic\WooCommerce\Blocks\RestApi\StoreApi\Utilities\ReserveStockException + * @expectedException Automattic\WooCommerce\Blocks\StoreApi\Utilities\ReserveStockException */ public function test_reserve_stock_for_order_throws_exception() { $class = new ReserveStock();