bug #34179 [Stopwatch] Fixed a bug in StopwatchEvent::getStartTime (TimoBakx)

fabpot · fabpot · commit 767b265681a0 · 2019-11-03T13:11:53.000+01:00
This PR was merged into the 3.4 branch. Discussion ---------- [Stopwatch] Fixed a bug in StopwatchEvent::getStartTime | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #34088 | License | MIT | Doc PR | N/A When using a `StopwatchEvent` with an `$origin` that's smaller than the first start time, calling `getStartTime()` before ending the event will give `0` instead of the correct number. The proposed fix in #34088 fixes this. Commits ------- b2b7eab [Stopwatch] Fixed a bug in stopwatch event getStartTime
diff --git a/src/Symfony/Component/Stopwatch/StopwatchEvent.php b/src/Symfony/Component/Stopwatch/StopwatchEvent.php
@@ -154,7 +154,15 @@ public function getPeriods()
      */
     public function getStartTime()
     {
-        return isset($this->periods[0]) ? $this->periods[0]->getStartTime() : 0;
+        if (isset($this->periods[0])) {
+            return $this->periods[0]->getStartTime();
+        }
+
+        if ($this->started) {
+            return $this->started[0];
+        }
+
+        return 0;
     }
 
     /**
diff --git a/src/Symfony/Component/Stopwatch/Tests/StopwatchEventTest.php b/src/Symfony/Component/Stopwatch/Tests/StopwatchEventTest.php
@@ -152,6 +152,27 @@ public function testStartTime()
         $this->assertEqualsWithDelta(0, $event->getStartTime(), self::DELTA);
     }
 
+    public function testStartTimeWhenStartedLater()
+    {
+        $event = new StopwatchEvent(microtime(true) * 1000);
+        usleep(100000);
+        $this->assertLessThanOrEqual(0.5, $event->getStartTime());
+
+        $event = new StopwatchEvent(microtime(true) * 1000);
+        usleep(100000);
+        $event->start();
+        $event->stop();
+        $this->assertLessThanOrEqual(101, $event->getStartTime());
+
+        $event = new StopwatchEvent(microtime(true) * 1000);
+        usleep(100000);
+        $event->start();
+        usleep(100000);
+        $this->assertEqualsWithDelta(100, $event->getStartTime(), self::DELTA);
+        $event->stop();
+        $this->assertEqualsWithDelta(100, $event->getStartTime(), self::DELTA);
+    }
+
     public function testInvalidOriginThrowsAnException()
     {
         $this->expectException('InvalidArgumentException');
