Use PHP_BINARY by default in run-tests.php

You pretty much always want to run with -P, make it the default.

Author: nikic

run-tests.php

@@ -160,10 +160,6 @@ function main()
 		$environment["SystemRoot"] = getenv("SystemRoot");
 	}
 
-	// Don't ever guess at the PHP executable location.
-	// Require the explicit specification.
-	// Otherwise we could end up testing the wrong file!
-
 	$php = null;
 	$php_cgi = null;
 	$phpdbg = null;
@@ -461,11 +457,7 @@ function main()
 						$environment['TEST_PHP_EXECUTABLE'] = $php;
 						break;
 					case 'P':
-						if (constant('PHP_BINARY')) {
-							$php = PHP_BINARY;
-						} else {
-							break;
-						}
+						$php = PHP_BINARY;
 						putenv("TEST_PHP_EXECUTABLE=$php");
 						$environment['TEST_PHP_EXECUTABLE'] = $php;
 						break;
@@ -567,7 +559,7 @@ function main()
 
     -p <php>    Specify PHP executable to run.
 
-    -P          Use PHP_BINARY as PHP executable to run.
+    -P          Use PHP_BINARY as PHP executable to run (default).
 
     -q          Quiet, no user interaction (same as environment NO_INTERACTION).
 
@@ -652,6 +644,13 @@ function main()
 			}
 		}
 
+		// Default to PHP_BINARY as executable
+		if (!isset($environment['TEST_PHP_EXECUTABLE'])) {
+			$php = PHP_BINARY;
+			putenv("TEST_PHP_EXECUTABLE=$php");
+			$environment['TEST_PHP_EXECUTABLE'] = $php;
+		}
+
 		if (strlen($conf_passed)) {
 			if (substr(PHP_OS, 0, 3) == "WIN") {
 				$pass_options .= " -c " . escapeshellarg($conf_passed);