From 5d076cc7d47e77580c73ca3afbebe732038aef50 Mon Sep 17 00:00:00 2001
From: Chi-Hsuan Huang <chihsuan.tw@gmail.com>
Date: Thu, 2 Jun 2022 13:13:44 +0800
Subject: [PATCH] Fix obw free extension rules for the marketing task with php
 8 (#33291)

* Fix obw free extensions api for marketing task with php8

* Add changelog

* Fix wcpay cbd rule
---
 .../fix-obw-free-extensions-for-php8          |  4 +++
 .../DefaultFreeExtensions.php                 | 32 +++----------------
 2 files changed, 8 insertions(+), 28 deletions(-)
 create mode 100644 plugins/woocommerce/changelog/fix-obw-free-extensions-for-php8

diff --git a/plugins/woocommerce/changelog/fix-obw-free-extensions-for-php8 b/plugins/woocommerce/changelog/fix-obw-free-extensions-for-php8
new file mode 100644
index 00000000000..3afcb075a9a
--- /dev/null
+++ b/plugins/woocommerce/changelog/fix-obw-free-extensions-for-php8
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Fix obw free extension rules for the marketing task with php 8
diff --git a/plugins/woocommerce/src/Internal/Admin/RemoteFreeExtensions/DefaultFreeExtensions.php b/plugins/woocommerce/src/Internal/Admin/RemoteFreeExtensions/DefaultFreeExtensions.php
index 2cb90fdef42..42d5b238854 100644
--- a/plugins/woocommerce/src/Internal/Admin/RemoteFreeExtensions/DefaultFreeExtensions.php
+++ b/plugins/woocommerce/src/Internal/Admin/RemoteFreeExtensions/DefaultFreeExtensions.php
@@ -5,6 +5,8 @@
 
 namespace Automattic\WooCommerce\Internal\Admin\RemoteFreeExtensions;
 
+use Automattic\WooCommerce\Admin\Features\PaymentGatewaySuggestions\DefaultPaymentGateways;
+
 defined( 'ABSPATH' ) || exit;
 
 
@@ -235,34 +237,8 @@ class DefaultFreeExtensions {
 								'operation' => '=',
 							],
 						],
-						[
-							'type'         => 'option',
-							'transformers' => [
-								[
-									'use'       => 'dot_notation',
-									'arguments' => [
-										'path' => 'industry',
-									],
-								],
-								[
-									'use'       => 'array_column',
-									'arguments' => [
-										'key' => 'slug',
-									],
-								],
-								[
-									'use'       => 'array_search',
-									'arguments' => [
-										'value' => 'cbd-other-hemp-derived-products',
-									],
-								],
-							],
-							'option_name'  => 'woocommerce_onboarding_profile',
-							'value'        => 'cbd-other-hemp-derived-products',
-							'default'      => '',
-							'operation'    => '!=',
-						],
 					],
+					DefaultPaymentGateways::get_rules_for_cbd( false ),
 				],
 				'is_built_by_wc' => true,
 			],
@@ -307,7 +283,7 @@ class DefaultFreeExtensions {
 									],
 									'option_name'  => 'woocommerce_onboarding_profile',
 									'value'        => 1,
-									'default'      => '',
+									'default'      => array(),
 									'operation'    => '!=',
 								],
 							],