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

Author: Paul Dechov

.github/workflows/compatibility.yml

@@ -1,35 +1,47 @@
-name: Compatibility (WC, WP, PHP)
+name: PHP tests
 
 on:
   pull_request
 
 jobs:
-  # a dedicated job, as allowed to fail
-  compatibility-woocommerce-beta:
-    name:    Beta
+  beta-compatibility:
     runs-on: ubuntu-18.04
     strategy:
       fail-fast: false
       matrix:
         woocommerce: [ 'beta' ]
         wordpress:   [ 'latest' ]
-        php:         [ '7.1', '8.0' ]
+        php:         [ '7.0', '7.4', '8.0' ]
+          
+    
+    name: Beta (PHP=${{ matrix.php }}, WP=${{ matrix.wordpress }}, WC=${{ matrix.woocommerce }})
     env:
-      WP_VERSION: ${{ matrix.wordpress }}
-      WC_VERSION: ${{ matrix.woocommerce }}
+      PHP_VERSION: ${{ matrix.php }}
+      WP_VERSION:  ${{ matrix.wordpress }}
+      WC_VERSION:  ${{ matrix.woocommerce }}
     steps:
-      # clone the repository
-      - uses: actions/checkout@v2
-      # enable dependencies caching
-      - uses: actions/cache@v2
+      - name: Testing with PHP=${{ matrix.php }}, WP=${{ matrix.wordpress }}, WC=${{ matrix.woocommerce }}
+        uses: actions/checkout@v2
+
+      - name: Set up dependencies caching
+        uses: actions/cache@v2
         with:
           path: ~/.cache/composer/
           key:  ${{ runner.os }}-composer-${{ hashFiles('composer.lock') }}
-      # setup PHP, but without debug extensions for reasonable performance
-      - uses: shivammathur/setup-php@v2
+
+      - name: Set up PHP
+        uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
-          tools:       composer
           coverage:    none
-      # run CI checks
-      - run: bash bin/run-ci-tests.bash
+          
+      - name: If PHP 7.0, set up PHPUnit 6.5 for legacy compatibility
+        if: ${{ matrix.php == '7.0' }}
+        run: wget https://phar.phpunit.de/phpunit-6.5.14.phar && mv phpunit-6.5.14.phar phpunit.phar
+
+      - name: If PHP 8.0, set up PHPUnit 9.5 for compatibility
+        if: ${{ matrix.php == '8.0' }}
+        run: wget https://phar.phpunit.de/phpunit-9.5.13.phar && mv phpunit-9.5.13.phar phpunit.phar
+
+      - name: Run CI checks
+        run: bash bin/run-ci-tests.bash

.github/workflows/php-tests.yml

@@ -16,18 +16,18 @@ jobs:
         include:
           # WooCommerce
           - woocommerce_support_policy: L
-            woocommerce: 'latest'
+            woocommerce: '6.2.0'
           - woocommerce_support_policy: L-1
-            woocommerce: '5.8.0'
+            woocommerce: '6.1.0'
           - woocommerce_support_policy: L-2
-            woocommerce: '5.7.1'
+            woocommerce: '6.0.0'
           # WordPress
           - wordpress_support_policy: L
-            wordpress: 'latest'
+            wordpress: '5.9'
           - wordpress_support_policy: L-1
-            wordpress: '5.7'
+            wordpress: '5.8'
           - wordpress_support_policy: L-2
-            wordpress: '5.6'
+            wordpress: '5.7'
           # PHP
           - php_support_policy: L
             php: '8.0'
@@ -61,5 +61,9 @@ jobs:
         if: ${{ matrix.php == '7.0' }}
         run: wget https://phar.phpunit.de/phpunit-6.5.14.phar && mv phpunit-6.5.14.phar phpunit.phar
 
+      - name: If PHP 8.0 and WP 5.9, set up PHPUnit 9.5 for compatibility
+        if: ${{ matrix.php == '8.0' && matrix.wordpress >= '5.9' }}
+        run: wget https://phar.phpunit.de/phpunit-9.5.13.phar && mv phpunit-9.5.13.phar phpunit.phar
+
       - name: Run CI checks
         run: bash bin/run-ci-tests.bash

changelog.txt

@@ -1,5 +1,10 @@
 *** Changelog ***
 
+= 6.3.0 - 2022-03-10 =
+* Tweak - Remove html from translatable strings.
+* Tweak - Revert the deprecation of the 'wc_stripe_hide_payment_request_on_product_page', 'wc_stripe_show_payment_request_on_checkout', and 'wc_stripe_show_payment_request_on_cart' filters.
+* Tweak - Address minor styling issues in settings.
+
 = 6.2.0 - 2022-02-17 =
 * Add - Add onboarding payment gateway setup methods.
 * Fix - Enable Stripe payment method after connecting account.

client/components/confirmation-modal/style.scss

@@ -24,7 +24,6 @@
 	}
 
 	.components-modal__header {
-		margin: 0 -#{$grid-unit-30} $grid-unit-30;
 		padding: 0 $grid-unit-30;
 		@media ( max-width: 599px ) {
 			button {

client/settings/account-details/index.js

@@ -82,17 +82,17 @@ const WebhooksSection = () => {
 			</div>
 			<div className="account-details__desc">
 				<WebhookInformation />
-				<br />
-				<br />
-				{ message }{ ' ' }
-				<Button
-					disabled={ requestStatus === 'pending' }
-					onClick={ refreshMessage }
-					isBusy={ requestStatus === 'pending' }
-					isLink
-				>
-					{ __( 'Refresh', 'woocommerce-gateway-stripe' ) }
-				</Button>
+				<p>
+					{ message }{ ' ' }
+					<Button
+						disabled={ requestStatus === 'pending' }
+						onClick={ refreshMessage }
+						isBusy={ requestStatus === 'pending' }
+						isLink
+					>
+						{ __( 'Refresh', 'woocommerce-gateway-stripe' ) }
+					</Button>
+				</p>
 			</div>
 		</>
 	);

client/settings/payment-settings/account-keys-modal.js

@@ -167,6 +167,7 @@ const StyledConfirmationModal = styled( ConfirmationModal )`
 		margin: 0 -24px 24px;
 	}
 	.wcstripe-inline-notice {
+		margin-top: -24px;
 		margin-bottom: 0;
 	}
 	.wcstripe-confirmation-modal__separator {

composer.json

@@ -15,7 +15,7 @@
     "require-dev": {
 				"composer/installers": "1.9.0",
 				"phpunit/phpunit": "7.5.20",
-				"yoast/phpunit-polyfills": "1.0.2",
+				"yoast/phpunit-polyfills": "^1.0",
 				"woocommerce/woocommerce-sniffs": "0.1.0",
 				"wp-cli/wp-cli-bundle": "2.5.0"
     },

composer.lock

@@ -104,9 +104,13 @@ abstract class WC_Stripe_Payment_Gateway_Voucher extends WC_Stripe_Payment_Gatew
 	 * @since 5.8.0
 	 */
 	public function __construct() {
-		/* translators: link */
-		$this->method_description = sprintf( __( 'All other general Stripe settings can be adjusted <a href="%s">here</a>.', 'woocommerce-gateway-stripe' ), admin_url( 'admin.php?page=wc-settings&tab=checkout&section=stripe' ) );
-		$this->supports           = [
+		$this->method_description = sprintf(
+		/* translators: 1) HTML anchor open tag 2) HTML anchor closing tag */
+			__( 'All other general Stripe settings can be adjusted %1$shere%2$s ', 'woocommerce-gateway-stripe' ),
+			'<a href="' . esc_url( admin_url( 'admin.php?page=wc-settings&tab=checkout&section=stripe' ) ) . '">',
+			'</a>'
+		);
+		$this->supports = [
 			'products',
 		];
 

includes/abstracts/abstract-wc-stripe-payment-gateway-voucher.php

@@ -525,7 +525,6 @@ private function update_is_upe_enabled( WP_REST_Request $request ) {
 
 		$settings = get_option( 'woocommerce_stripe_settings', [] );
 		$settings[ WC_Stripe_Feature_Flags::UPE_CHECKOUT_FEATURE_ATTRIBUTE_NAME ] = $is_upe_enabled ? 'yes' : 'disabled';
-
 		update_option( 'woocommerce_stripe_settings', $settings );
 
 		// including the class again because otherwise it's not present.