- Merge [2863].

sebastianbergmann · Apr 24, 2008 · 954d36e · 954d36e
1 parent 965670c
commit 954d36e
Showing 1 changed file with 4 additions and 5 deletions.
diff --git 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;