diff --git a/src/Symfony/Component/Debug/ExceptionHandler.php b/src/Symfony/Component/Debug/ExceptionHandler.php
index 5457a0d792..b38edd151e 100644
--- a/src/Symfony/Component/Debug/ExceptionHandler.php
+++ b/src/Symfony/Component/Debug/ExceptionHandler.php
@@ -373,7 +373,7 @@ EOF;
$fmt = $this->fileLinkFormat ?: ini_get('xdebug.file_link_format') ?: get_cfg_var('xdebug.file_link_format');
if (!$fmt) {
- return sprintf('in %s%s', $this->escapeHtml($path), $file, 0 < $line ? ' line '.$line : '');
+ return sprintf('in %s%s', $this->escapeHtml($path), $file, 0 < $line ? ' line '.$line : '');
}
if (\is_string($fmt)) {
@@ -389,7 +389,11 @@ EOF;
$link = strtr($fmt[0], ['%f' => $path, '%l' => $line]);
} else {
- $link = $fmt->format($path, $line);
+ try {
+ $link = $fmt->format($path, $line);
+ } catch (\Exception $e) {
+ return sprintf('in %s%s', $this->escapeHtml($path), $file, 0 < $line ? ' line '.$line : '');
+ }
}
return sprintf('in %s%s', $this->escapeHtml($link), $file, 0 < $line ? ' line '.$line : '');
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/FileTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/FileTypeTest.php
index 3c0a38d1b0..bff93d478e 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/FileTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/FileTypeTest.php
@@ -25,7 +25,7 @@ class FileTypeTest extends BaseTypeTest
protected function getExtensions()
{
- $translator = $this->createMock(TranslatorInterface::class);
+ $translator = $this->getMockBuilder(TranslatorInterface::class)->getMock();
$translator->expects($this->any())->method('trans')->willReturnArgument(0);
return array_merge(parent::getExtensions(), [new CoreExtension(null, null, $translator)]);
diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.de.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.de.xlf
index ada215c1c6..f33e4d602c 100644
--- a/src/Symfony/Component/Validator/Resources/translations/validators.de.xlf
+++ b/src/Symfony/Component/Validator/Resources/translations/validators.de.xlf
@@ -338,6 +338,30 @@
This collection should contain only unique elements.Diese Sammlung darf keine doppelten Elemente enthalten.
+
+ This value should be positive.
+ Diese Zahl sollte positiv sein.
+
+
+ This value should be either positive or zero.
+ Diese Zahl sollte entweder positiv oder 0 sein.
+
+
+ This value should be negative.
+ Diese Zahl sollte negativ sein.
+
+
+ This value should be either negative or zero.
+ Diese Zahl sollte entweder negativ oder 0 sein.
+
+
+ This value is not a valid timezone.
+ Dieser Wert ist keine gültige Zeitzone.
+
+
+ This password has been leaked in a data breach, it must not be used. Please use another password.
+ Dieses Passwort ist Teil eines Datenlecks, es darf nicht verwendet werden.
+
diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.en.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.en.xlf
index a2dc22f5cb..d5d9d20997 100644
--- a/src/Symfony/Component/Validator/Resources/translations/validators.en.xlf
+++ b/src/Symfony/Component/Validator/Resources/translations/validators.en.xlf
@@ -338,6 +338,30 @@