From cf2185eaaafe7c0f5e1729dd6eb6579f1eeef0f5 Mon Sep 17 00:00:00 2001 From: Jeff Stieler Date: Mon, 13 Apr 2020 08:33:22 -0600 Subject: [PATCH] Fix usage of WP_Error in non-global namespaces. (https://github.com/woocommerce/woocommerce-admin/pull/4115) --- .../src/API/OnboardingPlugins.php | 20 +++++++++---------- .../API/Reports/Orders/Stats/DataStore.php | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/plugins/woocommerce-admin/src/API/OnboardingPlugins.php b/plugins/woocommerce-admin/src/API/OnboardingPlugins.php index b4ccda95c2b..1dd46d146d0 100644 --- a/plugins/woocommerce-admin/src/API/OnboardingPlugins.php +++ b/plugins/woocommerce-admin/src/API/OnboardingPlugins.php @@ -348,7 +348,7 @@ class OnboardingPlugins extends \WC_REST_Data_Controller { public function request_wccom_connect() { include_once WC_ABSPATH . 'includes/admin/helper/class-wc-helper-api.php'; if ( ! class_exists( 'WC_Helper_API' ) ) { - return new WP_Error( 'woocommerce_rest_helper_not_active', __( 'There was an error loading the WooCommerce.com Helper API.', 'woocommerce-admin' ), 404 ); + return new \WP_Error( 'woocommerce_rest_helper_not_active', __( 'There was an error loading the WooCommerce.com Helper API.', 'woocommerce-admin' ), 404 ); } $redirect_uri = wc_admin_url( '&task=connect&wccom-connected=1' ); @@ -365,12 +365,12 @@ class OnboardingPlugins extends \WC_REST_Data_Controller { $code = wp_remote_retrieve_response_code( $request ); if ( 200 !== $code ) { - return new WP_Error( 'woocommerce_rest_helper_connect', __( 'There was an error connecting to WooCommerce.com. Please try again.', 'woocommerce-admin' ), 500 ); + return new \WP_Error( 'woocommerce_rest_helper_connect', __( 'There was an error connecting to WooCommerce.com. Please try again.', 'woocommerce-admin' ), 500 ); } $secret = json_decode( wp_remote_retrieve_body( $request ) ); if ( empty( $secret ) ) { - return new WP_Error( 'woocommerce_rest_helper_connect', __( 'There was an error connecting to WooCommerce.com. Please try again.', 'woocommerce-admin' ), 500 ); + return new \WP_Error( 'woocommerce_rest_helper_connect', __( 'There was an error connecting to WooCommerce.com. Please try again.', 'woocommerce-admin' ), 500 ); } do_action( 'woocommerce_helper_connect_start' ); @@ -411,7 +411,7 @@ class OnboardingPlugins extends \WC_REST_Data_Controller { include_once WC_ABSPATH . 'includes/admin/helper/class-wc-helper-updater.php'; include_once WC_ABSPATH . 'includes/admin/helper/class-wc-helper-options.php'; if ( ! class_exists( 'WC_Helper_API' ) ) { - return new WP_Error( 'woocommerce_rest_helper_not_active', __( 'There was an error loading the WooCommerce.com Helper API.', 'woocommerce-admin' ), 404 ); + return new \WP_Error( 'woocommerce_rest_helper_not_active', __( 'There was an error loading the WooCommerce.com Helper API.', 'woocommerce-admin' ), 404 ); } // Obtain an access token. @@ -427,12 +427,12 @@ class OnboardingPlugins extends \WC_REST_Data_Controller { $code = wp_remote_retrieve_response_code( $request ); if ( 200 !== $code ) { - return new WP_Error( 'woocommerce_rest_helper_connect', __( 'There was an error connecting to WooCommerce.com. Please try again.', 'woocommerce-admin' ), 500 ); + return new \WP_Error( 'woocommerce_rest_helper_connect', __( 'There was an error connecting to WooCommerce.com. Please try again.', 'woocommerce-admin' ), 500 ); } $access_token = json_decode( wp_remote_retrieve_body( $request ), true ); if ( ! $access_token ) { - return new WP_Error( 'woocommerce_rest_helper_connect', __( 'There was an error connecting to WooCommerce.com. Please try again.', 'woocommerce-admin' ), 500 ); + return new \WP_Error( 'woocommerce_rest_helper_connect', __( 'There was an error connecting to WooCommerce.com. Please try again.', 'woocommerce-admin' ), 500 ); } \WC_Helper_Options::update( @@ -448,7 +448,7 @@ class OnboardingPlugins extends \WC_REST_Data_Controller { if ( ! \WC_Helper::_flush_authentication_cache() ) { \WC_Helper_Options::update( 'auth', array() ); - return new WP_Error( 'woocommerce_rest_helper_connect', __( 'There was an error connecting to WooCommerce.com. Please try again.', 'woocommerce-admin' ), 500 ); + return new \WP_Error( 'woocommerce_rest_helper_connect', __( 'There was an error connecting to WooCommerce.com. Please try again.', 'woocommerce-admin' ), 500 ); } delete_transient( '_woocommerce_helper_subscriptions' ); @@ -468,7 +468,7 @@ class OnboardingPlugins extends \WC_REST_Data_Controller { */ public function connect_paypal() { if ( ! function_exists( 'wc_gateway_ppec' ) ) { - return new WP_Error( 'woocommerce_rest_helper_connect', __( 'There was an error connecting to PayPal.', 'woocommerce-admin' ), 500 ); + return new \WP_Error( 'woocommerce_rest_helper_connect', __( 'There was an error connecting to PayPal.', 'woocommerce-admin' ), 500 ); } $redirect_url = add_query_arg( @@ -499,7 +499,7 @@ class OnboardingPlugins extends \WC_REST_Data_Controller { */ public function connect_square() { if ( ! class_exists( '\WooCommerce\Square\Handlers\Connection' ) ) { - return new WP_Error( 'woocommerce_rest_helper_connect', __( 'There was an error connecting to Square.', 'woocommerce-admin' ), 500 ); + return new \WP_Error( 'woocommerce_rest_helper_connect', __( 'There was an error connecting to Square.', 'woocommerce-admin' ), 500 ); } if ( 'US' === WC()->countries->get_base_country() ) { @@ -551,7 +551,7 @@ class OnboardingPlugins extends \WC_REST_Data_Controller { */ public function connect_wcpay() { if ( ! class_exists( 'WC_Payments_Account' ) ) { - return new WP_Error( 'woocommerce_rest_helper_connect', __( 'There was an error communicating with the WooCommerce Payments plugin.', 'woocommerce-admin' ), 500 ); + return new \WP_Error( 'woocommerce_rest_helper_connect', __( 'There was an error communicating with the WooCommerce Payments plugin.', 'woocommerce-admin' ), 500 ); } $connect_url = add_query_arg( diff --git a/plugins/woocommerce-admin/src/API/Reports/Orders/Stats/DataStore.php b/plugins/woocommerce-admin/src/API/Reports/Orders/Stats/DataStore.php index 6ae64e2f407..fc02ca770af 100644 --- a/plugins/woocommerce-admin/src/API/Reports/Orders/Stats/DataStore.php +++ b/plugins/woocommerce-admin/src/API/Reports/Orders/Stats/DataStore.php @@ -295,7 +295,7 @@ class DataStore extends ReportsDataStore implements DataStoreInterface { ARRAY_A ); // phpcs:ignore cache ok, DB call ok, unprepared SQL ok. if ( null === $totals ) { - return new WP_Error( 'woocommerce_analytics_revenue_result_failed', __( 'Sorry, fetching revenue data failed.', 'woocommerce-admin' ) ); + return new \WP_Error( 'woocommerce_analytics_revenue_result_failed', __( 'Sorry, fetching revenue data failed.', 'woocommerce-admin' ) ); } // @todo Remove these assignements when refactoring segmenter classes to use query objects.