Fix connection array merge error (#3355)

* Fix connection array merge error * Adding PHP 8.1 to the list of testable versions * Changing PHPUnit version for PHP 8.1 (using 10.5.29) * Changing PHPUnit version for PHP 8.1 (using 10.5.29) * Revert test changes (will be moved to another PR) * Checking if the default options value is an array * Changelog and readme entries --------- Co-authored-by: Diego Curbelo <[email protected]>
woocommerce · Aug 14, 2024 · 4b71491 · 4b71491
1 parent 4486978
commit 4b71491
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/changelog.txt b/changelog.txt
@@ -1,6 +1,7 @@
 *** Changelog ***
 
 = 8.7.0 - xxxx-xx-xx =
+* Fix - Fix possible fatal errors when Stripe settings format is invalid during account connection.
 * Add - Log incoming webhook events and their request body.
 * Add - Show UPE payment methods in saved order on block checkout page.
 * Tweak - Delete the notice about the missing customization options on the updated checkout experience.

diff --git a/includes/connect/class-wc-stripe-connect.php b/includes/connect/class-wc-stripe-connect.php
@@ -150,7 +150,8 @@ private function save_stripe_keys( $result, $type = 'connect', $mode = 'live' )
 			$is_test                                    = 'live' !== $mode;
 			$prefix                                     = $is_test ? 'test_' : '';
 			$default_options                            = $this->get_default_stripe_config();
-			$options                                    = array_merge( $default_options, get_option( self::SETTINGS_OPTION, [] ) );
+			$current_options                            = get_option( self::SETTINGS_OPTION, [] );
+			$options                                    = array_merge( $default_options, is_array( $current_options ) ? $current_options : [] );
 			$options['enabled']                         = 'yes';
 			$options['testmode']                        = $is_test ? 'yes' : 'no';
 			$options['upe_checkout_experience_enabled'] = $this->get_upe_checkout_experience_enabled();

diff --git a/readme.txt b/readme.txt
@@ -129,6 +129,7 @@ If you get stuck, you can ask for help in the Plugin Forum.
 == Changelog ==
 
 = 8.7.0 - xxxx-xx-xx =
+* Fix - Fix possible fatal errors when Stripe settings format is invalid during account connection.
 * Add - Log incoming webhook events and their request body.
 * Add - Show UPE payment methods in saved order on block checkout page.
 * Tweak - Delete the notice about the missing customization options on the updated checkout experience.