Enhancements

.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 -->

assets/js/checkout.js

@@ -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/integration-test.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);

composer.json

@@ -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": {

inc/admin-pages/class-checkout-form-edit-admin-page.php

@@ -1530,7 +1530,7 @@ public function handle_save() {
 		 */
 		ob_start();
 
-		parent::handle_save();
+		$result = parent::handle_save();
 
 		$object = $this->get_object();
 
@@ -1547,7 +1547,7 @@ public function handle_save() {
 		}
 
 		wp_ob_end_flush_all();
-		return true;
+		return $result;
 	}
 
 	/**

inc/admin-pages/class-customer-edit-admin-page.php

@@ -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();
 	}
 
 	/**

inc/admin-pages/class-discount-code-edit-admin-page.php

@@ -844,9 +844,9 @@ public function has_title(): bool {
 	 * Should implement the processes necessary to save the changes made to the object.
 	 *
 	 * @since 2.0.0
-	 * @return void
+	 * @return bool
 	 */
-	public function handle_save(): void {
+	public function handle_save(): bool {
 		/*
 		 * Set the recurring value to zero if the toggle is disabled.
 		 */
@@ -897,6 +897,6 @@ public function handle_save(): void {
 
 		$_POST['code'] = trim((string) wu_request('code'));
 
-		parent::handle_save();
+		return parent::handle_save();
 	}
 }

inc/admin-pages/class-domain-edit-admin-page.php

@@ -572,9 +572,9 @@ public function has_title(): bool {
 	 * Should implement the processes necessary to save the changes made to the object.
 	 *
 	 * @since 2.0.0
-	 * @return void
+	 * @return bool
 	 */
-	public function handle_save(): void {
+	public function handle_save(): bool {
 
 		// phpcs:ignore WordPress.Security.NonceVerification.Missing -- Nonce verification happens in parent::handle_save()
 		if ( ! wu_request('primary_domain')) {
@@ -593,6 +593,6 @@ public function handle_save(): void {
 
 		wu_enqueue_async_action('wu_async_process_domain_stage', ['domain_id' => $this->get_object()->get_id()], 'domain');
 
-		parent::handle_save();
+		return parent::handle_save();
 	}
 }

inc/admin-pages/class-email-edit-admin-page.php

@@ -475,17 +475,17 @@ public function query_filter($args) {
 	 * Handles the toggles.
 	 *
 	 * @since 2.0.0
-	 * @return void
+	 * @return bool
 	 */
-	public function handle_save(): void {
+	public function handle_save(): bool {
 
 		$_POST['schedule'] = wu_request('schedule');
 
 		$_POST['send_copy_to_admin'] = wu_request('send_copy_to_admin');
 
 		$_POST['custom_sender'] = wu_request('custom_sender');
 
-		parent::handle_save();
+		return parent::handle_save();
 	}
 
 	/**

inc/admin-pages/class-hosting-integration-wizard-admin-page.php

@@ -388,24 +388,6 @@ public function section_test(): void {
 
 		wp_enqueue_script('wu-vue');
 
-		wu_get_template(
-			'wizards/host-integrations/test',
-			[
-				'screen'      => get_current_screen(),
-				'page'        => $this,
-				'integration' => $this->integration,
-			]
-		);
-	}
-
-	/**
-	 * Register the script for the test page.
-	 *
-	 * @return void
-	 */
-	public function register_scripts() {
-		parent::register_scripts();
-
 		wp_enqueue_script(
 			'wu-integration-test',
 			wu_get_asset('integration-test.js', 'js'),
@@ -420,9 +402,19 @@ public function register_scripts() {
 			'wu-integration-test',
 			'var wu_integration_test_data = {
 				integration_id: "' . esc_js($this->integration->get_id()) . '",
-				waiting_message: "' . esc_js(__('Waiting for results...', 'ultimate-multisite')) . '"
+				waiting_message: "' . esc_js(__('Waiting for results...', 'ultimate-multisite')) . '",
+				error_message: "' . esc_js(__('Connection test failed. Please try again.', 'ultimate-multisite')) . '"
 			};',
 			'before'
 		);
+
+		wu_get_template(
+			'wizards/host-integrations/test',
+			[
+				'screen'      => get_current_screen(),
+				'page'        => $this,
+				'integration' => $this->integration,
+			]
+		);
 	}
 }