added PhpInterpreter::withOption()

Author: dg

src/Runner/Job.php

@@ -9,7 +9,6 @@
 
 namespace Tester\Runner;
 
-use Tester\Helpers;
 use function count, is_array, is_resource;
 use const DIRECTORY_SEPARATOR, PHP_OS_FAMILY;
 
@@ -92,17 +91,12 @@ public function run(bool $async = false): void
 			putenv("$name=$value");
 		}
 
-		$args = [];
-		foreach ($this->test->getArguments() as $value) {
-			$args[] = is_array($value)
-				? Helpers::escapeArg("--$value[0]=$value[1]")
-				: Helpers::escapeArg($value);
-		}
-
+		$args = array_map(fn($arg) => is_array($arg) ? "--$arg[0]=$arg[1]" : $arg, $this->test->getArguments());
 		$this->duration = -microtime(as_float: true);
 		$this->proc = proc_open(
-			$this->interpreter->getCommandLine()
-			. ' -d register_argc_argv=on ' . Helpers::escapeArg($this->test->getFile()) . ' ' . implode(' ', $args),
+			$this->interpreter
+				->withArguments(['-d register_argc_argv=on', $this->test->getFile(), ...$args])
+				->getCommandLine(),
 			[
 				['pipe', 'r'],
 				['pipe', 'w'],

src/Runner/PhpInterpreter.php

@@ -77,14 +77,20 @@ public function __construct(string $path, array $args = [])
 	}
 
 
-	public function withPhpIniOption(string $name, ?string $value = null): static
+	public function withArguments(array $args): static
 	{
 		$me = clone $this;
-		$me->commandLine .= ' -d ' . Helpers::escapeArg($name . ($value === null ? '' : "=$value"));
+		$me->commandLine .= ' ' . implode(' ', array_map([Helpers::class, 'escapeArg'], $args));
 		return $me;
 	}
 
 
+	public function withPhpIniOption(string $name, ?string $value = null): static
+	{
+		return $this->withArguments(['-d ' . $name . ($value === null ? '' : "=$value")]);
+	}
+
+
 	public function getCommandLine(): string
 	{
 		return $this->commandLine;