[Stopwatch] Fixed bug in getDuration when counting multiple ongoing periods

TimoBakx · TimoBakx · commit af00d8deabf0 · 2019-10-29T21:16:34.000+01:00
diff --git a/src/Symfony/Component/Stopwatch/StopwatchEvent.php b/src/Symfony/Component/Stopwatch/StopwatchEvent.php
@@ -177,12 +177,10 @@ public function getEndTime()
     public function getDuration()
     {
         $periods = $this->periods;
-        $stopped = \count($periods);
-        $left = \count($this->started) - $stopped;
+        $left = \count($this->started);
 
-        for ($i = 0; $i < $left; ++$i) {
-            $index = $stopped + $i;
-            $periods[] = new StopwatchPeriod($this->started[$index], $this->getNow(), $this->morePrecision);
+        for ($i = $left - 1; $i >= 0; --$i) {
+            $periods[] = new StopwatchPeriod($this->started[$i], $this->getNow(), $this->morePrecision);
         }
 
         $total = 0;
diff --git a/src/Symfony/Component/Stopwatch/Tests/StopwatchEventTest.php b/src/Symfony/Component/Stopwatch/Tests/StopwatchEventTest.php
@@ -99,8 +99,25 @@ public function testDurationBeforeStop()
         $event->stop();
         usleep(50000);
         $event->start();
-        usleep(100000);
         $this->assertEqualsWithDelta(100, $event->getDuration(), self::DELTA);
+        usleep(100000);
+        $this->assertEqualsWithDelta(200, $event->getDuration(), self::DELTA);
+    }
+
+    public function testDurationWithMultipleStarts()
+    {
+        $event = new StopwatchEvent(microtime(true) * 1000);
+        $event->start();
+        usleep(100000);
+        $event->start();
+        usleep(100000);
+        $this->assertEqualsWithDelta(300, $event->getDuration(), self::DELTA);
+        $event->stop();
+        $this->assertEqualsWithDelta(300, $event->getDuration(), self::DELTA);
+        usleep(100000);
+        $this->assertEqualsWithDelta(400, $event->getDuration(), self::DELTA);
+        $event->stop();
+        $this->assertEqualsWithDelta(400, $event->getDuration(), self::DELTA);
     }
 
     public function testStopWithoutStart()

Original file line number	Diff line number	Diff line change
`@@ -177,12 +177,10 @@ public function getEndTime()`
`177`	`177`	`public function getDuration()`
`178`	`178`	`{`
`179`	`179`	`$periods = $this->periods;`
`180`		`- $stopped = \count($periods);`
`181`		`- $left = \count($this->started) - $stopped;`
	`180`	`+ $left = \count($this->started);`
`182`	`181`
`183`		`- for ($i = 0; $i < $left; ++$i) {`
`184`		`- $index = $stopped + $i;`
`185`		`- $periods[] = new StopwatchPeriod($this->started[$index], $this->getNow(), $this->morePrecision);`
	`182`	`+ for ($i = $left - 1; $i >= 0; --$i) {`
	`183`	`+ $periods[] = new StopwatchPeriod($this->started[$i], $this->getNow(), $this->morePrecision);`
`186`	`184`	`}`
`187`	`185`
`188`	`186`	`$total = 0;`