feature #23285 [Stopwatch] Add a reset method (jmgq)

fabpot · fabpot · commit b23ddfefce95 · 2017-07-03T10:03:20.000+03:00
This PR was merged into the 3.4 branch. Discussion ---------- [Stopwatch] Add a reset method | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | no | New feature? | yes | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #23284 | License | MIT | Doc PR | symfony/symfony-docs#8082 Let the Stopwatch to be reset to its original state, deleting all the data measured so far. This allows the stopwatch to be reusable, and emulates an actual stopwatch's reset button. Commits ------- 7cda099 [Stopwatch] Add a reset method
diff --git a/src/Symfony/Component/Stopwatch/Stopwatch.php b/src/Symfony/Component/Stopwatch/Stopwatch.php
@@ -30,7 +30,7 @@ class Stopwatch
 
     public function __construct()
     {
-        $this->sections = $this->activeSections = array('__root__' => new Section('__root__'));
+        $this->reset();
     }
 
     /**
@@ -156,4 +156,12 @@ public function getSectionEvents($id)
     {
         return isset($this->sections[$id]) ? $this->sections[$id]->getEvents() : array();
     }
+
+    /**
+     * Resets the stopwatch to its original state.
+     */
+    public function reset()
+    {
+        $this->sections = $this->activeSections = array('__root__' => new Section('__root__'));
+    }
 }
diff --git a/src/Symfony/Component/Stopwatch/Tests/StopwatchTest.php b/src/Symfony/Component/Stopwatch/Tests/StopwatchTest.php
@@ -153,4 +153,16 @@ public function testReopenANewSectionShouldThrowAnException()
         $stopwatch = new Stopwatch();
         $stopwatch->openSection('section');
     }
+
+    public function testReset()
+    {
+        $stopwatch = new Stopwatch();
+
+        $stopwatch->openSection();
+        $stopwatch->start('foo', 'cat');
+
+        $stopwatch->reset();
+
+        $this->assertEquals(new Stopwatch(), $stopwatch);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ class Stopwatch`
`30`	`30`
`31`	`31`	`public function __construct()`
`32`	`32`	`{`
`33`		`- $this->sections = $this->activeSections = array('__root__' => new Section('__root__'));`
	`33`	`+ $this->reset();`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`/**`
`@@ -156,4 +156,12 @@ public function getSectionEvents($id)`
`156`	`156`	`{`
`157`	`157`	`return isset($this->sections[$id]) ? $this->sections[$id]->getEvents() : array();`
`158`	`158`	`}`
	`159`	`+`
	`160`	`+ /**`
	`161`	`+ * Resets the stopwatch to its original state.`
	`162`	`+ */`
	`163`	`+ public function reset()`
	`164`	`+ {`
	`165`	`+ $this->sections = $this->activeSections = array('__root__' => new Section('__root__'));`
	`166`	`+ }`
`159`	`167`	`}`