Namespace and structure improvements

2019-06-12 13:09:20 +01:00 · 2019-06-12 13:09:20 +01:00 · 732eb4b453
parent 2eff709060
commit 732eb4b453
166 changed files with 444 additions and 508 deletions
--- a/composer.json
+++ b/composer.json
@ -14,6 +14,13 @@
    "woocommerce/woocommerce-sniffs": "0.0.6"
  },
  "autoload": {
-    "classmap": ["src"]
+    "classmap": [
      "src/Controllers/Version1",
      "src/Controllers/Version2",
      "src/Controllers/Version3"
    ],
    "psr-4": {
      "WooCommerce\\RestApi\\": "src/"
    }
  }
 }
--- a/init.php
+++ b/init.php
@ -6,6 +6,6 @@
 */
 return function() {
-	require __DIR__ . '/src/RestApi.php';
+	require __DIR__ . '/src/Server.php';
-	\WooCommerce\RestApi::instance()->init();
+	\WooCommerce\RestApi\Server::instance()->init();
 };
--- a/src/Controllers/Version1/class-wc-rest-coupons-v1-controller.php
+++ b/src/Controllers/Version1/class-wc-rest-coupons-v1-controller.php
--- a/src/Controllers/Version1/class-wc-rest-customer-downloads-v1-controller.php
+++ b/src/Controllers/Version1/class-wc-rest-customer-downloads-v1-controller.php
--- a/src/Controllers/Version1/class-wc-rest-customers-v1-controller.php
+++ b/src/Controllers/Version1/class-wc-rest-customers-v1-controller.php
--- a/src/Controllers/Version1/class-wc-rest-order-notes-v1-controller.php
+++ b/src/Controllers/Version1/class-wc-rest-order-notes-v1-controller.php
--- a/src/Controllers/Version1/class-wc-rest-order-refunds-v1-controller.php
+++ b/src/Controllers/Version1/class-wc-rest-order-refunds-v1-controller.php
--- a/src/Controllers/Version1/class-wc-rest-orders-v1-controller.php
+++ b/src/Controllers/Version1/class-wc-rest-orders-v1-controller.php
--- a/src/Controllers/Version1/class-wc-rest-product-attribute-terms-v1-controller.php
+++ b/src/Controllers/Version1/class-wc-rest-product-attribute-terms-v1-controller.php
--- a/src/Controllers/Version1/class-wc-rest-product-attributes-v1-controller.php
+++ b/src/Controllers/Version1/class-wc-rest-product-attributes-v1-controller.php
--- a/src/Controllers/Version1/class-wc-rest-product-categories-v1-controller.php
+++ b/src/Controllers/Version1/class-wc-rest-product-categories-v1-controller.php
--- a/src/Controllers/Version1/class-wc-rest-product-reviews-v1-controller.php
+++ b/src/Controllers/Version1/class-wc-rest-product-reviews-v1-controller.php
--- a/src/Controllers/Version1/class-wc-rest-product-shipping-classes-v1-controller.php
+++ b/src/Controllers/Version1/class-wc-rest-product-shipping-classes-v1-controller.php
--- a/src/Controllers/Version1/class-wc-rest-product-tags-v1-controller.php
+++ b/src/Controllers/Version1/class-wc-rest-product-tags-v1-controller.php
--- a/src/Controllers/Version1/class-wc-rest-products-v1-controller.php
+++ b/src/Controllers/Version1/class-wc-rest-products-v1-controller.php
--- a/src/Controllers/Version1/class-wc-rest-report-sales-v1-controller.php
+++ b/src/Controllers/Version1/class-wc-rest-report-sales-v1-controller.php
--- a/src/Controllers/Version1/class-wc-rest-report-top-sellers-v1-controller.php
+++ b/src/Controllers/Version1/class-wc-rest-report-top-sellers-v1-controller.php
--- a/src/Controllers/Version1/class-wc-rest-reports-v1-controller.php
+++ b/src/Controllers/Version1/class-wc-rest-reports-v1-controller.php
--- a/src/Controllers/Version1/class-wc-rest-tax-classes-v1-controller.php
+++ b/src/Controllers/Version1/class-wc-rest-tax-classes-v1-controller.php
--- a/src/Controllers/Version1/class-wc-rest-taxes-v1-controller.php
+++ b/src/Controllers/Version1/class-wc-rest-taxes-v1-controller.php
--- a/src/Controllers/Version1/class-wc-rest-webhook-deliveries-v1-controller.php
+++ b/src/Controllers/Version1/class-wc-rest-webhook-deliveries-v1-controller.php
--- a/src/Controllers/Version1/class-wc-rest-webhooks-v1-controller.php
+++ b/src/Controllers/Version1/class-wc-rest-webhooks-v1-controller.php
--- a/src/Controllers/Version2/class-wc-rest-coupons-v2-controller.php
+++ b/src/Controllers/Version2/class-wc-rest-coupons-v2-controller.php
--- a/src/Controllers/Version2/class-wc-rest-customer-downloads-v2-controller.php
+++ b/src/Controllers/Version2/class-wc-rest-customer-downloads-v2-controller.php
--- a/src/Controllers/Version2/class-wc-rest-customers-v2-controller.php
+++ b/src/Controllers/Version2/class-wc-rest-customers-v2-controller.php
--- a/src/Controllers/Version2/class-wc-rest-network-orders-v2-controller.php
+++ b/src/Controllers/Version2/class-wc-rest-network-orders-v2-controller.php
--- a/src/Controllers/Version2/class-wc-rest-order-notes-v2-controller.php
+++ b/src/Controllers/Version2/class-wc-rest-order-notes-v2-controller.php
--- a/src/Controllers/Version2/class-wc-rest-order-refunds-v2-controller.php
+++ b/src/Controllers/Version2/class-wc-rest-order-refunds-v2-controller.php
--- a/src/Controllers/Version2/class-wc-rest-orders-v2-controller.php
+++ b/src/Controllers/Version2/class-wc-rest-orders-v2-controller.php
--- a/src/Controllers/Version2/class-wc-rest-payment-gateways-v2-controller.php
+++ b/src/Controllers/Version2/class-wc-rest-payment-gateways-v2-controller.php
--- a/src/Controllers/Version2/class-wc-rest-product-attribute-terms-v2-controller.php
+++ b/src/Controllers/Version2/class-wc-rest-product-attribute-terms-v2-controller.php
--- a/src/Controllers/Version2/class-wc-rest-product-attributes-v2-controller.php
+++ b/src/Controllers/Version2/class-wc-rest-product-attributes-v2-controller.php
--- a/src/Controllers/Version2/class-wc-rest-product-categories-v2-controller.php
+++ b/src/Controllers/Version2/class-wc-rest-product-categories-v2-controller.php
--- a/src/Controllers/Version2/class-wc-rest-product-reviews-v2-controller.php
+++ b/src/Controllers/Version2/class-wc-rest-product-reviews-v2-controller.php
--- a/src/Controllers/Version2/class-wc-rest-product-shipping-classes-v2-controller.php
+++ b/src/Controllers/Version2/class-wc-rest-product-shipping-classes-v2-controller.php
--- a/src/Controllers/Version2/class-wc-rest-product-tags-v2-controller.php
+++ b/src/Controllers/Version2/class-wc-rest-product-tags-v2-controller.php
--- a/src/Controllers/Version2/class-wc-rest-product-variations-v2-controller.php
+++ b/src/Controllers/Version2/class-wc-rest-product-variations-v2-controller.php
--- a/src/Controllers/Version2/class-wc-rest-products-v2-controller.php
+++ b/src/Controllers/Version2/class-wc-rest-products-v2-controller.php
--- a/src/Controllers/Version2/class-wc-rest-report-sales-v2-controller.php
+++ b/src/Controllers/Version2/class-wc-rest-report-sales-v2-controller.php
--- a/src/Controllers/Version2/class-wc-rest-report-top-sellers-v2-controller.php
+++ b/src/Controllers/Version2/class-wc-rest-report-top-sellers-v2-controller.php
--- a/src/Controllers/Version2/class-wc-rest-reports-v2-controller.php
+++ b/src/Controllers/Version2/class-wc-rest-reports-v2-controller.php
--- a/src/Controllers/Version2/class-wc-rest-setting-options-v2-controller.php
+++ b/src/Controllers/Version2/class-wc-rest-setting-options-v2-controller.php
--- a/src/Controllers/Version2/class-wc-rest-settings-v2-controller.php
+++ b/src/Controllers/Version2/class-wc-rest-settings-v2-controller.php
--- a/src/Controllers/Version2/class-wc-rest-shipping-methods-v2-controller.php
+++ b/src/Controllers/Version2/class-wc-rest-shipping-methods-v2-controller.php
--- a/src/Controllers/Version2/class-wc-rest-shipping-zone-locations-v2-controller.php
+++ b/src/Controllers/Version2/class-wc-rest-shipping-zone-locations-v2-controller.php
--- a/src/Controllers/Version2/class-wc-rest-shipping-zone-methods-v2-controller.php
+++ b/src/Controllers/Version2/class-wc-rest-shipping-zone-methods-v2-controller.php
--- a/src/Controllers/Version2/class-wc-rest-shipping-zones-v2-controller.php
+++ b/src/Controllers/Version2/class-wc-rest-shipping-zones-v2-controller.php
--- a/src/Controllers/Version2/class-wc-rest-system-status-tools-v2-controller.php
+++ b/src/Controllers/Version2/class-wc-rest-system-status-tools-v2-controller.php
--- a/src/Controllers/Version2/class-wc-rest-system-status-v2-controller.php
+++ b/src/Controllers/Version2/class-wc-rest-system-status-v2-controller.php
--- a/src/Controllers/Version2/class-wc-rest-tax-classes-v2-controller.php
+++ b/src/Controllers/Version2/class-wc-rest-tax-classes-v2-controller.php
--- a/src/Controllers/Version2/class-wc-rest-taxes-v2-controller.php
+++ b/src/Controllers/Version2/class-wc-rest-taxes-v2-controller.php
--- a/src/Controllers/Version2/class-wc-rest-webhook-deliveries-v2-controller.php
+++ b/src/Controllers/Version2/class-wc-rest-webhook-deliveries-v2-controller.php
--- a/src/Controllers/Version2/class-wc-rest-webhooks-v2-controller.php
+++ b/src/Controllers/Version2/class-wc-rest-webhooks-v2-controller.php
--- a/src/Controllers/Version3/class-wc-rest-controller.php
+++ b/src/Controllers/Version3/class-wc-rest-controller.php
--- a/src/Controllers/Version3/class-wc-rest-coupons-controller.php
+++ b/src/Controllers/Version3/class-wc-rest-coupons-controller.php
--- a/src/Controllers/Version3/class-wc-rest-crud-controller.php
+++ b/src/Controllers/Version3/class-wc-rest-crud-controller.php
--- a/src/Controllers/Version3/class-wc-rest-customer-downloads-controller.php
+++ b/src/Controllers/Version3/class-wc-rest-customer-downloads-controller.php
--- a/src/Controllers/Version3/class-wc-rest-customers-controller.php
+++ b/src/Controllers/Version3/class-wc-rest-customers-controller.php
--- a/src/Controllers/Version3/class-wc-rest-data-continents-controller.php
+++ b/src/Controllers/Version3/class-wc-rest-data-continents-controller.php
--- a/src/Controllers/Version3/class-wc-rest-data-controller.php
+++ b/src/Controllers/Version3/class-wc-rest-data-controller.php
--- a/src/Controllers/Version3/class-wc-rest-data-countries-controller.php
+++ b/src/Controllers/Version3/class-wc-rest-data-countries-controller.php
--- a/src/Controllers/Version3/class-wc-rest-data-currencies-controller.php
+++ b/src/Controllers/Version3/class-wc-rest-data-currencies-controller.php
--- a/src/Controllers/Version3/class-wc-rest-network-orders-controller.php
+++ b/src/Controllers/Version3/class-wc-rest-network-orders-controller.php
--- a/src/Controllers/Version3/class-wc-rest-order-notes-controller.php
+++ b/src/Controllers/Version3/class-wc-rest-order-notes-controller.php
--- a/src/Controllers/Version3/class-wc-rest-order-refunds-controller.php
+++ b/src/Controllers/Version3/class-wc-rest-order-refunds-controller.php
--- a/src/Controllers/Version3/class-wc-rest-orders-controller.php
+++ b/src/Controllers/Version3/class-wc-rest-orders-controller.php
--- a/src/Controllers/Version3/class-wc-rest-payment-gateways-controller.php
+++ b/src/Controllers/Version3/class-wc-rest-payment-gateways-controller.php
--- a/src/Controllers/Version3/class-wc-rest-posts-controller.php
+++ b/src/Controllers/Version3/class-wc-rest-posts-controller.php
--- a/src/Controllers/Version3/class-wc-rest-product-attribute-terms-controller.php
+++ b/src/Controllers/Version3/class-wc-rest-product-attribute-terms-controller.php
--- a/src/Controllers/Version3/class-wc-rest-product-attributes-controller.php
+++ b/src/Controllers/Version3/class-wc-rest-product-attributes-controller.php
--- a/src/Controllers/Version3/class-wc-rest-product-categories-controller.php
+++ b/src/Controllers/Version3/class-wc-rest-product-categories-controller.php
--- a/src/Controllers/Version3/class-wc-rest-product-reviews-controller.php
+++ b/src/Controllers/Version3/class-wc-rest-product-reviews-controller.php
--- a/src/Controllers/Version3/class-wc-rest-product-shipping-classes-controller.php
+++ b/src/Controllers/Version3/class-wc-rest-product-shipping-classes-controller.php
--- a/src/Controllers/Version3/class-wc-rest-product-tags-controller.php
+++ b/src/Controllers/Version3/class-wc-rest-product-tags-controller.php
--- a/src/Controllers/Version3/class-wc-rest-product-variations-controller.php
+++ b/src/Controllers/Version3/class-wc-rest-product-variations-controller.php
--- a/src/Controllers/Version3/class-wc-rest-products-controller.php
+++ b/src/Controllers/Version3/class-wc-rest-products-controller.php
--- a/src/Controllers/Version3/class-wc-rest-report-coupons-totals-controller.php
+++ b/src/Controllers/Version3/class-wc-rest-report-coupons-totals-controller.php
--- a/src/Controllers/Version3/class-wc-rest-report-customers-totals-controller.php
+++ b/src/Controllers/Version3/class-wc-rest-report-customers-totals-controller.php
--- a/src/Controllers/Version3/class-wc-rest-report-orders-totals-controller.php
+++ b/src/Controllers/Version3/class-wc-rest-report-orders-totals-controller.php
--- a/src/Controllers/Version3/class-wc-rest-report-products-totals-controller.php
+++ b/src/Controllers/Version3/class-wc-rest-report-products-totals-controller.php
--- a/src/Controllers/Version3/class-wc-rest-report-reviews-totals-controller.php
+++ b/src/Controllers/Version3/class-wc-rest-report-reviews-totals-controller.php
--- a/src/Controllers/Version3/class-wc-rest-report-sales-controller.php
+++ b/src/Controllers/Version3/class-wc-rest-report-sales-controller.php
--- a/src/Controllers/Version3/class-wc-rest-report-top-sellers-controller.php
+++ b/src/Controllers/Version3/class-wc-rest-report-top-sellers-controller.php
--- a/src/Controllers/Version3/class-wc-rest-reports-controller.php
+++ b/src/Controllers/Version3/class-wc-rest-reports-controller.php
--- a/src/Controllers/Version3/class-wc-rest-setting-options-controller.php
+++ b/src/Controllers/Version3/class-wc-rest-setting-options-controller.php
--- a/src/Controllers/Version3/class-wc-rest-settings-controller.php
+++ b/src/Controllers/Version3/class-wc-rest-settings-controller.php
--- a/src/Controllers/Version3/class-wc-rest-shipping-methods-controller.php
+++ b/src/Controllers/Version3/class-wc-rest-shipping-methods-controller.php
--- a/src/Controllers/Version3/class-wc-rest-shipping-zone-locations-controller.php
+++ b/src/Controllers/Version3/class-wc-rest-shipping-zone-locations-controller.php
--- a/src/Controllers/Version3/class-wc-rest-shipping-zone-methods-controller.php
+++ b/src/Controllers/Version3/class-wc-rest-shipping-zone-methods-controller.php
--- a/src/Controllers/Version3/class-wc-rest-shipping-zones-controller-base.php
+++ b/src/Controllers/Version3/class-wc-rest-shipping-zones-controller-base.php
--- a/src/Controllers/Version3/class-wc-rest-shipping-zones-controller.php
+++ b/src/Controllers/Version3/class-wc-rest-shipping-zones-controller.php
--- a/src/Controllers/Version3/class-wc-rest-system-status-controller.php
+++ b/src/Controllers/Version3/class-wc-rest-system-status-controller.php
--- a/src/Controllers/Version3/class-wc-rest-system-status-tools-controller.php
+++ b/src/Controllers/Version3/class-wc-rest-system-status-tools-controller.php
--- a/src/Controllers/Version3/class-wc-rest-tax-classes-controller.php
+++ b/src/Controllers/Version3/class-wc-rest-tax-classes-controller.php
--- a/src/Controllers/Version3/class-wc-rest-taxes-controller.php
+++ b/src/Controllers/Version3/class-wc-rest-taxes-controller.php
--- a/src/Controllers/Version3/class-wc-rest-terms-controller.php
+++ b/src/Controllers/Version3/class-wc-rest-terms-controller.php
--- a/src/Controllers/Version3/class-wc-rest-webhooks-controller.php
+++ b/src/Controllers/Version3/class-wc-rest-webhooks-controller.php
--- a/src/RestApi/Version4/Controllers/AbstractController.php
+++ b/src/RestApi/Version4/Controllers/AbstractController.php
@ -13,7 +13,7 @@
 * @package WooCommerce/RestApi
 */
-namespace WooCommerce\RestApi\Version4\Controllers;
+namespace WooCommerce\RestApi\Controllers\Version4;
 defined( 'ABSPATH' ) || exit;
--- a/src/RestApi/Version4/Controllers/AbstractObjectsController.php
+++ b/src/RestApi/Version4/Controllers/AbstractObjectsController.php
@ -5,7 +5,7 @@
 * @package WooCommerce/RestApi
 */
-namespace WooCommerce\RestApi\Version4\Controllers;
+namespace WooCommerce\RestApi\Controllers\Version4;
 defined( 'ABSPATH' ) || exit;
--- a/src/RestApi/Version4/Controllers/AbstractPostsController.php
+++ b/src/RestApi/Version4/Controllers/AbstractPostsController.php
@ -5,7 +5,7 @@
 * @package WooCommerce/RestApi
 */
-namespace WooCommerce\RestApi\Version4\Controllers;
+namespace WooCommerce\RestApi\Controllers\Version4;
 defined( 'ABSPATH' ) || exit;
--- a/Show More
+++ b/Show More