- Fix bad merge.

sebastianbergmann · Feb 15, 2008 · f90bff6 · f90bff6
1 parent 54fff6a
commit f90bff6
Showing 1 changed file with 0 additions and 26 deletions.
diff --git a/PHPUnit/TextUI/TestRunner.php b/PHPUnit/TextUI/TestRunner.php
@@ -49,8 +49,6 @@
 require_once 'PHPUnit/Extensions/RepeatedTest.php';
 require_once 'PHPUnit/Runner/StandardTestSuiteLoader.php';
 require_once 'PHPUnit/Runner/Version.php';
-require_once 'PHPUnit/Extensions/Story/ResultPrinter/HTML.php';
-require_once 'PHPUnit/Extensions/Story/ResultPrinter/Text.php';
 require_once 'PHPUnit/TextUI/ResultPrinter.php';
 require_once 'PHPUnit/Util/TestDox/ResultPrinter.php';
 require_once 'PHPUnit/Util/Configuration.php';
@@ -212,22 +210,6 @@ public function doRun(PHPUnit_Framework_Test $suite, array $arguments = array())
 
         $result->addListener($this->printer);
 
-        if (isset($arguments['storyHTMLFile'])) {
-            $result->addListener(
-              new PHPUnit_Extensions_Story_ResultPrinter_HTML(
-                $arguments['storyHTMLFile']
-              )
-            );
-        }
-
-        if (isset($arguments['storyTextFile'])) {
-            $result->addListener(
-              new PHPUnit_Extensions_Story_ResultPrinter_Text(
-                $arguments['storyTextFile']
-              )
-            );
-        }
-
         if (isset($arguments['testdoxHTMLFile'])) {
             $result->addListener(
               new PHPUnit_Util_TestDox_ResultPrinter_HTML(
@@ -732,14 +714,6 @@ protected function handleConfiguration(array &$arguments)
                 }
             }
 
-            if (isset($loggingConfiguration['story-html']) && !isset($arguments['storyHTMLFile'])) {
-                $arguments['storyHTMLFile'] = $loggingConfiguration['story-html'];
-            }
-
-            if (isset($loggingConfiguration['story-text']) && !isset($arguments['storyTextFile'])) {
-                $arguments['storsTextFile'] = $loggingConfiguration['story-text'];
-            }
-
             if (isset($loggingConfiguration['testdox-html']) && !isset($arguments['testdoxHTMLFile'])) {
                 $arguments['testdoxHTMLFile'] = $loggingConfiguration['testdox-html'];
             }