From 62f6da98c9dff42b704dcbd97afef94854ad7561 Mon Sep 17 00:00:00 2001 From: Ilyas Foo Date: Wed, 3 Apr 2024 18:13:24 +0800 Subject: [PATCH 1/7] Temporarily disable deprecation logging and use old DataSourcePoller class --- plugins/woocommerce/src/Admin/DataSourcePoller.php | 2 ++ .../PaymentGatewaySuggestionsDataSourcePoller.php | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/plugins/woocommerce/src/Admin/DataSourcePoller.php b/plugins/woocommerce/src/Admin/DataSourcePoller.php index 707c4c7792df..ae5ba572074a 100644 --- a/plugins/woocommerce/src/Admin/DataSourcePoller.php +++ b/plugins/woocommerce/src/Admin/DataSourcePoller.php @@ -16,6 +16,8 @@ abstract class DataSourcePoller extends RemoteSpecsDataSourcePoller { * Log a deprecation to the error log. */ private static function log_deprecation() { + // Temporarily disable deprecation message in logs since due to upgrade issues https://github.com/woocommerce/woocommerce/pull/45892. + return; error_log( // phpcs:ignore sprintf( '%1$s is deprecated since version %2$s! Use %3$s instead.', diff --git a/plugins/woocommerce/src/Admin/Features/PaymentGatewaySuggestions/PaymentGatewaySuggestionsDataSourcePoller.php b/plugins/woocommerce/src/Admin/Features/PaymentGatewaySuggestions/PaymentGatewaySuggestionsDataSourcePoller.php index d53ac724afdc..5e3608b635d5 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. From 2e11eba34840118bdacd92b4bcde98c642d59be2 Mon Sep 17 00:00:00 2001 From: Ilyas Foo Date: Wed, 3 Apr 2024 18:23:01 +0800 Subject: [PATCH 2/7] Changelog --- .../woocommerce/changelog/fix-datasourcepoller-upgrade-issues | 4 ++++ 1 file changed, 4 insertions(+) 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 000000000000..224e68b9160d --- /dev/null +++ b/plugins/woocommerce/changelog/fix-datasourcepoller-upgrade-issues @@ -0,0 +1,4 @@ +Significance: patch +Type: dev + +Temporary disable DataSourcePoller class deprecation message From 5db2a0b8b1011f7f4531595ef85236e8fcf91691 Mon Sep 17 00:00:00 2001 From: Ilyas Foo Date: Wed, 3 Apr 2024 18:45:25 +0800 Subject: [PATCH 3/7] Update DataSourcePoller.php --- plugins/woocommerce/src/Admin/DataSourcePoller.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/woocommerce/src/Admin/DataSourcePoller.php b/plugins/woocommerce/src/Admin/DataSourcePoller.php index ae5ba572074a..262f2b3a1e67 100644 --- a/plugins/woocommerce/src/Admin/DataSourcePoller.php +++ b/plugins/woocommerce/src/Admin/DataSourcePoller.php @@ -16,7 +16,7 @@ abstract class DataSourcePoller extends RemoteSpecsDataSourcePoller { * Log a deprecation to the error log. */ private static function log_deprecation() { - // Temporarily disable deprecation message in logs since due to upgrade issues https://github.com/woocommerce/woocommerce/pull/45892. + // Temporarily disable deprecation message in logs due to upgrade issues https://github.com/woocommerce/woocommerce/pull/45892. return; error_log( // phpcs:ignore sprintf( From daace77cdc6fea386ba43eb09ce9e03bb1871ece Mon Sep 17 00:00:00 2001 From: Ilyas Foo Date: Wed, 3 Apr 2024 18:57:51 +0800 Subject: [PATCH 4/7] Change to comment for lint --- plugins/woocommerce/src/Admin/DataSourcePoller.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/woocommerce/src/Admin/DataSourcePoller.php b/plugins/woocommerce/src/Admin/DataSourcePoller.php index 262f2b3a1e67..65b968cbcf21 100644 --- a/plugins/woocommerce/src/Admin/DataSourcePoller.php +++ b/plugins/woocommerce/src/Admin/DataSourcePoller.php @@ -16,8 +16,8 @@ abstract class DataSourcePoller extends RemoteSpecsDataSourcePoller { * Log a deprecation to the error log. */ private static function log_deprecation() { - // Temporarily disable deprecation message in logs due to upgrade issues https://github.com/woocommerce/woocommerce/pull/45892. - return; + /* + // Temporarily disable deprecation message in logs since due to upgrade issues https://github.com/woocommerce/woocommerce/pull/45892. error_log( // phpcs:ignore sprintf( '%1$s is deprecated since version %2$s! Use %3$s instead.', @@ -26,6 +26,7 @@ private static function log_deprecation() { 'Automattic\WooCommerce\Admin\RemoteSpecs\DataSourcePoller' ) ); + */ } /** From 8c8052588502972f38240bca7b5910a1d3897d12 Mon Sep 17 00:00:00 2001 From: Ilyas Foo Date: Wed, 3 Apr 2024 19:01:30 +0800 Subject: [PATCH 5/7] Typo again --- plugins/woocommerce/src/Admin/DataSourcePoller.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/woocommerce/src/Admin/DataSourcePoller.php b/plugins/woocommerce/src/Admin/DataSourcePoller.php index 65b968cbcf21..948180309d97 100644 --- a/plugins/woocommerce/src/Admin/DataSourcePoller.php +++ b/plugins/woocommerce/src/Admin/DataSourcePoller.php @@ -17,7 +17,7 @@ abstract class DataSourcePoller extends RemoteSpecsDataSourcePoller { */ private static function log_deprecation() { /* - // Temporarily disable deprecation message in logs since due to upgrade issues https://github.com/woocommerce/woocommerce/pull/45892. + // Temporarily disable deprecation message in logs due to upgrade issues https://github.com/woocommerce/woocommerce/pull/45892. error_log( // phpcs:ignore sprintf( '%1$s is deprecated since version %2$s! Use %3$s instead.', From ac7c246272fdf5c61cc7f768858fcb3ec3f31729 Mon Sep 17 00:00:00 2001 From: Ilyas Foo Date: Wed, 3 Apr 2024 20:42:17 +0800 Subject: [PATCH 6/7] Lint --- plugins/woocommerce/src/Admin/DataSourcePoller.php | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/plugins/woocommerce/src/Admin/DataSourcePoller.php b/plugins/woocommerce/src/Admin/DataSourcePoller.php index 948180309d97..2d745038fab5 100644 --- a/plugins/woocommerce/src/Admin/DataSourcePoller.php +++ b/plugins/woocommerce/src/Admin/DataSourcePoller.php @@ -16,17 +16,7 @@ abstract class DataSourcePoller extends RemoteSpecsDataSourcePoller { * Log a deprecation to the error log. */ private static function log_deprecation() { - /* // Temporarily disable deprecation message in logs due to upgrade issues https://github.com/woocommerce/woocommerce/pull/45892. - 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' - ) - ); - */ } /** From 8c5c9ed13ec24b4f91fd6dc8037b071d05ec94f5 Mon Sep 17 00:00:00 2001 From: Ilyas Foo Date: Wed, 3 Apr 2024 20:51:52 +0800 Subject: [PATCH 7/7] Better comment from @nigeljamesstevenson --- plugins/woocommerce/src/Admin/DataSourcePoller.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/plugins/woocommerce/src/Admin/DataSourcePoller.php b/plugins/woocommerce/src/Admin/DataSourcePoller.php index 2d745038fab5..f438f7d9e0d2 100644 --- a/plugins/woocommerce/src/Admin/DataSourcePoller.php +++ b/plugins/woocommerce/src/Admin/DataSourcePoller.php @@ -16,7 +16,11 @@ abstract class DataSourcePoller extends RemoteSpecsDataSourcePoller { * Log a deprecation to the error log. */ private static function log_deprecation() { - // Temporarily disable deprecation message in logs due to upgrade issues https://github.com/woocommerce/woocommerce/pull/45892. + /** + * 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. + */ } /**