Merge branch '3.4' into 4.2
* 3.4: fix PHPUnit 4.8 compatibility [Debug] Fixed error handling when an error is already handled when another error is already handled (5) sync validator translations
This commit is contained in:
commit
397e4b8931
@ -373,7 +373,7 @@ EOF;
|
|||||||
$fmt = $this->fileLinkFormat ?: ini_get('xdebug.file_link_format') ?: get_cfg_var('xdebug.file_link_format');
|
$fmt = $this->fileLinkFormat ?: ini_get('xdebug.file_link_format') ?: get_cfg_var('xdebug.file_link_format');
|
||||||
|
|
||||||
if (!$fmt) {
|
if (!$fmt) {
|
||||||
return sprintf('<span class="block trace-file-path">in <a title="%s%3$s"><strong>%s</strong>%s</a></span>', $this->escapeHtml($path), $file, 0 < $line ? ' line '.$line : '');
|
return sprintf('<span class="block trace-file-path">in <span title="%s%3$s"><strong>%s</strong>%s</span></span>', $this->escapeHtml($path), $file, 0 < $line ? ' line '.$line : '');
|
||||||
}
|
}
|
||||||
|
|
||||||
if (\is_string($fmt)) {
|
if (\is_string($fmt)) {
|
||||||
@ -389,7 +389,11 @@ EOF;
|
|||||||
|
|
||||||
$link = strtr($fmt[0], ['%f' => $path, '%l' => $line]);
|
$link = strtr($fmt[0], ['%f' => $path, '%l' => $line]);
|
||||||
} else {
|
} else {
|
||||||
$link = $fmt->format($path, $line);
|
try {
|
||||||
|
$link = $fmt->format($path, $line);
|
||||||
|
} catch (\Exception $e) {
|
||||||
|
return sprintf('<span class="block trace-file-path">in <span title="%s%3$s"><strong>%s</strong>%s</span></span>', $this->escapeHtml($path), $file, 0 < $line ? ' line '.$line : '');
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return sprintf('<span class="block trace-file-path">in <a href="%s" title="Go to source"><strong>%s</string>%s</a></span>', $this->escapeHtml($link), $file, 0 < $line ? ' line '.$line : '');
|
return sprintf('<span class="block trace-file-path">in <a href="%s" title="Go to source"><strong>%s</string>%s</a></span>', $this->escapeHtml($link), $file, 0 < $line ? ' line '.$line : '');
|
||||||
|
@ -25,7 +25,7 @@ class FileTypeTest extends BaseTypeTest
|
|||||||
|
|
||||||
protected function getExtensions()
|
protected function getExtensions()
|
||||||
{
|
{
|
||||||
$translator = $this->createMock(TranslatorInterface::class);
|
$translator = $this->getMockBuilder(TranslatorInterface::class)->getMock();
|
||||||
$translator->expects($this->any())->method('trans')->willReturnArgument(0);
|
$translator->expects($this->any())->method('trans')->willReturnArgument(0);
|
||||||
|
|
||||||
return array_merge(parent::getExtensions(), [new CoreExtension(null, null, $translator)]);
|
return array_merge(parent::getExtensions(), [new CoreExtension(null, null, $translator)]);
|
||||||
|
@ -338,6 +338,30 @@
|
|||||||
<source>This collection should contain only unique elements.</source>
|
<source>This collection should contain only unique elements.</source>
|
||||||
<target>Diese Sammlung darf keine doppelten Elemente enthalten.</target>
|
<target>Diese Sammlung darf keine doppelten Elemente enthalten.</target>
|
||||||
</trans-unit>
|
</trans-unit>
|
||||||
|
<trans-unit id="88">
|
||||||
|
<source>This value should be positive.</source>
|
||||||
|
<target>Diese Zahl sollte positiv sein.</target>
|
||||||
|
</trans-unit>
|
||||||
|
<trans-unit id="89">
|
||||||
|
<source>This value should be either positive or zero.</source>
|
||||||
|
<target>Diese Zahl sollte entweder positiv oder 0 sein.</target>
|
||||||
|
</trans-unit>
|
||||||
|
<trans-unit id="90">
|
||||||
|
<source>This value should be negative.</source>
|
||||||
|
<target>Diese Zahl sollte negativ sein.</target>
|
||||||
|
</trans-unit>
|
||||||
|
<trans-unit id="91">
|
||||||
|
<source>This value should be either negative or zero.</source>
|
||||||
|
<target>Diese Zahl sollte entweder negativ oder 0 sein.</target>
|
||||||
|
</trans-unit>
|
||||||
|
<trans-unit id="92">
|
||||||
|
<source>This value is not a valid timezone.</source>
|
||||||
|
<target>Dieser Wert ist keine gültige Zeitzone.</target>
|
||||||
|
</trans-unit>
|
||||||
|
<trans-unit id="93">
|
||||||
|
<source>This password has been leaked in a data breach, it must not be used. Please use another password.</source>
|
||||||
|
<target>Dieses Passwort ist Teil eines Datenlecks, es darf nicht verwendet werden.</target>
|
||||||
|
</trans-unit>
|
||||||
</body>
|
</body>
|
||||||
</file>
|
</file>
|
||||||
</xliff>
|
</xliff>
|
||||||
|
@ -338,6 +338,30 @@
|
|||||||
<source>This collection should contain only unique elements.</source>
|
<source>This collection should contain only unique elements.</source>
|
||||||
<target>This collection should contain only unique elements.</target>
|
<target>This collection should contain only unique elements.</target>
|
||||||
</trans-unit>
|
</trans-unit>
|
||||||
|
<trans-unit id="88">
|
||||||
|
<source>This value should be positive.</source>
|
||||||
|
<target>This value should be positive.</target>
|
||||||
|
</trans-unit>
|
||||||
|
<trans-unit id="89">
|
||||||
|
<source>This value should be either positive or zero.</source>
|
||||||
|
<target>This value should be either positive or zero.</target>
|
||||||
|
</trans-unit>
|
||||||
|
<trans-unit id="90">
|
||||||
|
<source>This value should be negative.</source>
|
||||||
|
<target>This value should be negative.</target>
|
||||||
|
</trans-unit>
|
||||||
|
<trans-unit id="91">
|
||||||
|
<source>This value should be either negative or zero.</source>
|
||||||
|
<target>This value should be either negative or zero.</target>
|
||||||
|
</trans-unit>
|
||||||
|
<trans-unit id="92">
|
||||||
|
<source>This value is not a valid timezone.</source>
|
||||||
|
<target>This value is not a valid timezone.</target>
|
||||||
|
</trans-unit>
|
||||||
|
<trans-unit id="93">
|
||||||
|
<source>This password has been leaked in a data breach, it must not be used. Please use another password.</source>
|
||||||
|
<target>This password has been leaked in a data breach, it must not be used. Please use another password.</target>
|
||||||
|
</trans-unit>
|
||||||
</body>
|
</body>
|
||||||
</file>
|
</file>
|
||||||
</xliff>
|
</xliff>
|
||||||
|
@ -338,6 +338,30 @@
|
|||||||
<source>This collection should contain only unique elements.</source>
|
<source>This collection should contain only unique elements.</source>
|
||||||
<target>Danh sách này chỉ nên chứa các phần tử khác nhau.</target>
|
<target>Danh sách này chỉ nên chứa các phần tử khác nhau.</target>
|
||||||
</trans-unit>
|
</trans-unit>
|
||||||
|
<trans-unit id="88">
|
||||||
|
<source>This value should be positive.</source>
|
||||||
|
<target>Giá trị này có thể thực hiện được.</target>
|
||||||
|
</trans-unit>
|
||||||
|
<trans-unit id="89">
|
||||||
|
<source>This value should be either positive or zero.</source>
|
||||||
|
<target>Giá trị này có thể thực hiện được hoặc bằng không.</target>
|
||||||
|
</trans-unit>
|
||||||
|
<trans-unit id="90">
|
||||||
|
<source>This value should be negative.</source>
|
||||||
|
<target>Giá trị này nên bị từ chối.</target>
|
||||||
|
</trans-unit>
|
||||||
|
<trans-unit id="91">
|
||||||
|
<source>This value should be either negative or zero.</source>
|
||||||
|
<target>Giá trị này nên bị từ chối hoặc bằng không.</target>
|
||||||
|
</trans-unit>
|
||||||
|
<trans-unit id="92">
|
||||||
|
<source>This value is not a valid timezone.</source>
|
||||||
|
<target>Giá trị này không phải là múi giờ hợp lệ.</target>
|
||||||
|
</trans-unit>
|
||||||
|
<trans-unit id="93">
|
||||||
|
<source>This password has been leaked in a data breach, it must not be used. Please use another password.</source>
|
||||||
|
<target>Mật khẩu này đã bị rò rỉ dữ liệu, không được sử dụng nữa. Xin vui lòng sử dụng mật khẩu khác.</target>
|
||||||
|
</trans-unit>
|
||||||
</body>
|
</body>
|
||||||
</file>
|
</file>
|
||||||
</xliff>
|
</xliff>
|
||||||
|
Reference in New Issue
Block a user