Skip to content

Commit 6c789db

Browse files
Merge branch '5.4' into 6.0
* 5.4: [Semaphore] fix tests [HttpClient] fix destructing CurlResponse [Cache] Fix connecting to Redis via a socket file [DependencyInjection][FrameworkBundle] Fix using PHP 8.1 enum as parameters [PropertyAccessor] Add missing TypeError catch [HttpKernel] Fixed error count by log not displayed in WebProfilerBundle Added `kernel.event_listener` to the default list of behavior describing tags, fixing AsEventListener attribute not working on decorators. [WebProfilerBundle] Fixes weird spacing in log message context/trace output [Notifier] fix Microsoft Teams webhook url [FrameworkBundle] Fix log channel of TagAwareAdapter [Postmark] ensure only a single tag can be used with Postmark [Mailer] allow Mailchimp to handle multiple TagHeader's [HttpClient] Fix Content-Length header when possible [DependencyInjection] Don't dump polyfilled classes in preload script
2 parents 57ea3a7 + 8a2ad2a commit 6c789db

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

DataCollector/LoggerDataCollector.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ public function getProcessedLogs()
108108

109109
$logs[] = [
110110
'type' => $logType,
111-
'errorCounter' => isset($rawLogData['errorCounter']) ? $rawLogData['errorCounter']->getValue() : 1,
111+
'errorCount' => $rawLog['errorCount'] ?? 1,
112112
'timestamp' => $rawLogData['timestamp_rfc3339']->getValue(),
113113
'priority' => $rawLogData['priority']->getValue(),
114114
'priorityName' => $rawLogData['priorityName']->getValue(),

Tests/DataCollector/LoggerDataCollectorTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public function testCollectFromDeprecationsLog()
8080
$this->assertCount(1, $processedLogs);
8181

8282
$this->assertEquals($processedLogs[0]['type'], 'deprecation');
83-
$this->assertEquals($processedLogs[0]['errorCounter'], 1);
83+
$this->assertEquals($processedLogs[0]['errorCount'], 1);
8484
$this->assertEquals($processedLogs[0]['timestamp'], (new \DateTimeImmutable())->setTimestamp(filemtime($path))->format(\DateTimeInterface::RFC3339_EXTENDED));
8585
$this->assertEquals($processedLogs[0]['priority'], 100);
8686
$this->assertEquals($processedLogs[0]['priorityName'], 'DEBUG');

0 commit comments

Comments
 (0)