PhpInterpreter changed to immutable object

Author: dg

src/Runner/PhpInterpreter.php

@@ -85,10 +85,13 @@ public function __construct($path, array $args = [])
 	/**
 	 * @param  string
 	 * @param  string
+	 * @return static
 	 */
-	public function addPhpIniOption($name, $value = null)
+	public function withPhpIniOption($name, $value = null)
 	{
-		$this->commandLine .= ' -d ' . Helpers::escapeArg($name . ($value === null ? '' : "=$value"));
+		$me = clone $this;
+		$me->commandLine .= ' -d ' . Helpers::escapeArg($name . ($value === null ? '' : "=$value"));
+		return $me;
 	}
 
 

src/Runner/TestHandler.php

@@ -37,7 +37,7 @@ public function __construct(Runner $runner)
 	public function initiate($file)
 	{
 		list($annotations, $title) = $this->getAnnotations($file);
-		$php = clone $this->runner->getInterpreter();
+		$php = $this->runner->getInterpreter();
 
 		$tests = [new Test($file, $title)];
 		foreach (get_class_methods($this) as $method) {
@@ -128,10 +128,10 @@ private function initiatePhpExtension(Test $test, $value, PhpInterpreter $interp
 	}
 
 
-	private function initiatePhpIni(Test $test, $pair, PhpInterpreter $interpreter)
+	private function initiatePhpIni(Test $test, $pair, PhpInterpreter &$interpreter)
 	{
 		list($name, $value) = explode('=', $pair, 2) + [1 => null];
-		$interpreter->addPhpIniOption($name, $value);
+		$interpreter = $interpreter->withPhpIniOption($name, $value);
 	}
 
 

tests/Runner/Runner.multiple-fails.phpt

@@ -38,9 +38,9 @@ class Logger implements Tester\Runner\OutputHandler
 	}
 }
 
-$interpreter = createInterpreter();
-$interpreter->addPhpIniOption('display_errors', 'on');
-$interpreter->addPhpIniOption('html_errors', 'off');
+$interpreter = createInterpreter()
+	->withPhpIniOption('display_errors', 'on')
+	->withPhpIniOption('html_errors', 'off');
 
 $runner = new Runner($interpreter);
 $runner->paths[] = __DIR__ . '/multiple-fails/*.phptx';