PhpInterpreter: pass command to proc_open() as array

- PHP escapes arguments itself
- subshell call is bypassed on Linux too

Author: milo

src/Runner/Job.php

@@ -95,17 +95,15 @@ public function run(bool $async = false): void
 		$this->duration = -microtime(as_float: true);
 		$this->proc = proc_open(
 			$this->interpreter
-				->withArguments(['-d register_argc_argv=on', $this->test->getFile(), ...$args])
-				->getCommandLine(),
+				->withArguments(['-d', 'register_argc_argv=on', $this->test->getFile(), ...$args])
+				->getCommand(),
 			[
 				['pipe', 'r'],
 				['pipe', 'w'],
 				$this->stderrFile ? ['file', $this->stderrFile, 'w'] : ['pipe', 'w'],
 			],
 			$pipes,
 			dirname($this->test->getFile()),
-			null,
-			['bypass_shell' => true],
 		) ?: throw new \RuntimeException('Cannot start test process.');
 
 		foreach (array_keys($this->envVars) as $name) {

src/Runner/PhpInterpreter.php

@@ -8,15 +8,16 @@
 namespace Tester\Runner;
 
 use Tester\Helpers;
-use function count, in_array;
+use function array_map, count, explode, implode, in_array, str_contains;
 
 
 /**
  * Wraps a PHP executable and its resolved version, extensions, and command-line options.
  */
 class PhpInterpreter
 {
-	private string $commandLine;
+	/** @var list<string> */
+	private array $commandLine;
 	private bool $cgi;
 	private \stdClass $info;
 	private string $error;
@@ -25,14 +26,10 @@ class PhpInterpreter
 	/** @param list<string>  $args */
 	public function __construct(string $path, array $args = [])
 	{
-		$this->commandLine = Helpers::escapeArg($path);
 		$proc = @proc_open( // @ is escalated to exception
-			$this->commandLine . ' --version',
+			[$path, '--version'],
 			[['pipe', 'r'], ['pipe', 'w'], ['pipe', 'w']],
 			$pipes,
-			null,
-			null,
-			['bypass_shell' => true],
 		);
 		if ($proc === false) {
 			throw new \Exception("Cannot run PHP interpreter $path. Use -p option.");
@@ -42,20 +39,16 @@ public function __construct(string $path, array $args = [])
 		$output = stream_get_contents($pipes[1]);
 		proc_close($proc);
 
-		$args = ' ' . implode(' ', array_map([Helpers::class, 'escapeArg'], $args));
 		if (str_contains($output, 'phpdbg')) {
-			$args = ' -qrrb -S cli' . $args;
+			$args = ['-qrrb', '-S', 'cli', ...$args];
 		}
 
-		$this->commandLine .= rtrim($args);
+		$this->commandLine = [$path, ...$args];
 
 		$proc = proc_open(
-			$this->commandLine . ' -d register_argc_argv=on ' . Helpers::escapeArg(__DIR__ . '/info.php') . ' serialized',
+			[...$this->commandLine, '-d', 'register_argc_argv=on', __DIR__ . '/info.php', 'serialized'],
 			[['pipe', 'r'], ['pipe', 'w'], ['pipe', 'w']],
 			$pipes,
-			null,
-			null,
-			['bypass_shell' => true],
 		) ?: throw new \Exception("Unable to run $path.");
 
 		$output = stream_get_contents($pipes[1]);
@@ -88,7 +81,7 @@ public function __construct(string $path, array $args = [])
 	public function withArguments(array $args): static
 	{
 		$me = clone $this;
-		$me->commandLine .= ' ' . implode(' ', array_map([Helpers::class, 'escapeArg'], $args));
+		$me->commandLine = [...$me->commandLine, ...$args];
 		return $me;
 	}
 
@@ -98,11 +91,18 @@ public function withArguments(array $args): static
 	 */
 	public function withPhpIniOption(string $name, ?string $value = null): static
 	{
-		return $this->withArguments(['-d ' . $name . ($value === null ? '' : "=$value")]);
+		return $this->withArguments(['-d', $name . ($value === null ? '' : "=$value")]);
 	}
 
 
 	public function getCommandLine(): string
+	{
+		return implode(' ', array_map([Helpers::class, 'escapeArg'], $this->commandLine));
+	}
+
+
+	/** @return list<string> */
+	public function getCommand(): array
 	{
 		return $this->commandLine;
 	}

tests/Runner/PhpInterpreter.phpt

@@ -10,6 +10,9 @@ Assert::true($interpreter->hasExtension('DaTe'));
 Assert::false($interpreter->hasExtension('foo-bar'));
 
 Assert::contains(PHP_BINARY, $interpreter->getCommandLine());
+Assert::type('list', $interpreter->getCommand());
+Assert::same(PHP_BINARY, $interpreter->getCommand()[0]);
+Assert::same([...$interpreter->getCommand(), '-v'], $interpreter->withArguments(['-v'])->getCommand());
 Assert::same(PHP_VERSION, $interpreter->getVersion());
 Assert::same(str_contains(PHP_SAPI, 'cgi'), $interpreter->isCgi());
 
@@ -35,6 +38,6 @@ Assert::count($count, $engines);
 
 // createInterpreter() uses same php.ini as parent
 if (!$interpreter->isCgi()) {
-	$output = shell_exec($interpreter->withArguments(['-r echo php_ini_loaded_file();'])->getCommandLine());
+	$output = shell_exec($interpreter->withArguments(['-r', 'echo php_ini_loaded_file();'])->getCommandLine());
 	Assert::same(php_ini_loaded_file(), $output);
 }