From ce7267b198a5edaaf74fbaec45d371f68ecc447d Mon Sep 17 00:00:00 2001 From: Jeff Stieler Date: Thu, 1 Aug 2019 10:49:55 -0600 Subject: [PATCH] PSR-4ify the report exporter classes. --- ...c-admin-rest-reports-export-controller.php | 2 ++ .../WC_Admin_Report_CSV_Exporter.php} | 24 ++++++++++--------- .../WC_Admin_Report_Exporter.php} | 4 +++- .../class-wc-tests-reports-coupons.php | 2 ++ .../woocommerce-admin/woocommerce-admin.php | 1 + 5 files changed, 21 insertions(+), 12 deletions(-) rename plugins/woocommerce-admin/{includes/export/class-wc-admin-report-csv-exporter.php => src/WC_Admin_Report_CSV_Exporter.php} (88%) rename plugins/woocommerce-admin/{includes/export/class-wc-admin-report-exporter.php => src/WC_Admin_Report_Exporter.php} (97%) diff --git a/plugins/woocommerce-admin/includes/api/class-wc-admin-rest-reports-export-controller.php b/plugins/woocommerce-admin/includes/api/class-wc-admin-rest-reports-export-controller.php index a9a9980d9dd..4291136bc5b 100644 --- a/plugins/woocommerce-admin/includes/api/class-wc-admin-rest-reports-export-controller.php +++ b/plugins/woocommerce-admin/includes/api/class-wc-admin-rest-reports-export-controller.php @@ -11,6 +11,8 @@ defined( 'ABSPATH' ) || exit; +use \Automattic\WooCommerce\Admin\WC_Admin_Report_Exporter; + /** * Reports Export controller. * diff --git a/plugins/woocommerce-admin/includes/export/class-wc-admin-report-csv-exporter.php b/plugins/woocommerce-admin/src/WC_Admin_Report_CSV_Exporter.php similarity index 88% rename from plugins/woocommerce-admin/includes/export/class-wc-admin-report-csv-exporter.php rename to plugins/woocommerce-admin/src/WC_Admin_Report_CSV_Exporter.php index 887952edcb9..683778e0adb 100644 --- a/plugins/woocommerce-admin/includes/export/class-wc-admin-report-csv-exporter.php +++ b/plugins/woocommerce-admin/src/WC_Admin_Report_CSV_Exporter.php @@ -5,6 +5,8 @@ * @package WooCommerce/Export */ +namespace Automattic\WooCommerce\Admin; + if ( ! defined( 'ABSPATH' ) ) { exit; } @@ -19,7 +21,7 @@ if ( ! class_exists( 'WC_CSV_Batch_Exporter', false ) ) { /** * WC_Admin_Report_CSV_Exporter Class. */ -class WC_Admin_Report_CSV_Exporter extends WC_CSV_Batch_Exporter { +class WC_Admin_Report_CSV_Exporter extends \WC_CSV_Batch_Exporter { /** * Type of report being exported. * @@ -102,15 +104,15 @@ class WC_Admin_Report_CSV_Exporter extends WC_CSV_Batch_Exporter { */ protected function map_report_controller() { $controller_map = array( - 'products' => 'WC_Admin_REST_Reports_Products_Controller', - 'variations' => 'WC_Admin_REST_Reports_Variations_Controller', - 'orders' => 'WC_Admin_REST_Reports_Orders_Controller', - 'categories' => 'WC_Admin_REST_Reports_Categories_Controller', - 'taxes' => 'WC_Admin_REST_Reports_Taxes_Controller', - 'coupons' => 'WC_Admin_REST_Reports_Coupons_Controller', - 'stock' => 'WC_Admin_REST_Reports_Stock_Controller', - 'downloads' => 'WC_Admin_REST_Reports_Downloads_Controller', - 'customers' => 'WC_Admin_REST_Reports_Customers_Controller', + 'products' => '\WC_Admin_REST_Reports_Products_Controller', + 'variations' => '\WC_Admin_REST_Reports_Variations_Controller', + 'orders' => '\WC_Admin_REST_Reports_Orders_Controller', + 'categories' => '\WC_Admin_REST_Reports_Categories_Controller', + 'taxes' => '\WC_Admin_REST_Reports_Taxes_Controller', + 'coupons' => '\WC_Admin_REST_Reports_Coupons_Controller', + 'stock' => '\WC_Admin_REST_Reports_Stock_Controller', + 'downloads' => '\WC_Admin_REST_Reports_Downloads_Controller', + 'customers' => '\WC_Admin_REST_Reports_Customers_Controller', ); if ( isset( $controller_map[ $this->report_type ] ) ) { @@ -175,7 +177,7 @@ class WC_Admin_Report_CSV_Exporter extends WC_CSV_Batch_Exporter { * Prepare data for export. */ public function prepare_data_to_export() { - $request = new WP_REST_Request( 'GET', "/wc/v4/reports/{$this->report_type}" ); + $request = new \WP_REST_Request( 'GET', "/wc/v4/reports/{$this->report_type}" ); $params = $this->controller->get_collection_params(); $defaults = array(); diff --git a/plugins/woocommerce-admin/includes/export/class-wc-admin-report-exporter.php b/plugins/woocommerce-admin/src/WC_Admin_Report_Exporter.php similarity index 97% rename from plugins/woocommerce-admin/includes/export/class-wc-admin-report-exporter.php rename to plugins/woocommerce-admin/src/WC_Admin_Report_Exporter.php index 402d5630978..a9d91d0bfb0 100644 --- a/plugins/woocommerce-admin/includes/export/class-wc-admin-report-exporter.php +++ b/plugins/woocommerce-admin/src/WC_Admin_Report_Exporter.php @@ -5,6 +5,8 @@ * @package WooCommerce/Export */ +namespace Automattic\WooCommerce\Admin; + if ( ! defined( 'ABSPATH' ) ) { exit; } @@ -93,7 +95,7 @@ class WC_Admin_Report_Exporter { $report_batch_args = array( $export_id, $report_type, $report_args ); if ( 0 < $num_batches ) { - WC_Admin_Reports_Sync::queue_batches( 1, $num_batches, self::REPORT_EXPORT_ACTION, $report_batch_args ); + \WC_Admin_Reports_Sync::queue_batches( 1, $num_batches, self::REPORT_EXPORT_ACTION, $report_batch_args ); } return $total_rows; diff --git a/plugins/woocommerce-admin/tests/reports/class-wc-tests-reports-coupons.php b/plugins/woocommerce-admin/tests/reports/class-wc-tests-reports-coupons.php index df46ff152ef..173e9b2b1cb 100644 --- a/plugins/woocommerce-admin/tests/reports/class-wc-tests-reports-coupons.php +++ b/plugins/woocommerce-admin/tests/reports/class-wc-tests-reports-coupons.php @@ -5,6 +5,8 @@ * @package WooCommerce\Tests\Coupons */ +use \Automattic\WooCommerce\Admin\WC_Admin_Report_CSV_Exporter; + /** * Class WC_Tests_Reports_Coupons */ diff --git a/plugins/woocommerce-admin/woocommerce-admin.php b/plugins/woocommerce-admin/woocommerce-admin.php index 48e7e9a7646..a3d16a8aeb9 100755 --- a/plugins/woocommerce-admin/woocommerce-admin.php +++ b/plugins/woocommerce-admin/woocommerce-admin.php @@ -24,6 +24,7 @@ use Automattic\WooCommerce\Admin\Notes\WC_Admin_Notes_Historical_Data; use Automattic\WooCommerce\Admin\Notes\WC_Admin_Notes_Order_Milestones; use Automattic\WooCommerce\Admin\Notes\WC_Admin_Notes_Welcome_Message; use Automattic\WooCommerce\Admin\Notes\WC_Admin_Notes_Woo_Subscriptions_Notes; +use Automattic\WooCommerce\Admin\WC_Admin_Report_Exporter; /** * Autoload packages.