feature #24505 [HttpKernel] implement reset() in DumpDataCollector (xabbuh)

nicolas-grekas · nicolas-grekas · commit 78e585849542 · 2017-10-11T10:24:37.000+02:00
This PR was merged into the 3.4 branch. Discussion ---------- [HttpKernel] implement reset() in DumpDataCollector | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #24289 | License | MIT | Doc PR | Commits ------- cd602d6 implement reset() in DumpDataCollector
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/DumpDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/DumpDataCollector.php
@@ -164,6 +164,16 @@ public function collect(Request $request, Response $response, \Exception $except
         }
     }
 
+    public function reset()
+    {
+        $this->stopwatch->reset();
+        $this->data = array();
+        $this->dataCount = 0;
+        $this->isCollected = false;
+        $this->clonesCount = 0;
+        $this->clonesIndex = 0;
+    }
+
     public function serialize()
     {
         if ($this->clonesCount !== $this->clonesIndex) {
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/TimeDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/TimeDataCollector.php
@@ -14,6 +14,7 @@
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\KernelInterface;
+use Symfony\Component\Stopwatch\Stopwatch;
 
 /**
  * TimeDataCollector.
@@ -25,7 +26,7 @@ class TimeDataCollector extends DataCollector implements LateDataCollectorInterf
     protected $kernel;
     protected $stopwatch;
 
-    public function __construct(KernelInterface $kernel = null, $stopwatch = null)
+    public function __construct(KernelInterface $kernel = null, Stopwatch $stopwatch = null)
     {
         $this->kernel = $kernel;
         $this->stopwatch = $stopwatch;
@@ -55,6 +56,10 @@ public function collect(Request $request, Response $response, \Exception $except
     public function reset()
     {
         $this->data = array();
+
+        if (null !== $this->stopwatch) {
+            $this->stopwatch->reset();
+        }
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -164,6 +164,16 @@ public function collect(Request $request, Response $response, \Exception $except`
`164`	`164`	`}`
`165`	`165`	`}`
`166`	`166`
	`167`	`+ public function reset()`
	`168`	`+ {`
	`169`	`+ $this->stopwatch->reset();`
	`170`	`+ $this->data = array();`
	`171`	`+ $this->dataCount = 0;`
	`172`	`+ $this->isCollected = false;`
	`173`	`+ $this->clonesCount = 0;`
	`174`	`+ $this->clonesIndex = 0;`
	`175`	`+ }`
	`176`	`+`
`167`	`177`	`public function serialize()`
`168`	`178`	`{`
`169`	`179`	`if ($this->clonesCount !== $this->clonesIndex) {`