Avoid warnings in run-tests.php

nikic · nikic · commit db90b37b5494 · 2019-06-05T11:36:30.000+02:00
diff --git a/run-tests.php b/run-tests.php
@@ -197,7 +197,7 @@ function main()
 		$environment['TEST_PHP_CGI_EXECUTABLE'] = $php_cgi;
 	}
 
-	if (!getenv('TEST_PHPDBG_EXECUTABLE')) {
+	if (!getenv('TEST_PHPDBG_EXECUTABLE') && $php !== null) {
 		if (!strncasecmp(PHP_OS, "win", 3) && file_exists(dirname($php) . "/phpdbg.exe")) {
 			$phpdbg = realpath(dirname($php) . "/phpdbg.exe");
 		} elseif (file_exists(dirname($php) . "/../../sapi/phpdbg/phpdbg")) {
@@ -668,7 +668,7 @@ function main()
 			$environment['TEST_PHP_EXECUTABLE'] = $php;
 		}
 
-		if (strlen($conf_passed)) {
+		if ($conf_passed !== null) {
 			if (substr(PHP_OS, 0, 3) == "WIN") {
 				$pass_options .= " -c " . escapeshellarg($conf_passed);
 			} else {
