Job & Runner: explicit env variables specification and their clean up

Author: milo

src/Runner/CliTester.php

@@ -59,6 +59,8 @@ public function run()
 		}
 
 		$runner = $this->createRunner();
+		$runner->setEnvironmentVariable(Environment::RUNNER, 1);
+		$runner->setEnvironmentVariable(Environment::COLORS, (int) Environment::$useColors);
 
 		if ($this->options['-o'] !== NULL) {
 			ob_clean();

src/Runner/Job.php

@@ -7,7 +7,6 @@
 
 namespace Tester\Runner;
 
-use Tester\Environment;
 use Tester\Helpers;
 
 
@@ -36,6 +35,9 @@ class Job
 	/** @var string[]  test arguments */
 	private $args;
 
+	/** @var string[]  environment variables for test */
+	private $envVars;
+
 	/** @var string  test output */
 	private $output;
 
@@ -65,11 +67,12 @@ class Job
 	 * @param  string  test file name
 	 * @return void
 	 */
-	public function __construct($testFile, PhpInterpreter $interpreter, array $args = NULL)
+	public function __construct($testFile, PhpInterpreter $interpreter, array $args = NULL, array $envVars = NULL)
 	{
 		$this->file = (string) $testFile;
 		$this->interpreter = $interpreter;
 		$this->args = (array) $args;
+		$this->envVars = (array) $envVars;
 	}
 
 
@@ -80,8 +83,10 @@ public function __construct($testFile, PhpInterpreter $interpreter, array $args
 	 */
 	public function run($flags = NULL)
 	{
-		putenv(Environment::RUNNER . '=1');
-		putenv(Environment::COLORS . '=' . (int) Environment::$useColors);
+		foreach ($this->envVars as $name => $value) {
+			putenv("$name=$value");
+		}
+
 		$this->proc = proc_open(
 			$this->interpreter->getCommandLine()
 			. ' -d register_argc_argv=on ' . Helpers::escapeArg($this->file) . ' ' . implode(' ', $this->args),
@@ -96,6 +101,10 @@ public function run($flags = NULL)
 			['bypass_shell' => TRUE]
 		);
 
+		foreach (array_keys($this->envVars) as $name) {
+			putenv($name);
+		}
+
 		list($stdin, $this->stdout, $stderr) = $pipes;
 		fclose($stdin);
 		if ($flags & self::RUN_COLLECT_ERRORS) {

src/Runner/Runner.php

@@ -40,6 +40,9 @@ class Runner
 	/** @var PhpInterpreter */
 	private $interpreter;
 
+	/** @var array */
+	private $envVars = [];
+
 	/** @var Job[] */
 	private $jobs;
 
@@ -60,6 +63,26 @@ public function __construct(PhpInterpreter $interpreter)
 	}
 
 
+	/**
+	 * @param  string
+	 * @param  string
+	 * @return void
+	 */
+	public function setEnvironmentVariable($name, $value)
+	{
+		$this->envVars[$name] = $value;
+	}
+
+
+	/**
+	 * @return array
+	 */
+	public function getEnvironmentVariables()
+	{
+		return $this->envVars;
+	}
+
+
 	/**
 	 * Runs all tests.
 	 * @return bool

src/Runner/TestHandler.php

@@ -61,7 +61,7 @@ public function initiate($file)
 		}
 
 		foreach ($jobsArgs as $args) {
-			$this->runner->addJob(new Job($file, $php, $args));
+			$this->runner->addJob(new Job($file, $php, $args, $this->runner->getEnvironmentVariables()));
 		}
 	}
 

tests/Runner/Runner.misc.phpt

@@ -0,0 +1,35 @@
+<?php
+
+use Tester\Assert;
+use Tester\Runner\Runner;
+
+require __DIR__ . '/../bootstrap.php';
+require __DIR__ . '/../../src/Runner/OutputHandler.php';
+require __DIR__ . '/../../src/Runner/TestHandler.php';
+require __DIR__ . '/../../src/Runner/Runner.php';
+
+
+class Logger implements Tester\Runner\OutputHandler
+{
+	public $results = [];
+
+	function result($testName, $result, $message)
+	{
+		$this->results[basename($testName)] = $result;
+	}
+
+	function begin() {}
+	function end() {}
+}
+
+Assert::false(getenv('TesterEnvVar'));
+
+$runner = new Tester\Runner\Runner(createInterpreter());
+$runner->paths[] = __DIR__ . '/misc/*.phptx';
+$runner->outputHandlers[] = $logger = new Logger;
+$runner->setEnvironmentVariable('TesterEnvVar', 'Is here!');
+$runner->run();
+
+Assert::false(getenv('TesterEnvVar'));
+
+Assert::same(Runner::PASSED, $logger->results['env-vars.phptx']);

tests/Runner/misc/env-vars.phptx

@@ -0,0 +1,7 @@
+<?php
+
+use Tester\Assert;
+
+require __DIR__ . '/../../bootstrap.php';
+
+Assert::same('Is here!', getenv('TesterEnvVar'));

tests/RunnerOutput/JUnitPrinter.phpt

@@ -2,6 +2,7 @@
 
 use Tester\Assert;
 use Tester\Environment;
+use Tester\Runner\Runner;
 use Tester\Runner\Output\JUnitPrinter;
 
 require __DIR__ . '/../bootstrap.php';
@@ -11,11 +12,10 @@ require __DIR__ . '/../../src/Runner/OutputHandler.php';
 require __DIR__ . '/../../src/Runner/Output/JUnitPrinter.php';
 
 
-Environment::$useColors = FALSE;
-$runner = new Tester\Runner\Runner(createInterpreter());
-$printer = new JUnitPrinter($runner);
+$runner = new Runner(createInterpreter());
+$runner->setEnvironmentVariable(Environment::COLORS, 0);
+$runner->outputHandlers[] = new JUnitPrinter($runner);
 $runner->paths[] = __DIR__ . '/cases/*.phptx';
-$runner->outputHandlers[] = $printer;
 ob_start();
 $runner->run();
 $output = ob_get_clean();