Skip to content

Commit 3d84407

Browse files
committed
Merge branch '6.4' into 7.2
* 6.4: [HttpKernel] Fix TraceableEventDispatcher when the StopWatch service has been reset fix translation in spanish [FrameworkBundle] Remove redundant `name` attribute from `default_context` [Validator] Fix typo in uk translation Only remove E_WARNING from error level
2 parents d329d46 + 714764f commit 3d84407

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

Debug/TraceableEventDispatcher.php

+5-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,11 @@ protected function afterDispatch(string $eventName, object $event): void
6666
if (null === $sectionId) {
6767
break;
6868
}
69-
$this->stopwatch->stopSection($sectionId);
69+
try {
70+
$this->stopwatch->stopSection($sectionId);
71+
} catch (\LogicException) {
72+
// The stop watch service might have been reset in the meantime
73+
}
7074
break;
7175
case KernelEvents::TERMINATE:
7276
// In the special case described in the `preDispatch` method above, the `$token` section

Kernel.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,8 @@ protected function initializeContainer(): void
399399
$cachePath = $cache->getPath();
400400

401401
// Silence E_WARNING to ignore "include" failures - don't use "@" to prevent silencing fatal errors
402-
$errorLevel = error_reporting(\E_ALL ^ \E_WARNING);
402+
$errorLevel = error_reporting();
403+
error_reporting($errorLevel & ~\E_WARNING);
403404

404405
try {
405406
if (is_file($cachePath) && \is_object($this->container = include $cachePath)

0 commit comments

Comments
 (0)