Use PHP_Timer.

sebastianbergmann · May 8, 2010 · fc6fe63 · fc6fe63
1 parent 17c1056
commit fc6fe63
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 212 deletions.
diff --git a/PHPUnit/Extensions/PhptTestCase.php b/PHPUnit/Extensions/PhptTestCase.php
@@ -53,6 +53,7 @@
 }
 
 require_once 'PHP/CodeCoverage.php';
+require_once 'PHP/Timer.php';
 
 /**
  * Wrapper to run .phpt test cases.
@@ -166,9 +167,9 @@ public function run(PHPUnit_Framework_TestResult $result = NULL, array $options
 
         $result->startTest($this);
 
-        PHPUnit_Util_Timer::start();
+        PHP_Timer::start();
         $buffer       = $runner->run($this->filename, $options);
-        $time         = PHPUnit_Util_Timer::stop();
+        $time         = PHP_Timer::stop();
         error_reporting($currentErrorReporting);
         $base         = basename($this->filename);
         $path         = dirname($this->filename);

diff --git a/PHPUnit/Framework/TestResult.php b/PHPUnit/Framework/TestResult.php
@@ -44,6 +44,7 @@
  */
 
 require_once 'PHP/CodeCoverage.php';
+require_once 'PHP/Timer.php';
 
 /**
  * A TestResult collects the results of executing a test case.
@@ -605,7 +606,7 @@ public function run(PHPUnit_Framework_Test $test)
             $this->codeCoverage->start($test);
         }
 
-        PHPUnit_Util_Timer::start();
+        PHP_Timer::start();
 
         try {
             $test->runBare();
@@ -619,7 +620,7 @@ public function run(PHPUnit_Framework_Test $test)
             $error = TRUE;
         }
 
-        $time = PHPUnit_Util_Timer::stop();
+        $time = PHP_Timer::stop();
 
         if ($useXdebug) {
             $data = $this->codeCoverage->stop(FALSE);

diff --git a/PHPUnit/TextUI/ResultPrinter.php b/PHPUnit/TextUI/ResultPrinter.php
@@ -43,6 +43,8 @@
  * @since      File available since Release 2.0.0
  */
 
+require_once 'PHP/Timer.php';
+
 /**
  * Prints the result of a TextUI TestRunner run.
  *
@@ -323,11 +325,11 @@ protected function printSkipped(PHPUnit_Framework_TestResult $result)
     protected function printHeader($timeElapsed)
     {
         if (isset($_SERVER['REQUEST_TIME'])) {
-            $timeElapsed = PHPUnit_Util_Timer::secondsToTimeString(
+            $timeElapsed = PHP_Timer::secondsToTimeString(
               time() - $_SERVER['REQUEST_TIME']
             );
         } else {
-            $timeElapsed = PHPUnit_Util_Timer::secondsToTimeString(
+            $timeElapsed = PHP_Timer::secondsToTimeString(
               $timeElapsed
             );
         }

diff --git a/PHPUnit/Util/Timer.php b/PHPUnit/Util/Timer.php
diff --git a/README.markdown b/README.markdown
@@ -41,4 +41,5 @@ PHPUnit 3.5.0
 * Replaced `PHPUnit_Framework_MockObject` with the [PHP_MockObject](http://github.com/sebastianbergmann/php-mock-objects) component.
 * Replaced `PHPUnit_Util_FilterIterator` with the [PHP_FileIterator](http://github.com/sebastianbergmann/php-file-iterator) component.
 * Replaced `PHPUnit_Util_Template` with the [Text_Template](http://github.com/sebastianbergmann/php-text-template) component.
+* Replaced `PHPUnit_Util_Timer` with the [PHP_Timer](http://github.com/sebastianbergmann/php-timer) component.
 * PHPUnit now requires PHP 5.2.7 (or later) but PHP 5.3.2 (or later) is highly recommended.
diff --git a/Tests/Util/TestTest.php b/Tests/Util/TestTest.php
@@ -45,8 +45,6 @@
 
 require_once 'PHPUnit/Framework/TestCase.php';
 
-require_once 'PHPUnit/Util/Timer.php';
-
 require_once dirname(dirname(__FILE__)) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'ExceptionTest.php';
 
 /**

diff --git a/Tests/Util/TimerTest.php b/Tests/Util/TimerTest.php
diff --git a/package.xml b/package.xml
@@ -741,9 +741,6 @@
      <file baseinstalldir="/" name="TestSuiteIterator.php" role="php">
       <tasks:replace from="@package_version@" to="version" type="package-info" />
      </file>
-     <file baseinstalldir="/" name="Timer.php" role="php">
-      <tasks:replace from="@package_version@" to="version" type="package-info" />
-     </file>
      <file baseinstalldir="/" name="Type.php" role="php">
       <tasks:replace from="@package_version@" to="version" type="package-info" />
      </file>
@@ -863,6 +860,11 @@
     <channel>pear.phpunit.de</channel>
     <min>1.0.0</min>
    </package>
+   <package>
+    <name>PHP_Timer</name>
+    <channel>pear.phpunit.de</channel>
+    <min>1.0.0</min>
+   </package>
    <package>
     <name>PHPUnit_MockObject</name>
     <channel>pear.phpunit.de</channel>