Merge pull request #5798 from kenjis/fix-timer

fix: Timer::getElapsedTime() returns incorrect value
codeigniter4 · Mar 13, 2022 · c8dbb73 · c8dbb73
2 parents d40f986 + 3c706a5
commit c8dbb73
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/system/Debug/Timer.php b/system/Debug/Timer.php
@@ -78,7 +78,7 @@ public function stop(string $name)
  * @param string $name The name of the timer.
  * @param int $decimals Number of decimal places.
  *
- * @return float|null Returns null if timer exists by that name.
+ * @return float|null Returns null if timer does not exist by that name.
  * Returns a float representing the number of
  * seconds elapsed while that timer was running.
  */
@@ -96,7 +96,7 @@ public function getElapsedTime(string $name, int $decimals = 4)
  $timer['end'] = microtime(true);
  }
 
- return (float) number_format($timer['end'] - $timer['start'], $decimals);
+ return (float) number_format($timer['end'] - $timer['start'], $decimals, '.', '');
  }
 
  /**

diff --git a/tests/system/Debug/TimerTest.php b/tests/system/Debug/TimerTest.php
@@ -92,8 +92,8 @@ public function testThrowsExceptionStoppingNonTimer()
  public function testLongExecutionTime()
  {
  $timer = new Timer();
- $timer->start('longjohn', strtotime('-11 minutes'));
- $this->assertCloseEnough(11 * 60, $timer->getElapsedTime('longjohn'));
+ $timer->start('longjohn', strtotime('-110 minutes'));
+ $this->assertCloseEnough(110 * 60, $timer->getElapsedTime('longjohn'));
  }
 
  public function testLongExecutionTimeThroughCommonFunc()