Skip to content

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 18a5c70

Browse filesBrowse files
committed
Merge branch '7.2' into 7.3
* 7.2: [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 3fd7ea8 + 4471969 commit 18a5c70
Copy full SHA for 18a5c70

File tree

4 files changed

+9
-4
lines changed
Filter options

4 files changed

+9
-4
lines changed

‎src/Symfony/Component/Form/Resources/translations/validators.es.xlf

Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Resources/translations/validators.es.xlf
+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
</trans-unit>
5353
<trans-unit id="108">
5454
<source>Please enter a valid date.</source>
55-
<target>Por favor, ingrese una fecha valida.</target>
55+
<target>Por favor, ingrese una fecha válida.</target>
5656
</trans-unit>
5757
<trans-unit id="109">
5858
<source>Please select a valid file.</source>

‎src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/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

‎src/Symfony/Component/HttpKernel/Kernel.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/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)

‎src/Symfony/Component/Validator/Resources/translations/validators.uk.xlf

Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Resources/translations/validators.uk.xlf
+1-1
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@
180180
</trans-unit>
181181
<trans-unit id="48">
182182
<source>This value should have exactly {{ limit }} character.|This value should have exactly {{ limit }} characters.</source>
183-
<target>Значення повиино бути рівним {{ limit }} символу.|Значення повиино бути рівним {{ limit }} символам.|Значення повиино бути рівним {{ limit }} символам.</target>
183+
<target>Значення повинно бути рівним {{ limit }} символу.|Значення повинно бути рівним {{ limit }} символам.|Значення повинно бути рівним {{ limit }} символам.</target>
184184
</trans-unit>
185185
<trans-unit id="49">
186186
<source>The file was only partially uploaded.</source>

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.