Skip to content

Commit 0bf5379

Browse files
committed
Merge branch '4.4' into 5.0
* 4.4: Fix wrong namespaces Fix wrong namespaces Fix the reporting of deprecations in twig:lint forward multiple attributes voting flag bumped Symfony version to 4.4.8 updated VERSION for 4.4.7 updated CHANGELOG for 4.4.7 [Validator] Fixed calling getters before resolving groups [HttpKernel][LoggerDataCollector] Prevent keys collisions in the sanitized logs processing
2 parents c3f25ae + bce6f33 commit 0bf5379

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

DataCollector/LoggerDataCollector.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ private function sanitizeLogs(array $logs)
177177
continue;
178178
}
179179

180-
$message = $log['message'];
180+
$message = '_'.$log['message'];
181181
$exception = $log['context']['exception'];
182182

183183
if ($exception instanceof SilencedErrorContext) {

Tests/DataCollector/LoggerDataCollectorTest.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,13 +176,15 @@ public function getCollectTestData()
176176
[
177177
['message' => 'foo3', 'context' => ['exception' => new \ErrorException('warning', 0, E_USER_WARNING)], 'priority' => 100, 'priorityName' => 'DEBUG'],
178178
['message' => 'foo3', 'context' => ['exception' => new SilencedErrorContext(E_USER_WARNING, __FILE__, __LINE__)], 'priority' => 100, 'priorityName' => 'DEBUG'],
179+
['message' => '0', 'context' => ['exception' => new SilencedErrorContext(E_USER_WARNING, __FILE__, __LINE__)], 'priority' => 100, 'priorityName' => 'DEBUG'],
179180
],
180181
[
181182
['message' => 'foo3', 'context' => ['exception' => ['warning', E_USER_WARNING]], 'priority' => 100, 'priorityName' => 'DEBUG'],
182183
['message' => 'foo3', 'context' => ['exception' => [E_USER_WARNING]], 'priority' => 100, 'priorityName' => 'DEBUG', 'errorCount' => 1, 'scream' => true],
184+
['message' => '0', 'context' => ['exception' => [E_USER_WARNING]], 'priority' => 100, 'priorityName' => 'DEBUG', 'errorCount' => 1, 'scream' => true],
183185
],
184186
0,
185-
1,
187+
2,
186188
];
187189
}
188190
}

0 commit comments

Comments
 (0)