Merge pull request #155 from woocommerce/release/4.6.3

Release/4.6.3

changelog.txt

@@ -1,5 +1,17 @@
 *** WooCommerce Square Changelog ***
 
+= 4.6.3 - 2024-06-17 =
+* Add - ESLint GitHub Action workflow to enforce ESLint rules on pull requests.
+* Dev - Bump Square PHP SDK version from `29.0.0.20230720` to `35.1.0.20240320`.
+* Dev - Improved codebase by addressing PHPCS errors.
+* Dev - Improved codebase by resolving issues reported by ESLint.
+* Dev - Address QIT PHPStan test errors.
+* Dev - Address QIT Security test errors.
+* Fix - A fatal error could occur when running incompatible versions of WooCommerce.
+* Fix - Apple Pay button is now available on Cart and Checkout Block pages.
+* Fix - Ensure that the 'Sync stock from Square' and 'Sync inventory' links work properly on the edit product screen.
+* Fix - Prevent cancelled Digital Wallet payments from blocking the Checkout form.
+
 = 4.6.2 - 2024-05-23 =
 * Dev - Bump WooCommerce "tested up to" version 8.9.
 * Dev - Bump WooCommerce minimum supported version to 8.7.

includes/Framework/Api/Base.php

@@ -601,18 +601,17 @@ abstract protected function get_plugin();
 	/**
 	 * Set the Content-Type request header
 	 *
-	 * @since x.x.x
+	 * @since 4.6.3
 	 * @param string $content_type The request content type.
 	 */
 	protected function set_request_content_type_header( $content_type ) {
 		$this->request_headers['content-type'] = $content_type;
 	}
 
-
 	/**
 	 * Set the Accept request header
 	 *
-	 * @since x.x.x
+	 * @since 4.6.3
 	 * @param string $type The request accept type.
 	 */
 	protected function set_request_accept_header( $type ) {

includes/Utilities/Helper.php

@@ -34,7 +34,7 @@ public static function number_format( $number ) {
 	 * @return string value from $_POST or blank string if $_POST[ $key ] is not set
 	 */
 	public static function get_post( $key ) {
-		wc_deprecated_function( __METHOD__, 'x.x.x', 'Square_Helper::get_post' );
+		wc_deprecated_function( __METHOD__, '4.6.3', 'Square_Helper::get_post' );
 
 		// phpcs:ignore WordPress.Security.NonceVerification.Missing -- Nonce verification is not required here as this is a helper function
 		if ( isset( $_POST[ $key ] ) ) {

package.json

@@ -7,7 +7,7 @@
     "url": "git://github.com/woocommerce/woocommerce-square.git"
   },
   "title": "WooCommerce Square",
-  "version": "4.6.2",
+  "version": "4.6.3",
   "homepage": "https://woocommerce.com/products/woocommerce-square/",
   "main": "Gruntfile.js",
   "scripts": {
@@ -33,10 +33,10 @@
   "devDependencies": {
     "@babel/core": "^7.12.10",
     "@babel/preset-env": "^7.12.11",
-    "@playwright/test": "^1.39.0",
+    "@playwright/test": "^1.44.1",
     "@woocommerce/dependency-extraction-webpack-plugin": "^1.4.0",
     "@woocommerce/eslint-plugin": "^2.2.0",
-    "@wordpress/env": "^8.1.0",
+    "@wordpress/env": "^10.0.0",
     "@wordpress/scripts": "^27.9.0",
     "config": "^1.24.0",
     "cross-env": "^3.0.0",

readme.txt

@@ -4,7 +4,7 @@ Tags: credit card, square, woocommerce, inventory sync
 Requires at least: 6.3
 Tested up to: 6.5
 Requires PHP: 7.4
-Stable tag: 4.6.2
+Stable tag: 4.6.3
 License: GPL-3.0-or-later
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
 
@@ -72,6 +72,18 @@ If you get stuck, you can ask for help in the [Plugin Forum](https://wordpress.o
 
 == Changelog ==
 
+= 4.6.3 - 2024-06-17 =
+* Add - ESLint GitHub Action workflow to enforce ESLint rules on pull requests.
+* Dev - Bump Square PHP SDK version from `29.0.0.20230720` to `35.1.0.20240320`.
+* Dev - Improved codebase by addressing PHPCS errors.
+* Dev - Improved codebase by resolving issues reported by ESLint.
+* Dev - Address QIT PHPStan test errors.
+* Dev - Address QIT Security test errors.
+* Fix - A fatal error could occur when running incompatible versions of WooCommerce.
+* Fix - Apple Pay button is now available on Cart and Checkout Block pages.
+* Fix - Ensure that the 'Sync stock from Square' and 'Sync inventory' links work properly on the edit product screen.
+* Fix - Prevent cancelled Digital Wallet payments from blocking the Checkout form.
+
 = 4.6.2 - 2024-05-23 =
 * Dev - Bump WooCommerce "tested up to" version 8.9.
 * Dev - Bump WooCommerce minimum supported version to 8.7.

tests/e2e/utils/helper.js

@@ -441,9 +441,10 @@ export async function selectPaymentMethod(
 				`label[for="radio-control-wc-payment-method-options-${paymentMethod}"]`
 			)
 			.click();
-		await expect(
-			page.locator('.wc-block-components-loading-mask')
-		).not.toBeVisible();
+		await page
+			.locator('.wc-block-components-loading-mask')
+			.first()
+			.waitFor({ state: 'detached' });
 		return;
 	}
 	// Wait for overlay to disappear

woocommerce-square.php

@@ -2,7 +2,7 @@
 /**
  * Plugin Name: WooCommerce Square
  * Requires Plugins: woocommerce
- * Version: 4.6.2
+ * Version: 4.6.3
  * Plugin URI: https://woocommerce.com/products/square/
  * Requires at least: 6.3
  * Tested up to: 6.5
@@ -29,7 +29,7 @@
 defined( 'ABSPATH' ) || exit;
 
 if ( ! defined( 'WC_SQUARE_PLUGIN_VERSION' ) ) {
-	define( 'WC_SQUARE_PLUGIN_VERSION', '4.6.2' ); // WRCS: DEFINED_VERSION.
+	define( 'WC_SQUARE_PLUGIN_VERSION', '4.6.3' ); // WRCS: DEFINED_VERSION.
 }
 
 if ( ! defined( 'WC_SQUARE_PLUGIN_URL' ) ) {
@@ -184,10 +184,10 @@ protected function get_framework_version() {
 	 * Adds notices for out-of-date WordPress and/or WooCommerce versions.
 	 *
 	 * @since 2.0.0
-	 * @deprecated x.x.x Use \WooCommerce_Square_Loader::is_environment_compatible() instead.
+	 * @deprecated 4.6.3 Use \WooCommerce_Square_Loader::is_environment_compatible() instead.
 	 */
 	public function add_plugin_notices() {
-		_deprecated_function( __METHOD__, 'x.x.x', '\WooCommerce_Square_Loader::is_environment_compatible()' );
+		_deprecated_function( __METHOD__, '4.6.3', '\WooCommerce_Square_Loader::is_environment_compatible()' );
 		$this->is_environment_compatible();
 	}
 
@@ -196,12 +196,12 @@ public function add_plugin_notices() {
 	 * Determines if the required plugins are compatible.
 	 *
 	 * @since 2.0.0
-	 * @deprecated x.x.x Use \WooCommerce_Square_Loader::is_environment_compatible() instead.
+	 * @deprecated 4.6.3 Use \WooCommerce_Square_Loader::is_environment_compatible() instead.
 	 *
 	 * @return bool
 	 */
 	protected function plugins_compatible() {
-		_deprecated_function( __METHOD__, 'x.x.x', '\WooCommerce_Square_Loader::is_environment_compatible()' );
+		_deprecated_function( __METHOD__, '4.6.3', '\WooCommerce_Square_Loader::is_environment_compatible()' );
 		return $this->is_environment_compatible();
 	}
 
@@ -399,7 +399,7 @@ public function is_environment_compatible() {
 	 * ensuring that specific download links match the tagged version and include
 	 * three parts in the version number.
 	 *
-	 * @since x.x.x
+	 * @since 4.6.3
 	 *
 	 * @param string|int|float $version The version of WooCommerce to get the download link for.
 	 *                                  Accepts a version number in the forms of 'x', 'x.x' or 'x.x.x'.