Merge remote-tracking branch 'origin/release/6.4.3' into trunk

Author: cesarcosta99

changelog.txt

@@ -1,6 +1,7 @@
 *** Changelog ***
 
-= 6.5.0 - 2022-xx-xx =
+= 6.4.3 - 2022-06-30 =
+* Fix - Replace unnecessary throws with empty string when keys are invalid.
 
 = 6.4.2 - 2022-06-29 =
 * Fix - Fix terminal location creation if site title is missing.

includes/class-wc-gateway-stripe.php

@@ -992,31 +992,31 @@ public function process_admin_options() {
 	public function validate_publishable_key_field( $key, $value ) {
 		$value = $this->validate_text_field( $key, $value );
 		if ( ! empty( $value ) && ! preg_match( '/^pk_live_/', $value ) ) {
-			throw new Exception( __( 'The "Live Publishable Key" should start with "pk_live", enter the correct key.', 'woocommerce-gateway-stripe' ) );
+			return '';
 		}
 		return $value;
 	}
 
 	public function validate_secret_key_field( $key, $value ) {
 		$value = $this->validate_text_field( $key, $value );
 		if ( ! empty( $value ) && ! preg_match( '/^[rs]k_live_/', $value ) ) {
-			throw new Exception( __( 'The "Live Secret Key" should start with "sk_live" or "rk_live", enter the correct key.', 'woocommerce-gateway-stripe' ) );
+			return '';
 		}
 		return $value;
 	}
 
 	public function validate_test_publishable_key_field( $key, $value ) {
 		$value = $this->validate_text_field( $key, $value );
 		if ( ! empty( $value ) && ! preg_match( '/^pk_test_/', $value ) ) {
-			throw new Exception( __( 'The "Test Publishable Key" should start with "pk_test", enter the correct key.', 'woocommerce-gateway-stripe' ) );
+			return '';
 		}
 		return $value;
 	}
 
 	public function validate_test_secret_key_field( $key, $value ) {
 		$value = $this->validate_text_field( $key, $value );
 		if ( ! empty( $value ) && ! preg_match( '/^[rs]k_test_/', $value ) ) {
-			throw new Exception( __( 'The "Test Secret Key" should start with "sk_test" or "rk_test", enter the correct key.', 'woocommerce-gateway-stripe' ) );
+			return '';
 		}
 		return $value;
 	}

package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "woocommerce-gateway-stripe",
   "title": "WooCommerce Gateway Stripe",
-  "version": "6.4.2",
+  "version": "6.4.3",
   "license": "GPL-3.0",
   "homepage": "http://wordpress.org/plugins/woocommerce-gateway-stripe/",
   "repository": {

package.json

@@ -4,7 +4,7 @@ Tags: credit card, stripe, apple pay, payment request, google pay, sepa, sofort,
 Requires at least: 5.7
 Tested up to: 5.9
 Requires PHP: 7.0
-Stable tag: 6.4.2
+Stable tag: 6.4.3
 License: GPLv3
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
 Attributions: thorsten-stripe
@@ -128,6 +128,7 @@ If you get stuck, you can ask for help in the Plugin Forum.
 
 == Changelog ==
 
-= 6.5.0 - 2022-xx-xx =
+= 6.4.3 - 2022-06-30 =
+* Fix - Replace unnecessary throws with empty string when keys are invalid.
 
 [See changelog for all versions](https://raw.githubusercontent.com/woocommerce/woocommerce-gateway-stripe/trunk/changelog.txt).

readme.txt

@@ -5,7 +5,7 @@
  * Description: Take credit card payments on your store using Stripe.
  * Author: WooCommerce
  * Author URI: https://woocommerce.com/
- * Version: 6.4.2
+ * Version: 6.4.3
  * Requires at least: 5.7
  * Tested up to: 5.9
  * WC requires at least: 6.2
@@ -21,7 +21,7 @@
 /**
  * Required minimums and constants
  */
-define( 'WC_STRIPE_VERSION', '6.4.2' ); // WRCS: DEFINED_VERSION.
+define( 'WC_STRIPE_VERSION', '6.4.3' ); // WRCS: DEFINED_VERSION.
 define( 'WC_STRIPE_MIN_PHP_VER', '7.0.0' );
 define( 'WC_STRIPE_MIN_WC_VER', '6.2' );
 define( 'WC_STRIPE_FUTURE_MIN_WC_VER', '6.3' );