Merge pull request #150 from bpedro/feature/kill-web-server-fix

Nate Good · Nate Good · commit 41bc3e22fbce · 2014-10-21T15:31:44.000-04:00
Fix web server kill when the SIGKILL constant isn't available
diff --git a/tests/bootstrap-server.php b/tests/bootstrap-server.php
@@ -3,35 +3,40 @@
 $php_version = phpversion();
 $php_major = floatval(substr($php_version, 0, 3));
 
+// Define SIGKILL if pcntl is not found
+if (!function_exists('pcntl_signal')) {
+    define('SIGKILL', 9);
+}
+
 if ($php_major < 5.4) {
-	define('WITHOUT_SERVER', true);
+    define('WITHOUT_SERVER', true);
 } else {
-	// Command that starts the built-in web server
-	$command = sprintf('php -S %s:%d -t %s >./server.log 2>&1 & echo $!', WEB_SERVER_HOST, WEB_SERVER_PORT, WEB_SERVER_DOCROOT);
-
-	// Execute the command and store the process ID
-	$output = array();
-	exec($command, $output, $exit_code);
-
-	// sleep for a second to let server come up
-	sleep(1);
-	$pid = (int) $output[0];
-
-	// check server.log to see if it failed to start
-	$server_logs = file_get_contents("./server.log");
-	if (strpos($server_logs, "Fail") !== false) {
-		// server failed to start for some reason
-		print "Failed to start server! Logs:" . PHP_EOL . PHP_EOL;
-		print_r($server_logs);
-		exit(1);
-	}
-
-	echo sprintf('%s - Web server started on %s:%d with PID %d', date('r'), WEB_SERVER_HOST, WEB_SERVER_PORT, $pid) . PHP_EOL;
-
-	register_shutdown_function(function() {
-		// cleanup after ourselves -- remove log file, shut down server
-		global $pid;
-		unlink("./server.log");
-		posix_kill($pid, SIGKILL);
-	});
+    // Command that starts the built-in web server
+    $command = sprintf('php -S %s:%d -t %s >./server.log 2>&1 & echo $!', WEB_SERVER_HOST, WEB_SERVER_PORT, WEB_SERVER_DOCROOT);
+
+    // Execute the command and store the process ID
+    $output = array();
+    exec($command, $output, $exit_code);
+
+    // sleep for a second to let server come up
+    sleep(1);
+    $pid = (int) $output[0];
+
+    // check server.log to see if it failed to start
+    $server_logs = file_get_contents("./server.log");
+    if (strpos($server_logs, "Fail") !== false) {
+        // server failed to start for some reason
+        print "Failed to start server! Logs:" . PHP_EOL . PHP_EOL;
+        print_r($server_logs);
+        exit(1);
+    }
+
+    echo sprintf('%s - Web server started on %s:%d with PID %d', date('r'), WEB_SERVER_HOST, WEB_SERVER_PORT, $pid) . PHP_EOL;
+
+    register_shutdown_function(function() {
+        // cleanup after ourselves -- remove log file, shut down server
+        global $pid;
+        unlink("./server.log");
+        posix_kill($pid, SIGKILL);
+    });
 }
