diff --git a/src/Symfony/Component/Cache/DataCollector/CacheDataCollector.php b/src/Symfony/Component/Cache/DataCollector/CacheDataCollector.php
index 9590436dc4630..e121596e83841 100644
--- a/src/Symfony/Component/Cache/DataCollector/CacheDataCollector.php
+++ b/src/Symfony/Component/Cache/DataCollector/CacheDataCollector.php
@@ -114,7 +114,7 @@ private function calculateStatistics(): array
/** @var TraceableAdapterEvent $call */
foreach ($calls as $call) {
++$statistics[$name]['calls'];
- $statistics[$name]['time'] += $call->end - $call->start;
+ $statistics[$name]['time'] += ($call->end ?? microtime(true)) - $call->start;
if ('get' === $call->name) {
++$statistics[$name]['reads'];
if ($call->hits) {
@@ -136,10 +136,8 @@ private function calculateStatistics(): array
$statistics[$name]['misses'] += $call->misses;
} elseif ('hasItem' === $call->name) {
++$statistics[$name]['reads'];
- if (false === $call->result) {
- ++$statistics[$name]['misses'];
- } else {
- ++$statistics[$name]['hits'];
+ foreach ($call->result ?? [] as $result) {
+ ++$statistics[$name][$result ? 'hits' : 'misses'];
}
} elseif ('save' === $call->name) {
++$statistics[$name]['writes'];
diff --git a/src/Symfony/Component/Cache/Tests/DataCollector/CacheDataCollectorTest.php b/src/Symfony/Component/Cache/Tests/DataCollector/CacheDataCollectorTest.php
index 6aa94c2c63383..a00954b6cb828 100644
--- a/src/Symfony/Component/Cache/Tests/DataCollector/CacheDataCollectorTest.php
+++ b/src/Symfony/Component/Cache/Tests/DataCollector/CacheDataCollectorTest.php
@@ -12,6 +12,7 @@
namespace Symfony\Component\Cache\Tests\DataCollector;
use PHPUnit\Framework\TestCase;
+use Symfony\Component\Cache\Adapter\NullAdapter;
use Symfony\Component\Cache\Adapter\TraceableAdapter;
use Symfony\Component\Cache\DataCollector\CacheDataCollector;
use Symfony\Component\HttpFoundation\Request;
@@ -55,7 +56,7 @@ public function testHitedEventDataCollector()
$traceableAdapterEvent->name = 'hasItem';
$traceableAdapterEvent->start = 0;
$traceableAdapterEvent->end = 0;
- $traceableAdapterEvent->hits = 1;
+ $traceableAdapterEvent->hits = 0;
$traceableAdapterEvent->misses = 0;
$traceableAdapterEvent->result = ['foo' => false];
@@ -63,8 +64,8 @@ public function testHitedEventDataCollector()
$this->assertEquals($statistics[self::INSTANCE_NAME]['calls'], 1, 'calls');
$this->assertEquals($statistics[self::INSTANCE_NAME]['reads'], 1, 'reads');
- $this->assertEquals($statistics[self::INSTANCE_NAME]['hits'], 1, 'hits');
- $this->assertEquals($statistics[self::INSTANCE_NAME]['misses'], 0, 'misses');
+ $this->assertEquals($statistics[self::INSTANCE_NAME]['hits'], 0, 'hits');
+ $this->assertEquals($statistics[self::INSTANCE_NAME]['misses'], 1, 'misses');
$this->assertEquals($statistics[self::INSTANCE_NAME]['writes'], 0, 'writes');
}
@@ -84,6 +85,25 @@ public function testSavedEventDataCollector()
$this->assertEquals($statistics[self::INSTANCE_NAME]['writes'], 1, 'writes');
}
+ public function testCollectBeforeEnd()
+ {
+ $adapter = new TraceableAdapter(new NullAdapter());
+
+ $collector = new CacheDataCollector();
+ $collector->addInstance(self::INSTANCE_NAME, $adapter);
+
+ $adapter->get('foo', function () use ($collector) {
+ $collector->collect(new Request(), new Response());
+
+ return 123;
+ });
+
+ $stats = $collector->getStatistics();
+ $this->assertGreaterThan(0, $stats[self::INSTANCE_NAME]['time']);
+ $this->assertEquals($stats[self::INSTANCE_NAME]['hits'], 0, 'hits');
+ $this->assertEquals($stats[self::INSTANCE_NAME]['misses'], 1, 'misses');
+ }
+
private function getCacheDataCollectorStatisticsFromEvents(array $traceableAdapterEvents)
{
$traceableAdapterMock = $this->createMock(TraceableAdapter::class);
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy