From c8292792b0746b91a0d8abdc67688a294c4b09be Mon Sep 17 00:00:00 2001
From: Mukesh Panchal <mukeshpanchal27@gmail.com>
Date: Thu, 30 Nov 2023 15:08:39 +0530
Subject: [PATCH 1/3] Update can load infrastructure

---
 admin/load.php                                |  4 +++-
 load.php                                      | 10 ++++++++--
 .../audit-autoloaded-options/can-load.php     | 19 +++++++++++++++++++
 modules/images/webp-support/can-load.php      | 19 +++++++++++++++++++
 .../audit-enqueued-assets/can-load.php        | 19 +++++++++++++++++++
 tests/admin/load-tests.php                    |  9 ++++++++-
 tests/load-tests.php                          |  7 +++++++
 .../check-error/demo-module-4/can-load.php    | 10 ++++++++++
 .../check-error/demo-module-4/load.php        | 10 ++++++++++
 9 files changed, 103 insertions(+), 4 deletions(-)
 create mode 100644 modules/database/audit-autoloaded-options/can-load.php
 create mode 100644 modules/images/webp-support/can-load.php
 create mode 100644 modules/js-and-css/audit-enqueued-assets/can-load.php
 create mode 100644 tests/testdata/demo-modules/check-error/demo-module-4/can-load.php
 create mode 100644 tests/testdata/demo-modules/check-error/demo-module-4/load.php

diff --git a/admin/load.php b/admin/load.php
index 5976df25f8..8fd6d6dafa 100644
--- a/admin/load.php
+++ b/admin/load.php
@@ -141,7 +141,7 @@ function perflab_render_modules_page_field( $module_slug, $module_data, $module_
 			<?php echo esc_html( $module_data['name'] ); ?>
 		</legend>
 		<label for="<?php echo esc_attr( "{$base_id}_enabled" ); ?>">
-			<?php if ( $can_load_module && ! $is_standalone_plugin_loaded ) { ?>
+			<?php if ( ! is_wp_error( $can_load_module ) && ! $is_standalone_plugin_loaded ) { ?>
 				<input type="checkbox" id="<?php echo esc_attr( "{$base_id}_enabled" ); ?>" name="<?php echo esc_attr( "{$base_name}[enabled]" ); ?>" aria-describedby="<?php echo esc_attr( "{$base_id}_description" ); ?>" value="1"<?php checked( $enabled ); ?>>
 				<?php
 				if ( $module_data['experimental'] ) {
@@ -167,6 +167,8 @@ function perflab_render_modules_page_field( $module_slug, $module_data, $module_
 				<?php
 				if ( $is_standalone_plugin_loaded ) {
 					esc_html_e( 'The module cannot be managed with Performance Lab since it is already active as a standalone plugin.', 'performance-lab' );
+				} elseif ( is_wp_error( $can_load_module ) ) {
+					echo esc_html( $can_load_module->get_error_message() );
 				} else {
 					printf(
 						/* translators: %s: module name */
diff --git a/load.php b/load.php
index 689fae9fbc..3ef5368528 100644
--- a/load.php
+++ b/load.php
@@ -197,7 +197,8 @@ function perflab_is_valid_module( $module ) {
 	}
 
 	// Do not load module if it cannot be loaded, e.g. if it was already merged and is available in WordPress core.
-	return perflab_can_load_module( $module );
+	$can_load_module = perflab_can_load_module( $module );
+	return is_wp_error( $can_load_module ) ? false : $can_load_module;
 }
 
 /**
@@ -237,7 +238,7 @@ function perflab_render_generator() {
  * @since 1.3.0
  *
  * @param string $module Slug of the module.
- * @return bool Whether the module can be loaded or not.
+ * @return bool|WP_Error True or false based on whether the module can be loaded or not, or an error on failure.
  */
 function perflab_can_load_module( $module ) {
 	$module_load_file = PERFLAB_PLUGIN_DIR_PATH . 'modules/' . $module . '/can-load.php';
@@ -255,6 +256,11 @@ function perflab_can_load_module( $module ) {
 		return true;
 	}
 
+	// Check if can load return an error.
+	if ( is_wp_error( $module() ) ) {
+		return $module();
+	}
+
 	// Call the closure to determine whether the module can be loaded.
 	return (bool) $module();
 }
diff --git a/modules/database/audit-autoloaded-options/can-load.php b/modules/database/audit-autoloaded-options/can-load.php
new file mode 100644
index 0000000000..82697eae37
--- /dev/null
+++ b/modules/database/audit-autoloaded-options/can-load.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Can load function to determine if Site Health module is supported or not.
+ *
+ * @since   n.e.x.t
+ * @package performance-lab
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly.
+}
+
+return static function () {
+	if ( ! has_filter( 'user_has_cap', 'wp_maybe_grant_site_health_caps' ) ) {
+		return new WP_Error( 'module_not_loaded', esc_html__( 'The module cannot be loaded with Performance Lab since it is disabled.', 'performance-lab' ) );
+	} else {
+		return true;
+	}
+};
diff --git a/modules/images/webp-support/can-load.php b/modules/images/webp-support/can-load.php
new file mode 100644
index 0000000000..82697eae37
--- /dev/null
+++ b/modules/images/webp-support/can-load.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Can load function to determine if Site Health module is supported or not.
+ *
+ * @since   n.e.x.t
+ * @package performance-lab
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly.
+}
+
+return static function () {
+	if ( ! has_filter( 'user_has_cap', 'wp_maybe_grant_site_health_caps' ) ) {
+		return new WP_Error( 'module_not_loaded', esc_html__( 'The module cannot be loaded with Performance Lab since it is disabled.', 'performance-lab' ) );
+	} else {
+		return true;
+	}
+};
diff --git a/modules/js-and-css/audit-enqueued-assets/can-load.php b/modules/js-and-css/audit-enqueued-assets/can-load.php
new file mode 100644
index 0000000000..82697eae37
--- /dev/null
+++ b/modules/js-and-css/audit-enqueued-assets/can-load.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Can load function to determine if Site Health module is supported or not.
+ *
+ * @since   n.e.x.t
+ * @package performance-lab
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly.
+}
+
+return static function () {
+	if ( ! has_filter( 'user_has_cap', 'wp_maybe_grant_site_health_caps' ) ) {
+		return new WP_Error( 'module_not_loaded', esc_html__( 'The module cannot be loaded with Performance Lab since it is disabled.', 'performance-lab' ) );
+	} else {
+		return true;
+	}
+};
diff --git a/tests/admin/load-tests.php b/tests/admin/load-tests.php
index 9e39ad44e3..642ab4aa05 100644
--- a/tests/admin/load-tests.php
+++ b/tests/admin/load-tests.php
@@ -32,6 +32,13 @@ class Admin_Load_Tests extends WP_UnitTestCase {
 			'focus'        => 'images',
 			'slug'         => 'demo-module-3',
 		),
+		'check-error/demo-module-4' => array(
+			'name'         => 'Demo Module 4',
+			'description'  => 'This is the description for demo module 4.',
+			'experimental' => false,
+			'focus'        => 'check-error',
+			'slug'         => 'demo-module-4',
+		),
 	);
 
 	private static $demo_focus_areas = array(
@@ -157,7 +164,7 @@ public function test_perflab_load_modules_page() {
 			array_keys( $wp_settings_fields[ PERFLAB_MODULES_SCREEN ]['js-and-css'] )
 		);
 		$this->assertEqualSets(
-			array( 'something/demo-module-2' ),
+			array( 'something/demo-module-2', 'check-error/demo-module-4' ),
 			array_keys( $wp_settings_fields[ PERFLAB_MODULES_SCREEN ]['other'] )
 		);
 	}
diff --git a/tests/load-tests.php b/tests/load-tests.php
index 5f2ceedc5c..cef93d6431 100644
--- a/tests/load-tests.php
+++ b/tests/load-tests.php
@@ -196,6 +196,7 @@ public function data_perflab_is_valid_module() {
 			array( '../tests/testdata/demo-modules/js-and-css/demo-module-1', false ),
 			array( '../tests/testdata/demo-modules/something/demo-module-2', true ),
 			array( '../tests/testdata/demo-modules/images/demo-module-3', true ),
+			array( '../tests/testdata/demo-modules/check-error/demo-module-4', false ),
 		);
 	}
 
@@ -214,6 +215,12 @@ public function data_perflab_can_load_module() {
 		);
 	}
 
+	public function test_perflab_can_load_module_with_not_loaded_module() {
+		$can_load_module = perflab_can_load_module( '../tests/testdata/demo-modules/check-error/demo-module-4' );
+		$this->assertInstanceOf( 'WP_Error', $can_load_module );
+		$this->assertSame( 'module_not_loaded', $can_load_module->get_error_code() );
+	}
+
 	public function test_perflab_activate_module() {
 		perflab_activate_module( __DIR__ . '/testdata/demo-modules/something/demo-module-2' );
 		$this->assertSame( 'activated', get_option( 'test_demo_module_activation_status' ) );
diff --git a/tests/testdata/demo-modules/check-error/demo-module-4/can-load.php b/tests/testdata/demo-modules/check-error/demo-module-4/can-load.php
new file mode 100644
index 0000000000..c5a80c4088
--- /dev/null
+++ b/tests/testdata/demo-modules/check-error/demo-module-4/can-load.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Can load function to determine if Site Health module is supported or not.
+ *
+ * @package performance-lab
+ */
+
+return static function () {
+    return new WP_Error( 'module_not_loaded', esc_html__( 'The module cannot be loaded with Performance Lab since it is disabled.', 'performance-lab' ) );
+};
diff --git a/tests/testdata/demo-modules/check-error/demo-module-4/load.php b/tests/testdata/demo-modules/check-error/demo-module-4/load.php
new file mode 100644
index 0000000000..7faf0b7fec
--- /dev/null
+++ b/tests/testdata/demo-modules/check-error/demo-module-4/load.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Module Name: Demo Module 4
+ * Description: This is the description for demo module 4.
+ * Experimental: No
+ *
+ * @package performance-lab
+ */
+
+// This is a demo module and does nothing.

From 493a28fb3ec2bfb8929d35e38f5974d83f7dde3b Mon Sep 17 00:00:00 2001
From: Mukesh Panchal <mukeshpanchal27@users.noreply.github.com>
Date: Thu, 30 Nov 2023 20:08:10 +0530
Subject: [PATCH 2/3] Apply suggestions from code review

Co-authored-by: Pascal Birchler <pascalb@google.com>
---
 admin/load.php |  2 +-
 load.php       | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/admin/load.php b/admin/load.php
index 8fd6d6dafa..36bf0ade8b 100644
--- a/admin/load.php
+++ b/admin/load.php
@@ -141,7 +141,7 @@ function perflab_render_modules_page_field( $module_slug, $module_data, $module_
 			<?php echo esc_html( $module_data['name'] ); ?>
 		</legend>
 		<label for="<?php echo esc_attr( "{$base_id}_enabled" ); ?>">
-			<?php if ( ! is_wp_error( $can_load_module ) && ! $is_standalone_plugin_loaded ) { ?>
+			<?php if ( $can_load_module && ! is_wp_error( $can_load_module ) && ! $is_standalone_plugin_loaded ) { ?>
 				<input type="checkbox" id="<?php echo esc_attr( "{$base_id}_enabled" ); ?>" name="<?php echo esc_attr( "{$base_name}[enabled]" ); ?>" aria-describedby="<?php echo esc_attr( "{$base_id}_description" ); ?>" value="1"<?php checked( $enabled ); ?>>
 				<?php
 				if ( $module_data['experimental'] ) {
diff --git a/load.php b/load.php
index 3ef5368528..77cc4710f4 100644
--- a/load.php
+++ b/load.php
@@ -198,7 +198,7 @@ function perflab_is_valid_module( $module ) {
 
 	// Do not load module if it cannot be loaded, e.g. if it was already merged and is available in WordPress core.
 	$can_load_module = perflab_can_load_module( $module );
-	return is_wp_error( $can_load_module ) ? false : $can_load_module;
+	return $can_load_module && ! is_wp_error( $can_load_module );
 }
 
 /**
@@ -256,13 +256,14 @@ function perflab_can_load_module( $module ) {
 		return true;
 	}
 
-	// Check if can load return an error.
-	if ( is_wp_error( $module() ) ) {
-		return $module();
+	// Call the closure to determine whether the module can be loaded.
+	$result = $module();
+
+	if ( is_wp_error( $result ) ) {
+		return $result;
 	}
 
-	// Call the closure to determine whether the module can be loaded.
-	return (bool) $module();
+	return (bool) $result;
 }
 
 /**

From 9c05a55cdc0b9c7d6e2cf77fb64da5bda5ef3006 Mon Sep 17 00:00:00 2001
From: Mukesh Panchal <mukeshpanchal27@users.noreply.github.com>
Date: Fri, 1 Dec 2023 09:43:24 +0530
Subject: [PATCH 3/3] Apply suggestions from code review

Co-authored-by: Felix Arntz <felixarntz@users.noreply.github.com>
---
 load.php                                                       | 3 ++-
 modules/database/audit-autoloaded-options/can-load.php         | 2 +-
 modules/images/webp-support/can-load.php                       | 2 +-
 modules/js-and-css/audit-enqueued-assets/can-load.php          | 2 +-
 tests/load-tests.php                                           | 2 +-
 .../demo-modules/check-error/demo-module-4/can-load.php        | 2 +-
 6 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/load.php b/load.php
index 77cc4710f4..b9fd658c82 100644
--- a/load.php
+++ b/load.php
@@ -236,9 +236,10 @@ function perflab_render_generator() {
  * Checks whether the given module can be loaded in the current environment.
  *
  * @since 1.3.0
+ * @since n.e.x.t The function may now alternatively return a WP_Error.
  *
  * @param string $module Slug of the module.
- * @return bool|WP_Error True or false based on whether the module can be loaded or not, or an error on failure.
+ * @return bool|WP_Error True if the module can be loaded, or false or a WP_Error with more concrete information otherwise.
  */
 function perflab_can_load_module( $module ) {
 	$module_load_file = PERFLAB_PLUGIN_DIR_PATH . 'modules/' . $module . '/can-load.php';
diff --git a/modules/database/audit-autoloaded-options/can-load.php b/modules/database/audit-autoloaded-options/can-load.php
index 82697eae37..230f62cbe5 100644
--- a/modules/database/audit-autoloaded-options/can-load.php
+++ b/modules/database/audit-autoloaded-options/can-load.php
@@ -12,7 +12,7 @@
 
 return static function () {
 	if ( ! has_filter( 'user_has_cap', 'wp_maybe_grant_site_health_caps' ) ) {
-		return new WP_Error( 'module_not_loaded', esc_html__( 'The module cannot be loaded with Performance Lab since it is disabled.', 'performance-lab' ) );
+		return new WP_Error( 'cannot_load_module', esc_html__( 'The module cannot be loaded since the Site Health feature is disabled.', 'performance-lab' ) );
 	} else {
 		return true;
 	}
diff --git a/modules/images/webp-support/can-load.php b/modules/images/webp-support/can-load.php
index 82697eae37..230f62cbe5 100644
--- a/modules/images/webp-support/can-load.php
+++ b/modules/images/webp-support/can-load.php
@@ -12,7 +12,7 @@
 
 return static function () {
 	if ( ! has_filter( 'user_has_cap', 'wp_maybe_grant_site_health_caps' ) ) {
-		return new WP_Error( 'module_not_loaded', esc_html__( 'The module cannot be loaded with Performance Lab since it is disabled.', 'performance-lab' ) );
+		return new WP_Error( 'cannot_load_module', esc_html__( 'The module cannot be loaded since the Site Health feature is disabled.', 'performance-lab' ) );
 	} else {
 		return true;
 	}
diff --git a/modules/js-and-css/audit-enqueued-assets/can-load.php b/modules/js-and-css/audit-enqueued-assets/can-load.php
index 82697eae37..230f62cbe5 100644
--- a/modules/js-and-css/audit-enqueued-assets/can-load.php
+++ b/modules/js-and-css/audit-enqueued-assets/can-load.php
@@ -12,7 +12,7 @@
 
 return static function () {
 	if ( ! has_filter( 'user_has_cap', 'wp_maybe_grant_site_health_caps' ) ) {
-		return new WP_Error( 'module_not_loaded', esc_html__( 'The module cannot be loaded with Performance Lab since it is disabled.', 'performance-lab' ) );
+		return new WP_Error( 'cannot_load_module', esc_html__( 'The module cannot be loaded since the Site Health feature is disabled.', 'performance-lab' ) );
 	} else {
 		return true;
 	}
diff --git a/tests/load-tests.php b/tests/load-tests.php
index cef93d6431..779f27308e 100644
--- a/tests/load-tests.php
+++ b/tests/load-tests.php
@@ -218,7 +218,7 @@ public function data_perflab_can_load_module() {
 	public function test_perflab_can_load_module_with_not_loaded_module() {
 		$can_load_module = perflab_can_load_module( '../tests/testdata/demo-modules/check-error/demo-module-4' );
 		$this->assertInstanceOf( 'WP_Error', $can_load_module );
-		$this->assertSame( 'module_not_loaded', $can_load_module->get_error_code() );
+		$this->assertSame( 'cannot_load_module', $can_load_module->get_error_code() );
 	}
 
 	public function test_perflab_activate_module() {
diff --git a/tests/testdata/demo-modules/check-error/demo-module-4/can-load.php b/tests/testdata/demo-modules/check-error/demo-module-4/can-load.php
index c5a80c4088..fd3adb57c9 100644
--- a/tests/testdata/demo-modules/check-error/demo-module-4/can-load.php
+++ b/tests/testdata/demo-modules/check-error/demo-module-4/can-load.php
@@ -6,5 +6,5 @@
  */
 
 return static function () {
-    return new WP_Error( 'module_not_loaded', esc_html__( 'The module cannot be loaded with Performance Lab since it is disabled.', 'performance-lab' ) );
+    return new WP_Error( 'cannot_load_module', esc_html__( 'The module cannot be loaded.', 'performance-lab' ) );
 };