Merge release/7.9.1 into trunk

Automattic · Jul 11, 2024 · eb30b17 · eb30b17
2 parents 1d4ccd4 + baa5727
commit eb30b17
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 6 deletions.
diff --git a/changelog.txt b/changelog.txt
@@ -1,5 +1,8 @@
 *** WooPayments Changelog ***
 
+= 7.9.1 - 2024-07-11 =
+* Fix - Fix Documents API regex to allow documents with dashes in name to be viewed.
+
 = 7.9.0 - 2024-07-10 =
 * Add - Add a separate transient to save UPE appearance styles for the Add Payment Method standalone page. Correct regression that prevented proper styles calculation in the shortcode checkout.
 * Add - Add Pay for Order support in Express Checkout Elements.

diff --git a/includes/wc-payment-api/class-wc-payments-api-client.php b/includes/wc-payment-api/class-wc-payments-api-client.php
@@ -1795,7 +1795,7 @@ public function get_documents_summary( array $filters = [] ) {
 	 * @throws API_Exception - If not connected or request failed.
 	 */
 	public function get_document( $document_id ) {
-		if ( ! preg_match( '/^\w+$/', $document_id ) ) {
+		if ( ! preg_match( '/^[\w-]+$/', $document_id ) ) {
 			throw new API_Exception(
 				__( 'Route param validation failed.', 'woocommerce-payments' ),
 				'wcpay_route_validation_failure',

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "woocommerce-payments",
-  "version": "7.9.0",
+  "version": "7.9.1",
   "main": "webpack.config.js",
   "author": "Automattic",
   "license": "GPL-3.0-or-later",

diff --git a/readme.txt b/readme.txt
@@ -4,7 +4,7 @@ Tags: woocommerce payments, apple pay, credit card, google pay, payment, payment
 Requires at least: 6.0
 Tested up to: 6.5
 Requires PHP: 7.3
-Stable tag: 7.9.0
+Stable tag: 7.9.1
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -94,6 +94,10 @@ Please note that our support for the checkout block is still experimental and th
 
 == Changelog ==
 
+= 7.9.1 - 2024-07-11 =
+* Fix - Fix Documents API regex to allow documents with dashes in name to be viewed.
+
+
 = 7.9.0 - 2024-07-10 =
 * Add - Add a separate transient to save UPE appearance styles for the Add Payment Method standalone page. Correct regression that prevented proper styles calculation in the shortcode checkout.
 * Add - Add Pay for Order support in Express Checkout Elements.

diff --git a/woocommerce-payments.php b/woocommerce-payments.php
@@ -11,7 +11,7 @@
  * WC tested up to: 8.9.3
  * Requires at least: 6.0
  * Requires PHP: 7.3
- * Version: 7.9.0
+ * Version: 7.9.1
  * Requires Plugins: woocommerce
  *
  * @package WooCommerce\Payments