Merge pull request #792 from whatthejeff/issue_789

Fixes #789
sebastianbergmann · Jan 26, 2013 · 72f9877 · 72f9877
2 parents 1c3e4c0 + 21f620f
commit 72f9877
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 0 deletions.
diff --git a/PHPUnit/Framework/Process/TestCaseMethod.tpl.dist b/PHPUnit/Framework/Process/TestCaseMethod.tpl.dist
@@ -1,4 +1,5 @@
 <?php
+{iniSettings}
 ini_set('display_errors', 1);
 set_include_path('{include_path}');
 require 'PHPUnit/Autoload.php';

diff --git a/PHPUnit/Framework/TestCase.php b/PHPUnit/Framework/TestCase.php
@@ -723,10 +723,12 @@ public function run(PHPUnit_Framework_TestResult $result = NULL)
                 $constants     = PHPUnit_Util_GlobalState::getConstantsAsString();
                 $globals       = PHPUnit_Util_GlobalState::getGlobalsAsString();
                 $includedFiles = PHPUnit_Util_GlobalState::getIncludedFilesAsString();
+                $iniSettings   = PHPUnit_Util_GlobalState::getIniSettingsAsString();
             } else {
                 $constants     = '';
                 $globals       = '';
                 $includedFiles = '';
+                $iniSettings   = '';
             }
 
             if ($result->getCollectCodeCoverageInformation()) {
@@ -763,6 +765,7 @@ public function run(PHPUnit_Framework_TestResult $result = NULL)
                 'globals'                        => $globals,
                 'include_path'                   => $includePath,
                 'included_files'                 => $includedFiles,
+                'iniSettings'                    => $iniSettings,
                 'strict'                         => $strict
               )
             );

diff --git a/PHPUnit/Util/GlobalState.php b/PHPUnit/Util/GlobalState.php
@@ -213,6 +213,22 @@ public static function getIncludedFilesAsString()
         return $result;
     }
 
+    public static function getIniSettingsAsString()
+    {
+        $result      = '';
+        $iniSettings = ini_get_all(null, FALSE);
+
+        foreach ($iniSettings as $key => $value) {
+            $result .= sprintf(
+              'ini_set(%s, %s);' . "\n",
+              self::exportVariable($key),
+              self::exportVariable($value)
+            );
+        }
+
+        return $result;
+    }
+
     public static function getConstantsAsString()
     {
         $constants = get_defined_constants(TRUE);

diff --git a/Tests/TextUI/ini-isolation.phpt b/Tests/TextUI/ini-isolation.phpt
@@ -0,0 +1,25 @@
+--TEST--
+phpunit --process-isolation -d default_mimetype=application/x-test IniTest ../_files/IniTest.php
+--FILE--
+<?php
+define('PHPUNIT_TESTSUITE', TRUE);
+
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--process-isolation';
+$_SERVER['argv'][3] = '-d';
+$_SERVER['argv'][4] = 'default_mimetype=application/x-test';
+$_SERVER['argv'][5] = 'IniTest';
+$_SERVER['argv'][6] = dirname(dirname(__FILE__)) . '/_files/IniTest.php';
+
+require_once dirname(dirname(dirname(__FILE__))) . '/PHPUnit/Autoload.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+.
+
+Time: %i %s, Memory: %sMb
+
+OK (1 test, 1 assertion)
+
diff --git a/Tests/_files/IniTest.php b/Tests/_files/IniTest.php
@@ -0,0 +1,8 @@
+<?php
+class IniTest extends PHPUnit_Framework_TestCase
+{
+    public function testIni()
+    {
+        $this->assertEquals('application/x-test', ini_get('default_mimetype'));
+    }
+}