Fixes admin notices not thrown in compat checker. (#3)

woocommerce · Aug 25, 2023 · 23df5f1 · 23df5f1
1 parent e7bc3c8
commit 23df5f1
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/packages/php/compat-checker/src/Checks/CompatCheck.php b/packages/php/compat-checker/src/Checks/CompatCheck.php
@@ -146,13 +146,6 @@ protected function set_plugin_data( $plugin_data ) {
 	public function is_compatible( $plugin_data ) {
 		$this->set_plugin_data( $plugin_data );
 		add_action( 'admin_notices', array( $this, 'display_admin_notices' ), 20 );
-		try {
-			$this->run_checks();
-			$is_compatible = true;
-		} catch ( IncompatibleException $e ) {
-			$is_compatible = false;
-		}
-
-		return $is_compatible;
+		return $this->run_checks();
 	}
 }
diff --git a/packages/php/compat-checker/src/Checks/WCCompatibility.php b/packages/php/compat-checker/src/Checks/WCCompatibility.php
@@ -377,8 +377,13 @@ public function make_upgrade_recommendation() {
 	 * Run all compatibility checks.
 	 */
 	protected function run_checks() {
-		$this->check_wc_installation_and_activation();
-		$this->check_wc_version();
-		$this->check_wc_upgrade_recommendation();
+		try {
+			$this->check_wc_installation_and_activation();
+			$this->check_wc_version();
+			$this->check_wc_upgrade_recommendation();
+			return true;
+		} catch ( IncompatibleException $e ) {
+			return false;
+		}
 	}
 }
diff --git a/packages/php/compat-checker/src/Checks/WPCompatibility.php b/packages/php/compat-checker/src/Checks/WPCompatibility.php
@@ -54,5 +54,6 @@ public function wp_not_tested() {
 	 */
 	protected function run_checks() {
 		$this->check_wp_version();
+        return true;
 	}
 }