Merge branch 'PHP-7.4'

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);

scripts/dev/bless_tests.php

@@ -2,16 +2,11 @@
 <?php
 
 if ($argc < 2) {
-    die("Usage: php bless_tests.php dir/");
+    die("Usage: php bless_tests.php dir/\n");
 }
 
-$dir = $argv[1];
-$it = new RecursiveIteratorIterator(
-    new RecursiveDirectoryIterator($dir),
-    RecursiveIteratorIterator::LEAVES_ONLY
-);
-foreach ($it as $file) {
-    $path = $file->getPathName();
+$files = getFiles(array_slice($argv, 1));
+foreach ($files as $path) {
     if (!preg_match('/^(.*)\.phpt$/', $path, $matches)) {
         // Not a phpt test
         continue;
@@ -35,6 +30,24 @@
     file_put_contents($path, $phpt);
 }
 
+function getFiles(array $dirsOrFiles): \Iterator {
+    foreach ($dirsOrFiles as $dirOrFile) {
+        if (is_dir($dirOrFile)) {
+            $it = new RecursiveIteratorIterator(
+                new RecursiveDirectoryIterator($dirOrFile),
+                RecursiveIteratorIterator::LEAVES_ONLY
+            );
+            foreach ($it as $file) {
+                yield $file->getPathName();
+            }
+        } else if (is_file($dirOrFile)) {
+            yield $dirOrFile;
+        } else {
+            die("$dirOrFile is not a directory or file\n");
+        }
+    }
+}
+
 function normalizeOutput(string $out): string {
     $out = preg_replace('/in \/.+ on line \d+$/m', 'in %s on line %d', $out);
     $out = preg_replace('/in \/.+:\d+$/m', 'in %s:%d', $out);