Merge pull request #98 from rodnaph/stopwatch-lap-duration

Stopwatch Lap Duration
brick · Apr 2, 2024 · 303f57a · 303f57a
2 parents 907eaa8 + cbc898f
commit 303f57a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/src/Stopwatch.php b/src/Stopwatch.php
@@ -49,21 +49,23 @@ public function start(): void
     }
 
     /**
-     * Stops the timer.
+     * Stops the timer and returns the lap duration.
      *
-     * If the timer is already stopped, this method does nothing.
+     * If the timer is already stopped, this method does nothing, and returns a zero duration.
      */
-    public function stop(): void
+    public function stop(): Duration
     {
         if ($this->startTime === null) {
-            return;
+            return Duration::zero();
         }
 
         $endTime = $this->clock->getTime();
         $duration = Duration::between($this->startTime, $endTime);
 
         $this->duration = $this->duration->plus($duration);
         $this->startTime = null;
+
+        return $duration;
     }
 
     /**

diff --git a/tests/StopwatchTest.php b/tests/StopwatchTest.php
@@ -70,8 +70,10 @@ public function testElapsedTimeWhileRunning(Stopwatch $stopwatch): Stopwatch
     public function testStopWithNullStartTime(): void
     {
         $stopwatch = new Stopwatch();
-        $stopwatch->stop();
 
+        $duration = $stopwatch->stop();
+
+        self::assertDurationIs(0, 0, $duration);
         self::assertNull($stopwatch->getStartTime());
         self::assertFalse($stopwatch->isRunning());
         self::assertDurationIs(0, 0, $stopwatch->getElapsedTime());
@@ -82,8 +84,9 @@ public function testStop(Stopwatch $stopwatch): Stopwatch
     {
         self::setClockTime(3000, 2);
 
-        $stopwatch->stop();
+        $duration = $stopwatch->stop();
 
+        self::assertDurationIs(2000, 1, $duration);
         self::assertNull($stopwatch->getStartTime());
         self::assertFalse($stopwatch->isRunning());
         self::assertDurationIs(2000, 1, $stopwatch->getElapsedTime());
@@ -134,8 +137,9 @@ public function testStopAgain(Stopwatch $stopwatch): Stopwatch
     {
         self::setClockTime(5002, 20);
 
-        $stopwatch->stop();
+        $duration = $stopwatch->stop();
 
+        self::assertDurationIs(2, 11, $duration);
         self::assertNull($stopwatch->getStartTime());
         self::assertFalse($stopwatch->isRunning());
         self::assertDurationIs(2002, 12, $stopwatch->getElapsedTime());