From aa4035adb96a1b1065d3ef39ef91f1b975bb00bd Mon Sep 17 00:00:00 2001 From: Peter Fabian Date: Mon, 17 Sep 2018 20:20:34 +0200 Subject: [PATCH] Added WC_Admin prefix for query classes where it was missing. --- .../includes/class-wc-admin-reports-interval.php | 5 +---- .../class-wc-admin-reports-orders-stats-query.php | 14 ++++++-------- .../class-wc-admin-reports-products-query.php | 10 ++++------ ...class-wc-admin-reports-products-stats-query.php | 3 --- .../includes/class-wc-admin-reports-query.php | 9 +++------ .../class-wc-admin-reports-revenue-query.php | 11 ++++------- 6 files changed, 18 insertions(+), 34 deletions(-) diff --git a/plugins/woocommerce-admin/includes/class-wc-admin-reports-interval.php b/plugins/woocommerce-admin/includes/class-wc-admin-reports-interval.php index b770e808066..9f7928969a2 100644 --- a/plugins/woocommerce-admin/includes/class-wc-admin-reports-interval.php +++ b/plugins/woocommerce-admin/includes/class-wc-admin-reports-interval.php @@ -2,9 +2,7 @@ /** * Class for time interval handling for reports * - * @package WooCommerce/Classes - * @version 3.5.0 - * @since 3.5.0 + * @package WooCommerce Admin/Classes */ defined( 'ABSPATH' ) || exit; @@ -66,7 +64,6 @@ class WC_Admin_Reports_Interval { * @return int|null */ public static function quarter( $datetime ) { - // TODO: is there a smarter way? Is floor((m - 1)/3) + 1 better? switch ( (int) $datetime->format( 'm' ) ) { case 1: case 2: diff --git a/plugins/woocommerce-admin/includes/class-wc-admin-reports-orders-stats-query.php b/plugins/woocommerce-admin/includes/class-wc-admin-reports-orders-stats-query.php index 12d91b7bcc0..04b153928a7 100644 --- a/plugins/woocommerce-admin/includes/class-wc-admin-reports-orders-stats-query.php +++ b/plugins/woocommerce-admin/includes/class-wc-admin-reports-orders-stats-query.php @@ -11,22 +11,20 @@ * 'coupons' => array(138), * 'order_status' => array('completed'), * ); - * $report = new WC_Reports_Orders_Stats_Query( $args ); + * $report = new WC_Admin_Reports_Orders_Stats_Query( $args ); * $mydata = $report->get_data(); * - * @package WooCommerce/Classes - * @version 3.5.0 - * @since 3.5.0 + * @package WooCommerce Admin/Classes + */ defined( 'ABSPATH' ) || exit; /** - * WC_Reports_Orders_Stats_Query + * WC_Admin_Reports_Orders_Stats_Query * - * @version 3.5.0 */ -class WC_Reports_Orders_Stats_Query extends WC_Reports_Query { +class WC_Admin_Reports_Orders_Stats_Query extends WC_Admin_Reports_Query { const REPORT_NAME = 'report-orders-stats'; @@ -57,4 +55,4 @@ class WC_Reports_Orders_Stats_Query extends WC_Reports_Query { return apply_filters( 'woocommerce_reports_orders_stats_select_query', $results, $args ); } -} \ No newline at end of file +} diff --git a/plugins/woocommerce-admin/includes/class-wc-admin-reports-products-query.php b/plugins/woocommerce-admin/includes/class-wc-admin-reports-products-query.php index b969b60c1ea..f32835851c6 100644 --- a/plugins/woocommerce-admin/includes/class-wc-admin-reports-products-query.php +++ b/plugins/woocommerce-admin/includes/class-wc-admin-reports-products-query.php @@ -10,12 +10,11 @@ * 'categories' => array(15, 18), * 'products' => array(1,2,3) * ); - * $report = new WC_Reports_Products_Query( $args ); + * $report = new WC_Admin_Reports_Products_Query( $args ); * $mydata = $report->get_data(); * - * @package WooCommerce/Classes - * @version 3.5.0 - * @since 3.5.0 + * @package WooCommerce Admin/Classes + */ defined( 'ABSPATH' ) || exit; @@ -23,9 +22,8 @@ defined( 'ABSPATH' ) || exit; /** * WC_Reports_Products_Query * - * @version 3.5.0 */ -class WC_Reports_Products_Query extends WC_Reports_Query { +class WC_Admin_Reports_Products_Query extends WC_Admin_Reports_Query { const REPORT_NAME = 'report-products'; diff --git a/plugins/woocommerce-admin/includes/class-wc-admin-reports-products-stats-query.php b/plugins/woocommerce-admin/includes/class-wc-admin-reports-products-stats-query.php index ff7101edc75..2655ac36dde 100644 --- a/plugins/woocommerce-admin/includes/class-wc-admin-reports-products-stats-query.php +++ b/plugins/woocommerce-admin/includes/class-wc-admin-reports-products-stats-query.php @@ -14,8 +14,6 @@ * $mydata = $report->get_data(); * * @package WooCommerce Admin/Classes - * @version 3.5.0 - * @since 3.5.0 */ defined( 'ABSPATH' ) || exit; @@ -23,7 +21,6 @@ defined( 'ABSPATH' ) || exit; /** * WC_Admin_Reports_Products_Query * - * @version 3.5.0 */ class WC_Admin_Reports_Products_Stats_Query extends WC_Admin_Reports_Query { diff --git a/plugins/woocommerce-admin/includes/class-wc-admin-reports-query.php b/plugins/woocommerce-admin/includes/class-wc-admin-reports-query.php index 59f55548ffa..87a6dd15904 100644 --- a/plugins/woocommerce-admin/includes/class-wc-admin-reports-query.php +++ b/plugins/woocommerce-admin/includes/class-wc-admin-reports-query.php @@ -2,19 +2,16 @@ /** * Class for parameter-based Reports querying * - * @package WooCommerce/Classes - * @version 3.5.0 - * @since 3.5.0 + * @package WooCommerce Admin/Classes */ defined( 'ABSPATH' ) || exit; /** - * WC_Reports_Query + * WC_Admin_Reports_Query * - * @version 3.5.0 */ -abstract class WC_Reports_Query extends WC_Object_Query { +abstract class WC_Admin_Reports_Query extends WC_Object_Query { /** * Get report data matching the current query vars. diff --git a/plugins/woocommerce-admin/includes/class-wc-admin-reports-revenue-query.php b/plugins/woocommerce-admin/includes/class-wc-admin-reports-revenue-query.php index decc20e6132..03c23ce4365 100644 --- a/plugins/woocommerce-admin/includes/class-wc-admin-reports-revenue-query.php +++ b/plugins/woocommerce-admin/includes/class-wc-admin-reports-revenue-query.php @@ -8,22 +8,19 @@ * 'after' => '2018-07-05 00:00:00', * 'interval' => 'week', * ); - * $report = new WC_Reports_Revenue_Query( $args ); + * $report = new WC_Admin_Reports_Revenue_Query( $args ); * $mydata = $report->get_data(); * - * @package WooCommerce/Classes - * @version 3.5.0 - * @since 3.5.0 + * @package WooCommerce Admin/Classes */ defined( 'ABSPATH' ) || exit; /** - * WC_Reports_Revenue_Query + * WC_Admin_Reports_Revenue_Query * - * @version 3.5.0 */ -class WC_Reports_Revenue_Query extends WC_Reports_Query { +class WC_Admin_Reports_Revenue_Query extends WC_Admin_Reports_Query { const REPORT_NAME = 'report-revenue-stats';