- Merge [4746].

sebastianbergmann · Apr 2, 2009 · 6b22040 · 6b22040
1 parent 7717325
commit 6b22040
Showing 1 changed file with 15 additions and 3 deletions.
diff --git a/PHPUnit/Framework/ComparisonFailure.php b/PHPUnit/Framework/ComparisonFailure.php
@@ -197,10 +197,22 @@ public static function diffEqual($expected, $actual, $message = '')
 
     protected function diff($expected, $actual)
     {
-        $expectedFile = tempnam('/tmp', 'expected');
-        file_put_contents($expectedFile, $expected);
+        if (defined('PHPUNIT_TMPDIR')) {
+            $tmpDir = PHPUNIT_TMPDIR;
+        }
+
+        else if (function_exists('sys_get_temp_dir')) {
+            $tmpDir = sys_get_temp_dir();
+        }
 
-        $actualFile = tempnam('/tmp', 'actual');
+        else {
+            $tmpDir = '/tmp';
+        }
+
+        $expectedFile = tempnam($tmpDir, 'expected');
+        $actualFile   = tempnam($tmpDir, 'actual');
+
+        file_put_contents($expectedFile, $expected);
         file_put_contents($actualFile, $actual);
 
         $buffer = shell_exec(