From 954d36ef312451fe2fb801210d3b3886427870cb Mon Sep 17 00:00:00 2001
From: Sebastian Bergmann <sb@sebastian-bergmann.de>
Date: Thu, 24 Apr 2008 20:34:16 +0000
Subject: [PATCH] - Merge [2863].

---
 PHPUnit/Extensions/PhptTestCase.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/PHPUnit/Extensions/PhptTestCase.php b/PHPUnit/Extensions/PhptTestCase.php
index afbc0af4d58..872d425472c 100644
--- a/PHPUnit/Extensions/PhptTestCase.php
+++ b/PHPUnit/Extensions/PhptTestCase.php
@@ -143,19 +143,18 @@ public function run(PHPUnit_Framework_TestResult $result = NULL, $options = arra
             throw new InvalidArgumentException;
         }
 
-        $options = array_merge($options, $this->options);
-
         $coverage = $result->getCollectCodeCoverageInformation();
+        $options  = array_merge($options, $this->options);
 
         if ($coverage) {
-            $options = array('coverage' => TRUE);
+            $options['coverage'] = TRUE;
         } else {
-            $options = array();
+            $options['coverage'] = FALSE;
         }
 
         $runner = new PEAR_RunTest(new PHPUnit_Extensions_PhptTestCase_Logger, $options);
 
-        if ($coverage){
+        if ($coverage) {
             $runner->xdebug_loaded = TRUE;
         } else {
             $runner->xdebug_loaded = FALSE;