Merge branch 'trunk' into 587-check-dont-force-set-php-limits-globally

includes/Admin/Admin_AJAX.php

@@ -145,6 +145,9 @@ public function set_up_environment() {
 	 * Handles the AJAX request to cleanup the runtime environment.
 	 *
 	 * @since 1.0.0
+	 *
+	 * @global wpdb   $wpdb         WordPress database abstraction object.
+	 * @global string $table_prefix The database table prefix.
 	 */
 	public function clean_up_environment() {
 		global $wpdb, $table_prefix;

includes/Checker/Abstract_Check_Runner.php

@@ -319,6 +319,9 @@ final public function prepare() {
 	 *
 	 * @since 1.0.0
 	 *
+	 * @global wpdb   $wpdb         WordPress database abstraction object.
+	 * @global string $table_prefix The database table prefix.
+	 *
 	 * @return Check_Result An object containing all check results.
 	 */
 	final public function run() {
@@ -416,14 +419,11 @@ private function get_shared_preparations( array $checks ) {
 	 * @throws Exception Thrown when invalid flag is passed, or Check slug does not exist.
 	 */
 	final public function get_checks_to_run() {
-		// Include file to use is_plugin_active() in CLI context.
-		require_once ABSPATH . 'wp-admin/includes/plugin.php';
-
 		$check_slugs = $this->get_check_slugs();
 		$check_flags = Check_Repository::TYPE_STATIC;
 
 		// Check if conditions are met in order to perform Runtime Checks.
-		if ( ( $this->initialized_early || $this->runtime_environment->can_set_up() ) && is_plugin_active( $this->get_plugin_basename() ) ) {
+		if ( $this->allow_runtime_checks() ) {
 			$check_flags = Check_Repository::TYPE_ALL;
 		}
 
@@ -448,6 +448,21 @@ final public function get_checks_to_run() {
 		return $collection->to_map();
 	}
 
+	/**
+	 * Checks whether the current environment allows for runtime checks to be used.
+	 *
+	 * @since n.e.x.t
+	 *
+	 * @return bool True if runtime checks are allowed, false otherwise.
+	 */
+	protected function allow_runtime_checks(): bool {
+		// Ensure that is_plugin_active() is available.
+		require_once ABSPATH . 'wp-admin/includes/plugin.php';
+
+		return ( $this->initialized_early || $this->runtime_environment->can_set_up() )
+			&& is_plugin_active( $this->get_plugin_basename() );
+	}
+
 	/**
 	 * Creates and returns the Check instance.
 	 *

includes/Checker/CLI_Runner.php

@@ -154,4 +154,23 @@ protected function get_categories_param() {
 
 		return $categories;
 	}
+
+	/**
+	 * Checks whether the current environment allows for runtime checks to be used.
+	 *
+	 * @since n.e.x.t
+	 *
+	 * @return bool True if runtime checks are allowed, false otherwise.
+	 */
+	protected function allow_runtime_checks(): bool {
+		/*
+		 * For WP-CLI, everything happens in one request. So if the runner was not initialized early, we won't be
+		 * able to set that up, since the object-cache.php drop-in would only become effective in subsequent requests.
+		 */
+		if ( ! $this->initialized_early ) {
+			return false;
+		}
+
+		return parent::allow_runtime_checks();
+	}
 }

includes/Checker/Runtime_Environment_Setup.php

@@ -18,6 +18,10 @@ final class Runtime_Environment_Setup {
 	 * Sets up the WordPress environment for runtime checks
 	 *
 	 * @since 1.0.0
+	 *
+	 * @global wpdb               $wpdb          WordPress database abstraction object.
+	 * @global string             $table_prefix  The database table prefix.
+	 * @global WP_Filesystem_Base $wp_filesystem WordPress filesystem subclass.
 	 */
 	public function set_up() {
 		global $wpdb, $table_prefix, $wp_filesystem;

includes/Utilities/Plugin_Request_Utility.php

@@ -187,6 +187,8 @@ public static function get_files_to_ignore() {
 	 *
 	 * @since 1.1.0
 	 *
+	 * @global WP_Filesystem_Base $wp_filesystem WordPress filesystem subclass.
+	 *
 	 * @param string $plugin_url The URL of the plugin to download.
 	 * @return string The plugin basename after downloading and installing the plugin.
 	 *