Merge pull request #46 from octalmage/fork

Make an Ajax call to fork the process.

Author: octalmage

src/js/run.js

@@ -102,7 +102,9 @@ function checkStatus() {
 			jQuery( '#wpe-progress' ).show();
 
 			// Display the current plugin count.
-			jQuery( '#wpe-progress-count' ).text( ( obj.total - obj.count + 1 ) + '/' + obj.total );
+			if ( obj.total ) {
+				jQuery( '#wpe-progress-count' ).text( ( obj.total - obj.count + 1 ) + '/' + obj.total );
+			}
 
 			// Display the object being scanned.
 			jQuery( '#wpe-progress-active' ).text( obj.activeJob );

src/wpephpcompat.php

@@ -188,9 +188,6 @@ public function start_test() {
 		}
 
 		if ( ! $this->is_command_line() ) {
-			// Close the connection to the browser.
-			$this->close_connection( 'started' );
-
 			/**
 			 * Kill cron after a configurable timeout.
 			 * Subtract 5 from the timeout if we can to avoid race conditions.
@@ -479,29 +476,4 @@ private function debug_log( $message ) {
 	private function is_command_line() {
 		return defined( 'WP_CLI' ) || defined( 'PHPUNIT_TEST' ) || php_sapi_name() == 'cli';
 	}
-
-	/**
-	* Close the connection to the browser but continue processing the operation.
-	* @since  1.0.0
-	* @param  string $body The message to send to the client.
-	* @return null
-	*/
-	private function close_connection( $body ) {
-		ignore_user_abort( true );
-		if ( ob_get_length() ) { ob_end_clean(); }
-		// Start buffering.
-		ob_start();
-		// Echo our response.
-		echo $body;
-		// Get the length of the buffer.
-		$size = ob_get_length();
-		// Close the connection.
-		header( 'Connection: close\r\n' );
-		header( 'Content-Encoding: none\r\n' );
-		header( 'Content-Length: $size' );
-		// Flush and close the buffer.
-		ob_end_flush();
-		// Flush the system output buffer.
-		flush();
-	}
 }

wpengine-phpcompat.php

@@ -94,16 +94,26 @@ function start_test() {
 
 			$wpephpc = new \WPEPHPCompat( __DIR__ );
 
+			foreach ( array( 'test_version', 'only_active' ) as $key ) {
+				if ( isset( $_POST[ $key ] ) ) {
+					$$key = sanitize_text_field( $_POST[ $key ] );
+				}
+			}
+
+			// New scan!
 			if ( isset( $_POST['startScan'] ) ) {
-				$test_version = sanitize_text_field( $_POST['test_version'] );
-				$only_active = sanitize_text_field( $_POST['only_active'] );
+				// Make sure we clean up after the last test.
+				$wpephpc->clean_after_scan();
 
+				// Fork so we can close the connection.
+				$this->fork_scan( $test_version, $only_active );
+			} else {
 				$wpephpc->test_version = $test_version;
 				$wpephpc->only_active = $only_active;
-				$wpephpc->clean_after_scan();
+
+				$wpephpc->start_test();
 			}
 
-			$wpephpc->start_test();
 			wp_die();
 		}
 	}
@@ -162,6 +172,40 @@ function check_status() {
 		}
 	}
 
+	/**
+	 * Make an Ajax call to start the scan in the background.
+	 *
+	 * @since 1.3.2
+	 * @param  string $test_version Version of PHP to test.
+	 * @param  string $only_active  Scan only active plugins or all?
+	 * @return null
+	 */
+	function fork_scan( $test_version, $only_active ) {
+		$query = array(
+			'action' => 'wpephpcompat_start_test',
+		);
+
+		// Keep track of these variables.
+		$body = array(
+			'test_version' => $test_version,
+			'only_active' => $only_active,
+		);
+
+		// Instantly return!
+		$args = array(
+			'timeout'   => 0.01,
+			'blocking'  => false,
+			'body'      => $body,
+			'cookies'   => $_COOKIE,
+			'sslverify' => apply_filters( 'https_local_ssl_verify', false ),
+		);
+
+		// Build our URL.
+		$url = add_query_arg( $query, admin_url( 'admin-ajax.php' ) );
+		// POST.
+		wp_remote_post( esc_url_raw( $url ), $args );
+	}
+
 	/**
 	 * Remove all database options from the database.
 	 *