From ded85d1d4032a27b4bb8c26f1df45bde13cb9baf Mon Sep 17 00:00:00 2001 From: Ilyas Foo Date: Wed, 3 Apr 2024 21:42:26 +0800 Subject: [PATCH] Fix PaymentGatewaySuggestionsDataSourcePoller and disable deprecation logging (#46163) * Temporarily disable deprecation logging and use old DataSourcePoller class * Changelog * Update DataSourcePoller.php * Change to comment for lint * Typo again * Lint * Better comment from @nigeljamesstevenson --- .../changelog/fix-datasourcepoller-upgrade-issues | 4 ++++ plugins/woocommerce/src/Admin/DataSourcePoller.php | 13 +++++-------- .../PaymentGatewaySuggestionsDataSourcePoller.php | 2 +- 3 files changed, 10 insertions(+), 9 deletions(-) create mode 100644 plugins/woocommerce/changelog/fix-datasourcepoller-upgrade-issues diff --git a/plugins/woocommerce/changelog/fix-datasourcepoller-upgrade-issues b/plugins/woocommerce/changelog/fix-datasourcepoller-upgrade-issues new file mode 100644 index 00000000000..224e68b9160 --- /dev/null +++ b/plugins/woocommerce/changelog/fix-datasourcepoller-upgrade-issues @@ -0,0 +1,4 @@ +Significance: patch +Type: dev + +Temporary disable DataSourcePoller class deprecation message diff --git a/plugins/woocommerce/src/Admin/DataSourcePoller.php b/plugins/woocommerce/src/Admin/DataSourcePoller.php index 707c4c7792d..f438f7d9e0d 100644 --- a/plugins/woocommerce/src/Admin/DataSourcePoller.php +++ b/plugins/woocommerce/src/Admin/DataSourcePoller.php @@ -16,14 +16,11 @@ abstract class DataSourcePoller extends RemoteSpecsDataSourcePoller { * Log a deprecation to the error log. */ private static function log_deprecation() { - error_log( // phpcs:ignore - sprintf( - '%1$s is deprecated since version %2$s! Use %3$s instead.', - self::class, - '8.8.0', - 'Automattic\WooCommerce\Admin\RemoteSpecs\DataSourcePoller' - ) - ); + /** + * Note: Deprecation messages have been temporarily disabled due to upgrade issues. + * For more details, see the discussion in the WooCommerce GitHub repository: + * https://github.com/woocommerce/woocommerce/pull/45892. + */ } /** diff --git a/plugins/woocommerce/src/Admin/Features/PaymentGatewaySuggestions/PaymentGatewaySuggestionsDataSourcePoller.php b/plugins/woocommerce/src/Admin/Features/PaymentGatewaySuggestions/PaymentGatewaySuggestionsDataSourcePoller.php index d53ac724afd..5e3608b635d 100644 --- a/plugins/woocommerce/src/Admin/Features/PaymentGatewaySuggestions/PaymentGatewaySuggestionsDataSourcePoller.php +++ b/plugins/woocommerce/src/Admin/Features/PaymentGatewaySuggestions/PaymentGatewaySuggestionsDataSourcePoller.php @@ -2,7 +2,7 @@ namespace Automattic\WooCommerce\Admin\Features\PaymentGatewaySuggestions; -use Automattic\WooCommerce\Admin\RemoteSpecs\DataSourcePoller; +use Automattic\WooCommerce\Admin\DataSourcePoller; /** * Specs data source poller class for payment gateway suggestions.