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

Author: rafaelzaleski

changelog.txt

@@ -1,5 +1,8 @@
 *** Changelog ***
 
+= 6.4.1 - 2022-06-01 =
+* Fix - Ensure proper URL formatting.
+
 = 6.4.0 - 2022-05-20 =
 * Fix - Changed logic for how 'Enabled/Disabled' statuses are shown for payments and payouts capabilities in settings.
 * Tweak - Updated the minimum supported versions of WordPress and WooCommerce.

includes/admin/class-wc-rest-stripe-locations-controller.php

@@ -49,15 +49,15 @@ public function register_routes() {
 				'permission_callback' => [ $this, 'check_permission' ],
 				'args'                => [
 					'ending_before'  => [
-						'type' => 'string',
+						'type'     => 'string',
 						'required' => false,
 					],
 					'limit'          => [
-						'type' => 'integer',
+						'type'     => 'integer',
 						'required' => false,
 					],
 					'starting_after' => [
-						'type' => 'string',
+						'type'     => 'string',
 						'required' => false,
 					],
 				],
@@ -178,9 +178,9 @@ public function get_location( $request ) {
 	 * @param WP_REST_Request $request Full data about the request.
 	 */
 	public function get_store_location( $request ) {
-		$name = get_bloginfo();
+		$name          = get_bloginfo();
 		$store_address = WC()->countries;
-		$address = array_filter(
+		$address       = array_filter(
 			[
 				'city'        => $store_address->get_base_city(),
 				'country'     => $store_address->get_base_country(),
@@ -224,7 +224,7 @@ public function get_store_location( $request ) {
 			$response = WC_Stripe_API::request(
 				[
 					'display_name' => $name,
-					'address' => $address,
+					'address'      => $address,
 				],
 				'terminal/locations'
 			);

includes/class-wc-stripe-account.php

@@ -10,8 +10,8 @@
  */
 class WC_Stripe_Account {
 
-	const LIVE_ACCOUNT_OPTION    = 'wcstripe_account_data_live';
-	const TEST_ACCOUNT_OPTION    = 'wcstripe_account_data_test';
+	const LIVE_ACCOUNT_OPTION = 'wcstripe_account_data_live';
+	const TEST_ACCOUNT_OPTION = 'wcstripe_account_data_test';
 
 	const STATUS_COMPLETE        = 'complete';
 	const STATUS_NO_ACCOUNT      = 'NOACCOUNT';

includes/compat/trait-wc-stripe-subscriptions.php

@@ -214,7 +214,7 @@ public function process_subscription_payment( $amount, $renewal_order, $retry =
 						[
 							'order'         => $order_id,
 							'nonce'         => wp_create_nonce( 'wc_stripe_confirm_pi' ),
-							'redirect_to'   => remove_query_arg( [ 'process_early_renewal', 'subscription_id', 'wcs_nonce' ] ),
+							'redirect_to'   => esc_url_raw( remove_query_arg( [ 'process_early_renewal', 'subscription_id', 'wcs_nonce' ] ) ),
 							'early_renewal' => true,
 						],
 						WC_AJAX::get_endpoint( 'wc_stripe_verify_intent' )

includes/connect/class-wc-stripe-connect.php

@@ -87,7 +87,7 @@ public function maybe_handle_redirect() {
 			if ( isset( $_GET['wcs_stripe_code'], $_GET['wcs_stripe_state'] ) ) {
 
 				$response = $this->connect_oauth( wc_clean( wp_unslash( $_GET['wcs_stripe_state'] ) ), wc_clean( wp_unslash( $_GET['wcs_stripe_code'] ) ) );
-				wp_safe_redirect( remove_query_arg( [ 'wcs_stripe_state', 'wcs_stripe_code' ] ) );
+				wp_safe_redirect( esc_url_raw( remove_query_arg( [ 'wcs_stripe_state', 'wcs_stripe_code' ] ) ) );
 				exit;
 
 				// redirect from credentials reset
@@ -99,11 +99,13 @@ public function maybe_handle_redirect() {
 
 				$this->clear_stripe_keys();
 				wp_safe_redirect(
-					remove_query_arg(
-						[
-							'_wpnonce',
-							'reset_stripe_api_credentials',
-						]
+					esc_url_raw(
+						remove_query_arg(
+							[
+								'_wpnonce',
+								'reset_stripe_api_credentials',
+							]
+						)
 					)
 				);
 				exit;

package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "woocommerce-gateway-stripe",
   "title": "WooCommerce Gateway Stripe",
-  "version": "6.4.0",
+  "version": "6.4.1",
   "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.0
+Stable tag: 6.4.1
 License: GPLv3
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
 Attributions: thorsten-stripe
@@ -128,8 +128,7 @@ If you get stuck, you can ask for help in the Plugin Forum.
 
 == Changelog ==
 
-= 6.4.0 - 2022-05-20 =
-* Fix - Changed logic for how 'Enabled/Disabled' statuses are shown for payments and payouts capabilities in settings.
-* Tweak - Updated the minimum supported versions of WordPress and WooCommerce.
+= 6.4.1 - 2022-06-01 =
+* Fix - Ensure proper URL formatting.
 
 [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.0
+ * Version: 6.4.1
  * 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.0' ); // WRCS: DEFINED_VERSION.
+define( 'WC_STRIPE_VERSION', '6.4.1' ); // 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' );