Merge pull request #346 from Ultimate-Multisite/reg

Enhancements

Author: superdav42

.github/workflows/tests.yml

@@ -71,6 +71,7 @@ jobs:
         run: |
           rm -rf /tmp/wordpress-tests-lib /tmp/wordpress/
           bash bin/install-wp-tests.sh wordpress_test root root mysql latest
+          ln -s "$GITHUB_WORKSPACE" /tmp/wordpress/wp-content/plugins/ultimate-multisite
 
       - name: Run PHPUnit Tests
         if: matrix.php-version != '8.3'

.phpcs.xml.dist

@@ -9,6 +9,11 @@
 	<exclude-pattern>/dependencies/</exclude-pattern>
 	<exclude-pattern>/../wordpress/</exclude-pattern>
 
+	<!-- Test files use PHPUnit naming conventions (PascalCase), not WordPress file naming. -->
+	<rule ref="WordPress.Files.FileName">
+		<exclude-pattern>/tests/</exclude-pattern>
+	</rule>
+
 	<!-- How to scan -->
 	<!-- Usage instructions: https://github.com/squizlabs/PHP_CodeSniffer/wiki/Usage -->
 	<!-- Annotated ruleset: https://github.com/squizlabs/PHP_CodeSniffer/wiki/Annotated-ruleset.xml -->

.wiki/how-can-i-cancel-my-subscription.md

@@ -786,6 +786,13 @@
 
 					} // end if;
 
+					// If the strength meter element doesn't exist, skip validation
+					if (! jQuery('#pass-strength-result').length) {
+
+						return;
+
+					} // end if;
+
 					// Use the shared WU_PasswordStrength utility
 					if (typeof window.WU_PasswordStrength !== 'undefined') {
 

assets/js/checkout.js

@@ -10,7 +10,7 @@
 			mounted: function() {
 				var that = this;
 				this.loading = true;
-				
+
 				setTimeout(() => {
 					$.ajax({
 						url: ajaxurl,
@@ -20,14 +20,18 @@
 							integration: wu_integration_test_data.integration_id,
 						},
 						success: function(response) {
-							console.log(response);
 							that.loading = false;
 							that.success = response.success;
 							that.results = response.data;
+						},
+						error: function() {
+							that.loading = false;
+							that.success = false;
+							that.results = wu_integration_test_data.error_message || 'Connection test failed. Please try again.';
 						}
 					});
 				}, 1000);
 			},
 		});
 	});
-})(jQuery);
+})(jQuery);

assets/js/checkout.min.js

@@ -161,6 +161,9 @@
             ],
             "jasny/sso": [
                 "patches/jasny-sso-src-broker-cookies-php.patch"
+            ],
+            "mpdf/psr-log-aware-trait": [
+                "patches/mpdf-psr-log-aware-trait-void-return.patch"
             ]
         },
         "installer-paths": {

assets/js/integration-test.js

@@ -1159,10 +1159,10 @@ public function has_title(): bool {
 	/**
 	 * Should implement the processes necessary to save the changes made to the object.
 	 *
-	 * @return void
+	 * @return bool
 	 * @since 2.0.0
 	 */
-	public function handle_save(): void {
+	public function handle_save(): bool {
 
 		// Nonce handled in calling method.
         // phpcs:disable WordPress.Security.NonceVerification
@@ -1199,7 +1199,7 @@ public function handle_save(): void {
 
 			WP_Ultimo()->notices->add($errors, 'error', 'network-admin');
 
-			return;
+			return false;
 		}
 
 		$object->set_billing_address($billing_address);
@@ -1245,7 +1245,7 @@ public function handle_save(): void {
 		unset($_POST['new_meta_fields']);
 		// phpcs:enable
 
-		parent::handle_save();
+		return parent::handle_save();
 	}
 
 	/**