From 69769bf1523ad6153a822afa913bc87be1fb7dbd Mon Sep 17 00:00:00 2001 From: Mike Jolley Date: Thu, 30 May 2019 15:34:34 +0100 Subject: [PATCH] Continued namespacing --- ...-controller.php => AbstractController.php} | 17 ++++++------ ...ller.php => AbstractObjectsController.php} | 21 +++++---------- ...roller.php => AbstractPostsController.php} | 23 ++++++---------- ...hp => AbstractShippingZonesController.php} | 19 +++++-------- ...troller.php => AbstractTermsContoller.php} | 11 ++++---- src/RestApi/Version4/Controllers/Coupons.php | 7 ----- .../Controllers/CustomerDownloads.php | 7 ----- .../Version4/Controllers/Customers.php | 7 ----- src/RestApi/Version4/Controllers/Data.php | 7 ----- .../Version4/Controllers/Data/Continents.php | 7 ----- .../Version4/Controllers/Data/Countries.php | 7 ----- .../Version4/Controllers/Data/Currencies.php | 7 ----- .../Version4/Controllers/Data/DownloadIPs.php | 6 ----- .../Version4/Controllers/OrderNotes.php | 7 ----- .../Version4/Controllers/OrderRefunds.php | 7 ----- src/RestApi/Version4/Controllers/Orders.php | 8 ------ .../Controllers/ProductAttributeTerms.php | 11 ++------ .../Controllers/ProductAttributes.php | 7 ----- .../Controllers/ProductCategories.php | 11 ++------ .../Version4/Controllers/ProductReviews.php | 7 ----- .../Controllers/ProductShippingClasses.php | 11 ++------ .../Version4/Controllers/ProductTags.php | 11 ++------ src/RestApi/Version4/Controllers/Products.php | 7 ----- src/RestApi/Version4/Controllers/Reports.php | 7 ----- .../Controllers/Reports/Categories.php | 7 ----- .../Controllers/Reports/CouponStats.php | 8 ------ .../Version4/Controllers/Reports/Coupons.php | 7 ----- .../Controllers/Reports/CustomerStats.php | 6 ----- .../Controllers/Reports/Customers.php | 7 ----- .../Controllers/Reports/DownloadStats.php | 7 ----- .../Controllers/Reports/Downloads.php | 7 ----- .../Version4/Controllers/Reports/Import.php | 6 ----- .../Controllers/Reports/OrderStats.php | 7 ----- .../Version4/Controllers/Reports/Orders.php | 7 ----- .../Reports/PerformanceIndicators.php | 7 ----- .../Controllers/Reports/ProductStats.php | 7 ----- .../Version4/Controllers/Reports/Products.php | 7 ----- .../Controllers/Reports/RevenueStats.php | 7 ----- .../Version4/Controllers/Reports/Stock.php | 7 ----- .../Controllers/Reports/StockStats.php | 7 ----- .../Version4/Controllers/Reports/TaxStats.php | 7 ----- .../Version4/Controllers/Reports/Taxes.php | 7 ----- .../Controllers/Reports/Variations.php | 7 ----- .../SystemStatus.php} | 21 +++++---------- .../SystemStatusTools.php} | 21 +++++---------- .../Version4/Controllers/TaxClasses.php | 7 ----- src/RestApi/Version4/Controllers/Taxes.php | 7 ----- src/RestApi/Version4/Controllers/Webhooks.php | 7 ----- src/RestApi/Version4/changelog.md | 1 + ...-admin-rest-setting-options-controller.php | 27 ------------------- ...lass-wc-rest-network-orders-controller.php | 27 ------------------- ...ss-wc-rest-shipping-methods-controller.php | 27 ------------------- ...est-shipping-zone-locations-controller.php | 27 ------------------- ...-rest-shipping-zone-methods-controller.php | 27 ------------------- ...lass-wc-rest-shipping-zones-controller.php | 27 ------------------- ...class-wc-rest-system-status-controller.php | 27 ------------------- ...wc-rest-system-status-tools-controller.php | 27 ------------------- 57 files changed, 59 insertions(+), 593 deletions(-) rename src/RestApi/Version4/{class-wc-rest-controller.php => AbstractController.php} (97%) rename src/RestApi/Version4/{class-wc-rest-crud-controller.php => AbstractObjectsController.php} (98%) rename src/RestApi/Version4/{class-wc-rest-posts-controller.php => AbstractPostsController.php} (98%) rename src/RestApi/Version4/{class-wc-rest-shipping-zones-controller-base.php => AbstractShippingZonesController.php} (93%) rename src/RestApi/Version4/{class-wc-rest-terms-controller.php => AbstractTermsContoller.php} (99%) rename src/RestApi/Version4/{class-wc-rest-system-status-v2-controller.php => Controllers/SystemStatus.php} (99%) rename src/RestApi/Version4/{class-wc-rest-system-status-tools-v2-controller.php => Controllers/SystemStatusTools.php} (98%) delete mode 100644 src/RestApi/Version4/class-wc-admin-rest-setting-options-controller.php delete mode 100644 src/RestApi/Version4/class-wc-rest-network-orders-controller.php delete mode 100644 src/RestApi/Version4/class-wc-rest-shipping-methods-controller.php delete mode 100644 src/RestApi/Version4/class-wc-rest-shipping-zone-locations-controller.php delete mode 100644 src/RestApi/Version4/class-wc-rest-shipping-zone-methods-controller.php delete mode 100644 src/RestApi/Version4/class-wc-rest-shipping-zones-controller.php delete mode 100644 src/RestApi/Version4/class-wc-rest-system-status-controller.php delete mode 100644 src/RestApi/Version4/class-wc-rest-system-status-tools-controller.php diff --git a/src/RestApi/Version4/class-wc-rest-controller.php b/src/RestApi/Version4/AbstractController.php similarity index 97% rename from src/RestApi/Version4/class-wc-rest-controller.php rename to src/RestApi/Version4/AbstractController.php index e0ff5c4732c..d49a1df39d8 100644 --- a/src/RestApi/Version4/class-wc-rest-controller.php +++ b/src/RestApi/Version4/AbstractController.php @@ -8,17 +8,16 @@ * It's required to follow "Controller Classes" guide before extending this class: * * - * NOTE THAT ONLY CODE RELEVANT FOR MOST ENDPOINTS SHOULD BE INCLUDED INTO THIS CLASS. - * If necessary extend this class and create new abstract classes like `WC_REST_CRUD_Controller` or `WC_REST_Terms_Controller`. - * * @class WC_REST_Controller - * @package WooCommerce/RestApi * @see https://developer.wordpress.org/rest-api/extending-the-rest-api/controller-classes/ + * @package WooCommerce/RestApi */ -if ( ! defined( 'ABSPATH' ) ) { - exit; -} +namespace WooCommerce\RestApi\Version4; + +defined( 'ABSPATH' ) || exit; + +use \WP_REST_Controller; /** * Abstract Rest Controller Class @@ -27,14 +26,14 @@ if ( ! defined( 'ABSPATH' ) ) { * @extends WP_REST_Controller * @version 2.6.0 */ -abstract class WC_REST_Controller extends WP_REST_Controller { +abstract class AbstractController extends WP_REST_Controller { /** * Endpoint namespace. * * @var string */ - protected $namespace = 'wc/v1'; + protected $namespace = 'wc/v4'; /** * Route base. diff --git a/src/RestApi/Version4/class-wc-rest-crud-controller.php b/src/RestApi/Version4/AbstractObjectsController.php similarity index 98% rename from src/RestApi/Version4/class-wc-rest-crud-controller.php rename to src/RestApi/Version4/AbstractObjectsController.php index 6953ee2cb52..005ee51f3aa 100644 --- a/src/RestApi/Version4/class-wc-rest-crud-controller.php +++ b/src/RestApi/Version4/AbstractObjectsController.php @@ -2,28 +2,21 @@ /** * Abstract Rest CRUD Controller Class * - * @class WC_REST_CRUD_Controller * @package WooCommerce/RestApi - * @version 3.0.0 */ -if ( ! defined( 'ABSPATH' ) ) { - exit; -} +namespace WooCommerce\RestApi\Version4; + +defined( 'ABSPATH' ) || exit; + +use AbstractPostsController; /** - * WC_REST_CRUD_Controller class. + * CRUD Object Controller. * * @extends WC_REST_Posts_Controller */ -abstract class WC_REST_CRUD_Controller extends WC_REST_Posts_Controller { - - /** - * Endpoint namespace. - * - * @var string - */ - protected $namespace = 'wc/v2'; +abstract class AbstractObjectsController extends AbstractPostsController { /** * If object is hierarchical. diff --git a/src/RestApi/Version4/class-wc-rest-posts-controller.php b/src/RestApi/Version4/AbstractPostsController.php similarity index 98% rename from src/RestApi/Version4/class-wc-rest-posts-controller.php rename to src/RestApi/Version4/AbstractPostsController.php index d5966551502..931aa9a82a1 100644 --- a/src/RestApi/Version4/class-wc-rest-posts-controller.php +++ b/src/RestApi/Version4/AbstractPostsController.php @@ -2,28 +2,21 @@ /** * Abstract Rest Posts Controller Class * - * @class WC_REST_Posts_Controller * @package WooCommerce/RestApi */ -if ( ! defined( 'ABSPATH' ) ) { - exit; -} +namespace WooCommerce\RestApi\Version4; + +defined( 'ABSPATH' ) || exit; + +use AbstractController; /** - * WC_REST_Posts_Controller + * POSTS Controller. * - * @package WooCommerce/RestApi - * @version 2.6.0 + * @extends AbstractController */ -abstract class WC_REST_Posts_Controller extends WC_REST_Controller { - - /** - * Endpoint namespace. - * - * @var string - */ - protected $namespace = 'wc/v1'; +abstract class AbstractPostsController extends AbstractController { /** * Route base. diff --git a/src/RestApi/Version4/class-wc-rest-shipping-zones-controller-base.php b/src/RestApi/Version4/AbstractShippingZonesController.php similarity index 93% rename from src/RestApi/Version4/class-wc-rest-shipping-zones-controller-base.php rename to src/RestApi/Version4/AbstractShippingZonesController.php index 7b8cc282f3b..d8b25e23a23 100644 --- a/src/RestApi/Version4/class-wc-rest-shipping-zones-controller-base.php +++ b/src/RestApi/Version4/AbstractShippingZonesController.php @@ -8,24 +8,19 @@ * @since 3.0.0 */ -if ( ! defined( 'ABSPATH' ) ) { - exit; -} +namespace WooCommerce\RestApi\Version4\Controllers; + +defined( 'ABSPATH' ) || exit; + +use AbstractController; /** * REST API Shipping Zones base class. * * @package WooCommerce/RestApi - * @extends WC_REST_Controller + * @extends AbstractController */ -abstract class WC_REST_Shipping_Zones_Controller_Base extends WC_REST_Controller { - - /** - * Endpoint namespace. - * - * @var string - */ - protected $namespace = 'wc/v2'; +abstract class WC_REST_Shipping_Zones_Controller_Base extends AbstractController { /** * Route base. diff --git a/src/RestApi/Version4/class-wc-rest-terms-controller.php b/src/RestApi/Version4/AbstractTermsContoller.php similarity index 99% rename from src/RestApi/Version4/class-wc-rest-terms-controller.php rename to src/RestApi/Version4/AbstractTermsContoller.php index d9588099149..7363fa98781 100644 --- a/src/RestApi/Version4/class-wc-rest-terms-controller.php +++ b/src/RestApi/Version4/AbstractTermsContoller.php @@ -3,17 +3,18 @@ * Abstract Rest Terms Controller * * @package WooCommerce/RestApi - * @version 3.3.0 */ -if ( ! defined( 'ABSPATH' ) ) { - exit; -} +namespace WooCommerce\RestApi\Version4\Controllers; + +defined( 'ABSPATH' ) || exit; + +use AbstractController; /** * Terms controller class. */ -abstract class WC_REST_Terms_Controller extends WC_REST_Controller { +abstract class AbstractTermsContoller extends AbstractController { /** * Route base. diff --git a/src/RestApi/Version4/Controllers/Coupons.php b/src/RestApi/Version4/Controllers/Coupons.php index c71704ab234..85cc298229f 100644 --- a/src/RestApi/Version4/Controllers/Coupons.php +++ b/src/RestApi/Version4/Controllers/Coupons.php @@ -18,13 +18,6 @@ use \WC_REST_Posts_Controller; */ class Coupons extends WC_REST_Posts_Controller { - /** - * Endpoint namespace. - * - * @var string - */ - protected $namespace = 'wc/v4'; - /** * Route base. * diff --git a/src/RestApi/Version4/Controllers/CustomerDownloads.php b/src/RestApi/Version4/Controllers/CustomerDownloads.php index 07331636d4b..2e6de771f6b 100644 --- a/src/RestApi/Version4/Controllers/CustomerDownloads.php +++ b/src/RestApi/Version4/Controllers/CustomerDownloads.php @@ -18,13 +18,6 @@ use \WC_REST_Controller; */ class CustomerDownloads extends WC_REST_Controller { - /** - * Endpoint namespace. - * - * @var string - */ - protected $namespace = 'wc/v4'; - /** * Route base. * diff --git a/src/RestApi/Version4/Controllers/Customers.php b/src/RestApi/Version4/Controllers/Customers.php index 221f64c2069..e5f866b82d8 100644 --- a/src/RestApi/Version4/Controllers/Customers.php +++ b/src/RestApi/Version4/Controllers/Customers.php @@ -18,13 +18,6 @@ use \WC_REST_Controller; */ class Customers extends WC_REST_Controller { - /** - * Endpoint namespace. - * - * @var string - */ - protected $namespace = 'wc/v4'; - /** * Route base. * diff --git a/src/RestApi/Version4/Controllers/Data.php b/src/RestApi/Version4/Controllers/Data.php index 141d7f2f166..b78d89a4d71 100644 --- a/src/RestApi/Version4/Controllers/Data.php +++ b/src/RestApi/Version4/Controllers/Data.php @@ -18,13 +18,6 @@ use \WC_REST_Controller; */ class Data extends WC_REST_Controller { - /** - * Endpoint namespace. - * - * @var string - */ - protected $namespace = 'wc/v4'; - /** * Route base. * diff --git a/src/RestApi/Version4/Controllers/Data/Continents.php b/src/RestApi/Version4/Controllers/Data/Continents.php index a47f30c9f29..d8d05249b60 100644 --- a/src/RestApi/Version4/Controllers/Data/Continents.php +++ b/src/RestApi/Version4/Controllers/Data/Continents.php @@ -18,13 +18,6 @@ use \WooCommerce\RestApi\Version4\Controllers\Data as DataController; */ class Continents extends DataController { - /** - * Endpoint namespace. - * - * @var string - */ - protected $namespace = 'wc/v4'; - /** * Route base. * diff --git a/src/RestApi/Version4/Controllers/Data/Countries.php b/src/RestApi/Version4/Controllers/Data/Countries.php index 597bad1d1f4..2f95f9ca0ba 100644 --- a/src/RestApi/Version4/Controllers/Data/Countries.php +++ b/src/RestApi/Version4/Controllers/Data/Countries.php @@ -18,13 +18,6 @@ use \WooCommerce\RestApi\Version4\Controllers\Data as DataController; */ class Countries extends DataController { - /** - * Endpoint namespace. - * - * @var string - */ - protected $namespace = 'wc/v4'; - /** * Route base. * diff --git a/src/RestApi/Version4/Controllers/Data/Currencies.php b/src/RestApi/Version4/Controllers/Data/Currencies.php index 57a29917c0e..ab6149e8604 100644 --- a/src/RestApi/Version4/Controllers/Data/Currencies.php +++ b/src/RestApi/Version4/Controllers/Data/Currencies.php @@ -18,13 +18,6 @@ use \WooCommerce\RestApi\Version4\Controllers\Data as DataController; */ class Currencies extends DataController { - /** - * Endpoint namespace. - * - * @var string - */ - protected $namespace = 'wc/v4'; - /** * Route base. * diff --git a/src/RestApi/Version4/Controllers/Data/DownloadIPs.php b/src/RestApi/Version4/Controllers/Data/DownloadIPs.php index 14e85fd24a7..127b19b0642 100644 --- a/src/RestApi/Version4/Controllers/Data/DownloadIPs.php +++ b/src/RestApi/Version4/Controllers/Data/DownloadIPs.php @@ -17,12 +17,6 @@ use \WooCommerce\RestApi\Version4\Controllers\Data as DataController; * Data Download IP controller. */ class DownloadIPs extends DataController { - /** - * Endpoint namespace. - * - * @var string - */ - protected $namespace = 'wc/v4'; /** * Route base. diff --git a/src/RestApi/Version4/Controllers/OrderNotes.php b/src/RestApi/Version4/Controllers/OrderNotes.php index 30121db7203..7861423963b 100644 --- a/src/RestApi/Version4/Controllers/OrderNotes.php +++ b/src/RestApi/Version4/Controllers/OrderNotes.php @@ -18,13 +18,6 @@ use \WC_REST_Controller; */ class OrderNotes extends WC_REST_Controller { - /** - * Endpoint namespace. - * - * @var string - */ - protected $namespace = 'wc/v4'; - /** * Route base. * diff --git a/src/RestApi/Version4/Controllers/OrderRefunds.php b/src/RestApi/Version4/Controllers/OrderRefunds.php index 9a88b320052..6e55da12263 100644 --- a/src/RestApi/Version4/Controllers/OrderRefunds.php +++ b/src/RestApi/Version4/Controllers/OrderRefunds.php @@ -18,13 +18,6 @@ use \WooCommerce\RestApi\Version4\Controllers\Orders as Orders; */ class OrderRefunds extends Orders { - /** - * Endpoint namespace. - * - * @var string - */ - protected $namespace = 'wc/v4'; - /** * Route base. * diff --git a/src/RestApi/Version4/Controllers/Orders.php b/src/RestApi/Version4/Controllers/Orders.php index 96920472531..cb76817f527 100644 --- a/src/RestApi/Version4/Controllers/Orders.php +++ b/src/RestApi/Version4/Controllers/Orders.php @@ -18,14 +18,6 @@ use \WC_REST_CRUD_Controller; */ class Orders extends WC_REST_CRUD_Controller { - - /** - * Endpoint namespace. - * - * @var string - */ - protected $namespace = 'wc/v4'; - /** * Route base. * diff --git a/src/RestApi/Version4/Controllers/ProductAttributeTerms.php b/src/RestApi/Version4/Controllers/ProductAttributeTerms.php index abeb9c8c8d3..141e17c74e6 100644 --- a/src/RestApi/Version4/Controllers/ProductAttributeTerms.php +++ b/src/RestApi/Version4/Controllers/ProductAttributeTerms.php @@ -11,19 +11,12 @@ namespace WooCommerce\RestApi\Version4\Controllers; defined( 'ABSPATH' ) || exit; -use \WC_REST_Terms_Controller; +use AbstractTermsContoller; /** * REST API Product Attribute Terms controller class. */ -class ProductAttributeTerms extends WC_REST_Terms_Controller { - - /** - * Endpoint namespace. - * - * @var string - */ - protected $namespace = 'wc/v4'; +class ProductAttributeTerms extends AbstractTermsContoller { /** * Route base. diff --git a/src/RestApi/Version4/Controllers/ProductAttributes.php b/src/RestApi/Version4/Controllers/ProductAttributes.php index c03b84a2fb7..bb701caa81a 100644 --- a/src/RestApi/Version4/Controllers/ProductAttributes.php +++ b/src/RestApi/Version4/Controllers/ProductAttributes.php @@ -18,13 +18,6 @@ use \WC_REST_Controller; */ class ProductAttributes extends WC_REST_Controller { - /** - * Endpoint namespace. - * - * @var string - */ - protected $namespace = 'wc/v4'; - /** * Route base. * diff --git a/src/RestApi/Version4/Controllers/ProductCategories.php b/src/RestApi/Version4/Controllers/ProductCategories.php index 743bcd511a6..25e8527198f 100644 --- a/src/RestApi/Version4/Controllers/ProductCategories.php +++ b/src/RestApi/Version4/Controllers/ProductCategories.php @@ -11,19 +11,12 @@ namespace WooCommerce\RestApi\Version4\Controllers; defined( 'ABSPATH' ) || exit; -use \WC_REST_Terms_Controller; +use AbstractTermsContoller; /** * REST API Product Categories controller class. */ -class ProductCategories extends WC_REST_Terms_Controller { - - /** - * Endpoint namespace. - * - * @var string - */ - protected $namespace = 'wc/v4'; +class ProductCategories extends AbstractTermsContoller { /** * Route base. diff --git a/src/RestApi/Version4/Controllers/ProductReviews.php b/src/RestApi/Version4/Controllers/ProductReviews.php index 4eab95ee7a1..026ff50c933 100644 --- a/src/RestApi/Version4/Controllers/ProductReviews.php +++ b/src/RestApi/Version4/Controllers/ProductReviews.php @@ -18,13 +18,6 @@ use \WC_REST_Controller; */ class ProductReviews extends WC_REST_Controller { - /** - * Endpoint namespace. - * - * @var string - */ - protected $namespace = 'wc/v4'; - /** * Route base. * diff --git a/src/RestApi/Version4/Controllers/ProductShippingClasses.php b/src/RestApi/Version4/Controllers/ProductShippingClasses.php index 47e150a5272..dc8aee04bbd 100644 --- a/src/RestApi/Version4/Controllers/ProductShippingClasses.php +++ b/src/RestApi/Version4/Controllers/ProductShippingClasses.php @@ -11,19 +11,12 @@ namespace WooCommerce\RestApi\Version4\Controllers; defined( 'ABSPATH' ) || exit; -use \WC_REST_Terms_Controller; +use AbstractTermsContoller; /** * REST API Product Shipping Classes controller class. */ -class ProductShippingClasses extends WC_REST_Terms_Controller { - - /** - * Endpoint namespace. - * - * @var string - */ - protected $namespace = 'wc/v4'; +class ProductShippingClasses extends AbstractTermsContoller { /** * Route base. diff --git a/src/RestApi/Version4/Controllers/ProductTags.php b/src/RestApi/Version4/Controllers/ProductTags.php index 77d6118dfea..bf360176d60 100644 --- a/src/RestApi/Version4/Controllers/ProductTags.php +++ b/src/RestApi/Version4/Controllers/ProductTags.php @@ -11,19 +11,12 @@ namespace WooCommerce\RestApi\Version4\Controllers; defined( 'ABSPATH' ) || exit; -use \WC_REST_Terms_Controller; +use AbstractTermsContoller; /** * REST API Product Tags controller class. */ -class ProductTags extends WC_REST_Terms_Controller { - - /** - * Endpoint namespace. - * - * @var string - */ - protected $namespace = 'wc/v4'; +class ProductTags extends AbstractTermsContoller { /** * Route base. diff --git a/src/RestApi/Version4/Controllers/Products.php b/src/RestApi/Version4/Controllers/Products.php index d60b523df75..ca139ab7a39 100644 --- a/src/RestApi/Version4/Controllers/Products.php +++ b/src/RestApi/Version4/Controllers/Products.php @@ -18,13 +18,6 @@ use \WC_REST_CRUD_Controller; */ class Products extends WC_REST_CRUD_Controller { - /** - * Endpoint namespace. - * - * @var string - */ - protected $namespace = 'wc/v4'; - /** * Route base. * diff --git a/src/RestApi/Version4/Controllers/Reports.php b/src/RestApi/Version4/Controllers/Reports.php index 72a8dc96631..d8f16389084 100644 --- a/src/RestApi/Version4/Controllers/Reports.php +++ b/src/RestApi/Version4/Controllers/Reports.php @@ -18,13 +18,6 @@ use \WC_REST_Controller; */ class Reports extends WC_REST_Controller { - /** - * Endpoint namespace. - * - * @var string - */ - protected $namespace = 'wc/v4'; - /** * Route base. * diff --git a/src/RestApi/Version4/Controllers/Reports/Categories.php b/src/RestApi/Version4/Controllers/Reports/Categories.php index d5cde576636..fa12c0b15f8 100644 --- a/src/RestApi/Version4/Controllers/Reports/Categories.php +++ b/src/RestApi/Version4/Controllers/Reports/Categories.php @@ -18,13 +18,6 @@ use \WooCommerce\RestApi\Version4\Controllers\Reports as Reports; */ class Categories extends Reports { - /** - * Endpoint namespace. - * - * @var string - */ - protected $namespace = 'wc/v4'; - /** * Route base. * diff --git a/src/RestApi/Version4/Controllers/Reports/CouponStats.php b/src/RestApi/Version4/Controllers/Reports/CouponStats.php index fe655e18af9..c2fd328f86a 100644 --- a/src/RestApi/Version4/Controllers/Reports/CouponStats.php +++ b/src/RestApi/Version4/Controllers/Reports/CouponStats.php @@ -18,13 +18,6 @@ use \WooCommerce\RestApi\Version4\Controllers\Reports as Reports; */ class CouponStats extends Reports { - /** - * Endpoint namespace. - * - * @var string - */ - protected $namespace = 'wc/v4'; - /** * Route base. * @@ -32,7 +25,6 @@ class CouponStats extends Reports { */ protected $rest_base = 'reports/coupons/stats'; - /** * Maps query arguments from the REST request. * diff --git a/src/RestApi/Version4/Controllers/Reports/Coupons.php b/src/RestApi/Version4/Controllers/Reports/Coupons.php index 3821e17bd07..73872d44d34 100644 --- a/src/RestApi/Version4/Controllers/Reports/Coupons.php +++ b/src/RestApi/Version4/Controllers/Reports/Coupons.php @@ -18,13 +18,6 @@ use \WooCommerce\RestApi\Version4\Controllers\Reports as Reports; */ class Coupons extends Reports { - /** - * Endpoint namespace. - * - * @var string - */ - protected $namespace = 'wc/v4'; - /** * Route base. * diff --git a/src/RestApi/Version4/Controllers/Reports/CustomerStats.php b/src/RestApi/Version4/Controllers/Reports/CustomerStats.php index e604aeacb97..3ae9ef010e2 100644 --- a/src/RestApi/Version4/Controllers/Reports/CustomerStats.php +++ b/src/RestApi/Version4/Controllers/Reports/CustomerStats.php @@ -17,12 +17,6 @@ use \WooCommerce\RestApi\Version4\Controllers\Reports as Reports; * REST API CustomerStats Reports class. */ class CustomerStats extends Reports { - /** - * Endpoint namespace. - * - * @var string - */ - protected $namespace = 'wc/v4'; /** * Route base. diff --git a/src/RestApi/Version4/Controllers/Reports/Customers.php b/src/RestApi/Version4/Controllers/Reports/Customers.php index da23ebb5d15..b732c37dc5c 100644 --- a/src/RestApi/Version4/Controllers/Reports/Customers.php +++ b/src/RestApi/Version4/Controllers/Reports/Customers.php @@ -18,13 +18,6 @@ use \WooCommerce\RestApi\Version4\Controllers\Reports as Reports; */ class Customers extends Reports { - /** - * Endpoint namespace. - * - * @var string - */ - protected $namespace = 'wc/v4'; - /** * Route base. * diff --git a/src/RestApi/Version4/Controllers/Reports/DownloadStats.php b/src/RestApi/Version4/Controllers/Reports/DownloadStats.php index 08da58d69ab..26fbae46b83 100644 --- a/src/RestApi/Version4/Controllers/Reports/DownloadStats.php +++ b/src/RestApi/Version4/Controllers/Reports/DownloadStats.php @@ -18,13 +18,6 @@ use \WooCommerce\RestApi\Version4\Controllers\Reports as Reports; */ class DownloadStats extends Reports { - /** - * Endpoint namespace. - * - * @var string - */ - protected $namespace = 'wc/v4'; - /** * Route base. * diff --git a/src/RestApi/Version4/Controllers/Reports/Downloads.php b/src/RestApi/Version4/Controllers/Reports/Downloads.php index 256117c37ca..9f0c6e56ca8 100644 --- a/src/RestApi/Version4/Controllers/Reports/Downloads.php +++ b/src/RestApi/Version4/Controllers/Reports/Downloads.php @@ -18,13 +18,6 @@ use \WooCommerce\RestApi\Version4\Controllers\Reports as Reports; */ class Downloads extends Reports { - /** - * Endpoint namespace. - * - * @var string - */ - protected $namespace = 'wc/v4'; - /** * Route base. * diff --git a/src/RestApi/Version4/Controllers/Reports/Import.php b/src/RestApi/Version4/Controllers/Reports/Import.php index 26db4b41ce3..e6bd5e29f60 100644 --- a/src/RestApi/Version4/Controllers/Reports/Import.php +++ b/src/RestApi/Version4/Controllers/Reports/Import.php @@ -17,12 +17,6 @@ use \WooCommerce\RestApi\Version4\Controllers\Reports as Reports; * REST API Import Reports class. */ class Import extends Reports { - /** - * Endpoint namespace. - * - * @var string - */ - protected $namespace = 'wc/v4'; /** * Route base. diff --git a/src/RestApi/Version4/Controllers/Reports/OrderStats.php b/src/RestApi/Version4/Controllers/Reports/OrderStats.php index 4f60962102a..cbe04fff6ac 100644 --- a/src/RestApi/Version4/Controllers/Reports/OrderStats.php +++ b/src/RestApi/Version4/Controllers/Reports/OrderStats.php @@ -18,13 +18,6 @@ use \WooCommerce\RestApi\Version4\Controllers\Reports as Reports; */ class OrderStats extends Reports { - /** - * Endpoint namespace. - * - * @var string - */ - protected $namespace = 'wc/v4'; - /** * Route base. * diff --git a/src/RestApi/Version4/Controllers/Reports/Orders.php b/src/RestApi/Version4/Controllers/Reports/Orders.php index 2d7a8ec9f07..21addc6ce79 100644 --- a/src/RestApi/Version4/Controllers/Reports/Orders.php +++ b/src/RestApi/Version4/Controllers/Reports/Orders.php @@ -18,13 +18,6 @@ use \WooCommerce\RestApi\Version4\Controllers\Reports as Reports; */ class Orders extends Reports { - /** - * Endpoint namespace. - * - * @var string - */ - protected $namespace = 'wc/v4'; - /** * Route base. * diff --git a/src/RestApi/Version4/Controllers/Reports/PerformanceIndicators.php b/src/RestApi/Version4/Controllers/Reports/PerformanceIndicators.php index ebc0bf052ac..9fd1becb564 100644 --- a/src/RestApi/Version4/Controllers/Reports/PerformanceIndicators.php +++ b/src/RestApi/Version4/Controllers/Reports/PerformanceIndicators.php @@ -18,13 +18,6 @@ use \WooCommerce\RestApi\Version4\Controllers\Reports as Reports; */ class PerformanceIndicators extends Reports { - /** - * Endpoint namespace. - * - * @var string - */ - protected $namespace = 'wc/v4'; - /** * Route base. * diff --git a/src/RestApi/Version4/Controllers/Reports/ProductStats.php b/src/RestApi/Version4/Controllers/Reports/ProductStats.php index acb4b42d6cc..ec0b82eec0b 100644 --- a/src/RestApi/Version4/Controllers/Reports/ProductStats.php +++ b/src/RestApi/Version4/Controllers/Reports/ProductStats.php @@ -18,13 +18,6 @@ use \WooCommerce\RestApi\Version4\Controllers\Reports as Reports; */ class ProductStats extends Reports { - /** - * Endpoint namespace. - * - * @var string - */ - protected $namespace = 'wc/v4'; - /** * Route base. * diff --git a/src/RestApi/Version4/Controllers/Reports/Products.php b/src/RestApi/Version4/Controllers/Reports/Products.php index 214506b6bd8..e9c7622d262 100644 --- a/src/RestApi/Version4/Controllers/Reports/Products.php +++ b/src/RestApi/Version4/Controllers/Reports/Products.php @@ -18,13 +18,6 @@ use \WooCommerce\RestApi\Version4\Controllers\Reports as Reports; */ class Products extends Reports { - /** - * Endpoint namespace. - * - * @var string - */ - protected $namespace = 'wc/v4'; - /** * Route base. * diff --git a/src/RestApi/Version4/Controllers/Reports/RevenueStats.php b/src/RestApi/Version4/Controllers/Reports/RevenueStats.php index 5533a211a6b..ac15f34cd0c 100644 --- a/src/RestApi/Version4/Controllers/Reports/RevenueStats.php +++ b/src/RestApi/Version4/Controllers/Reports/RevenueStats.php @@ -18,13 +18,6 @@ use \WooCommerce\RestApi\Version4\Controllers\Reports as Reports; */ class RevenueStats extends Reports { - /** - * Endpoint namespace. - * - * @var string - */ - protected $namespace = 'wc/v4'; - /** * Route base. * diff --git a/src/RestApi/Version4/Controllers/Reports/Stock.php b/src/RestApi/Version4/Controllers/Reports/Stock.php index 9ff7535bf53..e8e9757474f 100644 --- a/src/RestApi/Version4/Controllers/Reports/Stock.php +++ b/src/RestApi/Version4/Controllers/Reports/Stock.php @@ -18,13 +18,6 @@ use \WooCommerce\RestApi\Version4\Controllers\Reports as Reports; */ class Stock extends Reports { - /** - * Endpoint namespace. - * - * @var string - */ - protected $namespace = 'wc/v4'; - /** * Route base. * diff --git a/src/RestApi/Version4/Controllers/Reports/StockStats.php b/src/RestApi/Version4/Controllers/Reports/StockStats.php index 101f90369f1..83343e44abc 100644 --- a/src/RestApi/Version4/Controllers/Reports/StockStats.php +++ b/src/RestApi/Version4/Controllers/Reports/StockStats.php @@ -18,13 +18,6 @@ use \WooCommerce\RestApi\Version4\Controllers\Reports as Reports; */ class StockStats extends Reports { - /** - * Endpoint namespace. - * - * @var string - */ - protected $namespace = 'wc/v4'; - /** * Route base. * diff --git a/src/RestApi/Version4/Controllers/Reports/TaxStats.php b/src/RestApi/Version4/Controllers/Reports/TaxStats.php index ae81a1c2626..b93e24fcc45 100644 --- a/src/RestApi/Version4/Controllers/Reports/TaxStats.php +++ b/src/RestApi/Version4/Controllers/Reports/TaxStats.php @@ -18,13 +18,6 @@ use \WooCommerce\RestApi\Version4\Controllers\Reports as Reports; */ class TaxStats extends Reports { - /** - * Endpoint namespace. - * - * @var string - */ - protected $namespace = 'wc/v4'; - /** * Route base. * diff --git a/src/RestApi/Version4/Controllers/Reports/Taxes.php b/src/RestApi/Version4/Controllers/Reports/Taxes.php index 2a68ba10266..49fdfea5b07 100644 --- a/src/RestApi/Version4/Controllers/Reports/Taxes.php +++ b/src/RestApi/Version4/Controllers/Reports/Taxes.php @@ -18,13 +18,6 @@ use \WooCommerce\RestApi\Version4\Controllers\Reports as Reports; */ class Taxes extends Reports { - /** - * Endpoint namespace. - * - * @var string - */ - protected $namespace = 'wc/v4'; - /** * Route base. * diff --git a/src/RestApi/Version4/Controllers/Reports/Variations.php b/src/RestApi/Version4/Controllers/Reports/Variations.php index f2fed45f205..0b3599ceec8 100644 --- a/src/RestApi/Version4/Controllers/Reports/Variations.php +++ b/src/RestApi/Version4/Controllers/Reports/Variations.php @@ -18,13 +18,6 @@ use \WooCommerce\RestApi\Version4\Controllers\Reports as Reports; */ class Variations extends Reports { - /** - * Endpoint namespace. - * - * @var string - */ - protected $namespace = 'wc/v4'; - /** * Route base. * diff --git a/src/RestApi/Version4/class-wc-rest-system-status-v2-controller.php b/src/RestApi/Version4/Controllers/SystemStatus.php similarity index 99% rename from src/RestApi/Version4/class-wc-rest-system-status-v2-controller.php rename to src/RestApi/Version4/Controllers/SystemStatus.php index d141e656009..2919b5557c7 100644 --- a/src/RestApi/Version4/class-wc-rest-system-status-v2-controller.php +++ b/src/RestApi/Version4/Controllers/SystemStatus.php @@ -5,25 +5,18 @@ * Handles requests to the /system_status endpoint. * * @package WooCommerce/RestApi - * @since 3.0.0 */ +namespace WooCommerce\RestApi\Version4\Controllers; + defined( 'ABSPATH' ) || exit; -/** - * System status controller class. - * - * @package WooCommerce/RestApi - * @extends WC_REST_Controller - */ -class WC_REST_System_Status_V2_Controller extends WC_REST_Controller { +use \WC_REST_Controller; - /** - * Endpoint namespace. - * - * @var string - */ - protected $namespace = 'wc/v2'; +/** + * REST API System Status controller class. + */ +class SystemStatus extends WC_REST_Controller { /** * Route base. diff --git a/src/RestApi/Version4/class-wc-rest-system-status-tools-v2-controller.php b/src/RestApi/Version4/Controllers/SystemStatusTools.php similarity index 98% rename from src/RestApi/Version4/class-wc-rest-system-status-tools-v2-controller.php rename to src/RestApi/Version4/Controllers/SystemStatusTools.php index a0e91c97346..f38b4762c35 100644 --- a/src/RestApi/Version4/class-wc-rest-system-status-tools-v2-controller.php +++ b/src/RestApi/Version4/Controllers/SystemStatusTools.php @@ -5,25 +5,18 @@ * Handles requests to the /system_status/tools/* endpoints. * * @package WooCommerce/RestApi - * @since 3.0.0 */ +namespace WooCommerce\RestApi\Version4\Controllers; + defined( 'ABSPATH' ) || exit; -/** - * System status tools controller. - * - * @package WooCommerce/RestApi - * @extends WC_REST_Controller - */ -class WC_REST_System_Status_Tools_V2_Controller extends WC_REST_Controller { +use \WC_REST_Controller; - /** - * Endpoint namespace. - * - * @var string - */ - protected $namespace = 'wc/v2'; +/** + * REST API System Status Tools controller class. + */ +class SystemStatusTools extends WC_REST_Controller { /** * Route base. diff --git a/src/RestApi/Version4/Controllers/TaxClasses.php b/src/RestApi/Version4/Controllers/TaxClasses.php index 8587cdaf472..b5bf627c647 100644 --- a/src/RestApi/Version4/Controllers/TaxClasses.php +++ b/src/RestApi/Version4/Controllers/TaxClasses.php @@ -18,13 +18,6 @@ use \WC_REST_Controller; */ class TaxClasses extends WC_REST_Controller { - /** - * Endpoint namespace. - * - * @var string - */ - protected $namespace = 'wc/v4'; - /** * Route base. * diff --git a/src/RestApi/Version4/Controllers/Taxes.php b/src/RestApi/Version4/Controllers/Taxes.php index c5f5af74f43..00bed597d31 100644 --- a/src/RestApi/Version4/Controllers/Taxes.php +++ b/src/RestApi/Version4/Controllers/Taxes.php @@ -18,13 +18,6 @@ use \WC_REST_Controller; */ class Taxes extends WC_REST_Controller { - /** - * Endpoint namespace. - * - * @var string - */ - protected $namespace = 'wc/v4'; - /** * Route base. * diff --git a/src/RestApi/Version4/Controllers/Webhooks.php b/src/RestApi/Version4/Controllers/Webhooks.php index 69f882c76a2..c70adcd0a58 100644 --- a/src/RestApi/Version4/Controllers/Webhooks.php +++ b/src/RestApi/Version4/Controllers/Webhooks.php @@ -18,13 +18,6 @@ use \WC_REST_Controller; */ class Webhooks extends WC_REST_Controller { - /** - * Endpoint namespace. - * - * @var string - */ - protected $namespace = 'wc/v4'; - /** * Route base. * diff --git a/src/RestApi/Version4/changelog.md b/src/RestApi/Version4/changelog.md index 9359f75b0ec..4db377e409b 100644 --- a/src/RestApi/Version4/changelog.md +++ b/src/RestApi/Version4/changelog.md @@ -31,6 +31,7 @@ - `reports/downloads` - `reports/downloads/stats` - `reports/import` +- `data/download-ips` ## Removed endpoints diff --git a/src/RestApi/Version4/class-wc-admin-rest-setting-options-controller.php b/src/RestApi/Version4/class-wc-admin-rest-setting-options-controller.php deleted file mode 100644 index bfa1a2fe6ec..00000000000 --- a/src/RestApi/Version4/class-wc-admin-rest-setting-options-controller.php +++ /dev/null @@ -1,27 +0,0 @@ -/locations endpoint. - * - * @package WooCommerce/RestApi - * @since 3.0.0 - */ - -defined( 'ABSPATH' ) || exit; - -/** - * REST API Shipping Zone Locations class. - * - * @package WooCommerce/RestApi - * @extends WC_REST_Shipping_Zone_Locations_V2_Controller - */ -class WC_REST_Shipping_Zone_Locations_Controller extends WC_REST_Shipping_Zone_Locations_V2_Controller { - - /** - * Endpoint namespace. - * - * @var string - */ - protected $namespace = 'wc/v3'; -} diff --git a/src/RestApi/Version4/class-wc-rest-shipping-zone-methods-controller.php b/src/RestApi/Version4/class-wc-rest-shipping-zone-methods-controller.php deleted file mode 100644 index 3ed5cf4e08b..00000000000 --- a/src/RestApi/Version4/class-wc-rest-shipping-zone-methods-controller.php +++ /dev/null @@ -1,27 +0,0 @@ -/methods endpoint. - * - * @package WooCommerce/RestApi - * @since 3.0.0 - */ - -defined( 'ABSPATH' ) || exit; - -/** - * REST API Shipping Zone Methods class. - * - * @package WooCommerce/RestApi - * @extends WC_REST_Shipping_Zone_Methods_V2_Controller - */ -class WC_REST_Shipping_Zone_Methods_Controller extends WC_REST_Shipping_Zone_Methods_V2_Controller { - - /** - * Endpoint namespace. - * - * @var string - */ - protected $namespace = 'wc/v3'; -} diff --git a/src/RestApi/Version4/class-wc-rest-shipping-zones-controller.php b/src/RestApi/Version4/class-wc-rest-shipping-zones-controller.php deleted file mode 100644 index 778861bff5c..00000000000 --- a/src/RestApi/Version4/class-wc-rest-shipping-zones-controller.php +++ /dev/null @@ -1,27 +0,0 @@ -