PhpInterpreter: added addPhpIniOption() (BC break)

mpromain · Apr 17, 2016 · 80e0431 · 80e0431
1 parent 9ed983a
commit 80e0431
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 5 deletions.
diff --git a/src/Runner/HhvmPhpInterpreter.php b/src/Runner/HhvmPhpInterpreter.php
@@ -16,7 +16,7 @@
 class HhvmPhpInterpreter implements PhpInterpreter
 {
 	/** @var string  HHVM arguments */
-	public $arguments;
+	private $arguments;
 
 	/** @var string  HHVM executable */
 	private $path;
@@ -59,6 +59,16 @@ public function __construct($path, $args = NULL)
 	}
 
 
+	/**
+	 * @param  string
+	 * @param  string
+	 */
+	public function addPhpIniOption($name, $value = NULL)
+	{
+		$this->arguments .= ' -d ' . Helpers::escapeArg($name . ($value === NULL ? '' : "=$value"));
+	}
+
+
 	/**
 	 * @return string
 	 */

diff --git a/src/Runner/PhpInterpreter.php b/src/Runner/PhpInterpreter.php
@@ -11,6 +11,12 @@
 interface PhpInterpreter
 {
 
+	/**
+	 * @param string
+	 * @param string
+	 */
+	function addPhpIniOption($name, $value = NULL);
+
 	/**
 	 * @return string
 	 */

diff --git a/src/Runner/TestHandler.php b/src/Runner/TestHandler.php
@@ -113,7 +113,8 @@ private function initiatePhpVersion($version, PhpInterpreter $interpreter)
 
 	private function initiatePhpIni($value, PhpInterpreter $interpreter)
 	{
-		$interpreter->arguments .= ' -d ' . Helpers::escapeArg($value);
+		list($name, $value) = explode('=', $value, 2) + [1 => NULL];
+		$interpreter->addPhpIniOption($name, $value);
 	}
 
 

diff --git a/src/Runner/ZendPhpDbgInterpreter.php b/src/Runner/ZendPhpDbgInterpreter.php
@@ -16,7 +16,7 @@
 class ZendPhpDbgInterpreter implements PhpInterpreter
 {
 	/** @var string  PHP arguments */
-	public $arguments;
+	private $arguments;
 
 	/** @var string  PHP executable */
 	private $path;
@@ -55,6 +55,16 @@ public function __construct($path, $args = NULL)
 	}
 
 
+	/**
+	 * @param  string
+	 * @param  string
+	 */
+	public function addPhpIniOption($name, $value = NULL)
+	{
+		$this->arguments .= ' -d ' . Helpers::escapeArg($name . ($value === NULL ? '' : "=$value"));
+	}
+
+
 	/**
 	 * @return string
 	 */

diff --git a/src/Runner/ZendPhpInterpreter.php b/src/Runner/ZendPhpInterpreter.php
@@ -16,7 +16,7 @@
 class ZendPhpInterpreter implements PhpInterpreter
 {
 	/** @var string  PHP arguments */
-	public $arguments;
+	private $arguments;
 
 	/** @var string  PHP executable */
 	private $path;
@@ -63,6 +63,16 @@ public function __construct($path, $args = NULL)
 	}
 
 
+	/**
+	 * @param  string
+	 * @param  string
+	 */
+	public function addPhpIniOption($name, $value = NULL)
+	{
+		$this->arguments .= ' -d ' . Helpers::escapeArg($name . ($value === NULL ? '' : "=$value"));
+	}
+
+
 	/**
 	 * @return string
 	 */

diff --git a/tests/Runner/Runner.multiple-fails.phpt b/tests/Runner/Runner.multiple-fails.phpt
@@ -24,7 +24,8 @@ class Logger implements Tester\Runner\OutputHandler
 }
 
 $interpreter = createInterpreter();
-$interpreter->arguments .= ' -d display_errors=On -d html_errors=Off';
+$interpreter->addPhpIniOption('display_errors', 'on');
+$interpreter->addPhpIniOption('html_errors', 'off');
 
 $runner = new Runner($interpreter);
 $runner->paths[] = __DIR__ . '/multiple-fails/*.phptx';