bug #26082 [Cache][WebProfiler][3.4] fix collecting cache stats with sub-requests + allow clearing calls (dmaicher)

nicolas-grekas · nicolas-grekas · commit 404a9ab6158a · 2018-02-11T15:42:07.000+01:00
This PR was merged into the 3.4 branch. Discussion ---------- [Cache][WebProfiler][3.4] fix collecting cache stats with sub-requests + allow clearing calls | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #23820 | License | MIT | Doc PR | - This is a follow-up PR for #26080. It additionally adds the reset behavior for the `TraceableAdapter` back. Commits ------- 132bba6 [Cache][WebProfiler] fix collecting cache stats with sub-requests + allow clearing calls
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`