[Cache][WebProfiler] fix collecting cache stats with sub-requests + allow clearing calls

dmaicher · dmaicher · commit 132bba6d2495 · 2018-02-07T20:03:36.000+01:00
diff --git a/src/Symfony/Component/Cache/Adapter/TraceableAdapter.php b/src/Symfony/Component/Cache/Adapter/TraceableAdapter.php
@@ -204,11 +204,12 @@ public function reset()
 
     public function getCalls()
     {
-        try {
-            return $this->calls;
-        } finally {
-            $this->calls = array();
-        }
+        return $this->calls;
+    }
+
+    public function clearCalls()
+    {
+        $this->calls = array();
     }
 
     protected function start($name)
diff --git a/src/Symfony/Component/Cache/DataCollector/CacheDataCollector.php b/src/Symfony/Component/Cache/DataCollector/CacheDataCollector.php
@@ -57,8 +57,7 @@ public function reset()
     {
         $this->data = array();
         foreach ($this->instances as $instance) {
-            // Calling getCalls() will clear the calls.
-            $instance->getCalls();
+            $instance->clearCalls();
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -57,8 +57,7 @@ public function reset()`
`57`	`57`	`{`
`58`	`58`	`$this->data = array();`
`59`	`59`	`foreach ($this->instances as $instance) {`
`60`		`- // Calling getCalls() will clear the calls.`
`61`		`- $instance->getCalls();`
	`60`	`+ $instance->clearCalls();`
`62`	`61`	`}`
`63`	`62`	`}`
`64`	`63`