bug #25226 [HttpKernel] Fix issue when resetting DumpDataCollector (Pierstoval)

nicolas-grekas · nicolas-grekas · commit b9fb27cab295 · 2017-12-01T11:32:03.000+01:00
This PR was merged into the 3.4 branch. Discussion ---------- [HttpKernel] Fix issue when resetting DumpDataCollector | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | License | MIT Fixes issue when resetting the collector and no stopwatch was provided in the constructor. By the way, current workaround is to `composer require symfony/stopwatch`, so this is not a "big blocker". Commits ------- 159fedc [HttpKernel] Fix issue when resetting DumpDataCollector
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/DumpDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/DumpDataCollector.php
@@ -166,7 +166,9 @@ public function collect(Request $request, Response $response, \Exception $except
 
     public function reset()
     {
-        $this->stopwatch->reset();
+        if ($this->stopwatch) {
+            $this->stopwatch->reset();
+        }
         $this->data = array();
         $this->dataCount = 0;
         $this->isCollected = false;
