Skip to content

Commit e6653f2

Browse files
committed
Merge branch '5.4' into 6.3
* 5.4: make sure that the submitted year is an accepted choice skip some tests that do not work with ICU 71.1/72.1 Add missing translations (uk) symfony#53307 [Validator] Add missing Japanese translation (id=111) Added missing Estonian validator translations add missing swedish validators translations harden cache expiration test Bump Symfony version to 5.4.35 Update VERSION for 5.4.34 Update CONTRIBUTORS for 5.4.34 Update CHANGELOG for 5.4.34 [Validator] added missing Latvian translation
2 parents 1c43880 + 02ff4c6 commit e6653f2

File tree

9 files changed

+108
-46
lines changed

9 files changed

+108
-46
lines changed

CONTRIBUTORS.md

Lines changed: 71 additions & 36 deletions
Large diffs are not rendered by default.

src/Symfony/Component/Cache/Tests/Adapter/ProxyAdapterAndRedisAdapterTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ static function (CacheItem $item, $expiry) {
6666
$this->assertSame($value, $this->cache->getItem('baz')->get());
6767

6868
sleep(1);
69+
usleep(100000);
6970
$this->assertSame($value, $this->cache->getItem('foo')->get());
7071
$this->assertSame($value, $this->cache->getItem('bar')->get());
7172
$this->assertFalse($this->cache->getItem('baz')->isHit());

src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -707,6 +707,7 @@ public function testSubmitNullUsesDateEmptyData($widget, $emptyData, $expectedDa
707707
$form = $this->factory->create(static::TESTED_TYPE, null, [
708708
'widget' => $widget,
709709
'empty_data' => $emptyData,
710+
'years' => range(2018, (int) date('Y')),
710711
]);
711712
$form->submit(null);
712713

src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,8 @@ public function testSubmitFromSingleTextDateTime()
9292
// we test against "de_DE", so we need the full implementation
9393
IntlTestHelper::requireFullIntl($this, false);
9494

95-
if ('71.1' === Intl::getIcuVersion()) {
96-
$this->markTestSkipped('Skipping test due to a bug in ICU 71.1.');
95+
if (\in_array(Intl::getIcuVersion(), ['71.1', '72.1'], true)) {
96+
$this->markTestSkipped('Skipping test due to a bug in ICU 71.1/72.1.');
9797
}
9898

9999
\Locale::setDefault('de_DE');
@@ -118,8 +118,8 @@ public function testSubmitFromSingleTextDateTimeImmutable()
118118
// we test against "de_DE", so we need the full implementation
119119
IntlTestHelper::requireFullIntl($this, false);
120120

121-
if ('71.1' === Intl::getIcuVersion()) {
122-
$this->markTestSkipped('Skipping test due to a bug in ICU 71.1.');
121+
if (\in_array(Intl::getIcuVersion(), ['71.1', '72.1'], true)) {
122+
$this->markTestSkipped('Skipping test due to a bug in ICU 71.1/72.1.');
123123
}
124124

125125
\Locale::setDefault('de_DE');
@@ -145,8 +145,8 @@ public function testSubmitFromSingleTextString()
145145
// we test against "de_DE", so we need the full implementation
146146
IntlTestHelper::requireFullIntl($this, false);
147147

148-
if ('71.1' === Intl::getIcuVersion()) {
149-
$this->markTestSkipped('Skipping test due to a bug in ICU 71.1.');
148+
if (\in_array(Intl::getIcuVersion(), ['71.1', '72.1'], true)) {
149+
$this->markTestSkipped('Skipping test due to a bug in ICU 71.1/72.1.');
150150
}
151151

152152
\Locale::setDefault('de_DE');
@@ -171,8 +171,8 @@ public function testSubmitFromSingleTextTimestamp()
171171
// we test against "de_DE", so we need the full implementation
172172
IntlTestHelper::requireFullIntl($this, false);
173173

174-
if ('71.1' === Intl::getIcuVersion()) {
175-
$this->markTestSkipped('Skipping test due to a bug in ICU 71.1.');
174+
if (\in_array(Intl::getIcuVersion(), ['71.1', '72.1'], true)) {
175+
$this->markTestSkipped('Skipping test due to a bug in ICU 71.1/72.1.');
176176
}
177177

178178
\Locale::setDefault('de_DE');
@@ -199,8 +199,8 @@ public function testSubmitFromSingleTextRaw()
199199
// we test against "de_DE", so we need the full implementation
200200
IntlTestHelper::requireFullIntl($this, false);
201201

202-
if ('71.1' === Intl::getIcuVersion()) {
203-
$this->markTestSkipped('Skipping test due to a bug in ICU 71.1.');
202+
if (\in_array(Intl::getIcuVersion(), ['71.1', '72.1'], true)) {
203+
$this->markTestSkipped('Skipping test due to a bug in ICU 71.1/72.1.');
204204
}
205205

206206
\Locale::setDefault('de_DE');
@@ -1092,6 +1092,7 @@ public function testSubmitNullUsesDateEmptyData($widget, $emptyData, $expectedDa
10921092
$form = $this->factory->create(static::TESTED_TYPE, null, [
10931093
'widget' => $widget,
10941094
'empty_data' => $emptyData,
1095+
'years' => range(2018, (int) date('Y')),
10951096
]);
10961097
$form->submit(null);
10971098

src/Symfony/Component/Validator/Resources/translations/validators.et.xlf

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -426,6 +426,14 @@
426426
<source>Using hidden overlay characters is not allowed.</source>
427427
<target>Peidetud tähemärkide kasutamine pole lubatud.</target>
428428
</trans-unit>
429+
<trans-unit id="110">
430+
<source>The extension of the file is invalid ({{ extension }}). Allowed extensions are {{ extensions }}.</source>
431+
<target>Faili laiend on vigane ({{ extension }}). Lubatud laiendid on {{ extensions }}.</target>
432+
</trans-unit>
433+
<trans-unit id="111">
434+
<source>The detected character encoding is invalid ({{ detected }}). Allowed encodings are {{ encodings }}.</source>
435+
<target>Tuvastatud teksti kodeering on vigane ({{ detected }}). Lubatud kodeeringud on {{ encodings }}.</target>
436+
</trans-unit>
429437
</body>
430438
</file>
431439
</xliff>

src/Symfony/Component/Validator/Resources/translations/validators.ja.xlf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -430,6 +430,10 @@
430430
<source>The extension of the file is invalid ({{ extension }}). Allowed extensions are {{ extensions }}.</source>
431431
<target>ファイルの拡張子が無効です({{ extension }})。有効な拡張子は{{ extensions }}です。</target>
432432
</trans-unit>
433+
<trans-unit id="111">
434+
<source>The detected character encoding is invalid ({{ detected }}). Allowed encodings are {{ encodings }}.</source>
435+
<target>検出された文字コードは無効です({{ detected }})。有効な文字コードは{{ encodings }}です。</target>
436+
</trans-unit>
433437
</body>
434438
</file>
435439
</xliff>

src/Symfony/Component/Validator/Resources/translations/validators.lv.xlf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -430,6 +430,10 @@
430430
<source>The extension of the file is invalid ({{ extension }}). Allowed extensions are {{ extensions }}.</source>
431431
<target>Faila paplašinājums nav derīgs ({{ extension }}). Atļautie paplašinājumi ir {{ extensions }}.</target>
432432
</trans-unit>
433+
<trans-unit id="111">
434+
<source>The detected character encoding is invalid ({{ detected }}). Allowed encodings are {{ encodings }}.</source>
435+
<target>Noteiktais rakstzīmju kodējums nav derīgs ({{ detected }}). Atļautie kodējumi ir {{ encodings }}.</target>
436+
</trans-unit>
433437
</body>
434438
</file>
435439
</xliff>

src/Symfony/Component/Validator/Resources/translations/validators.sv.xlf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -430,6 +430,10 @@
430430
<source>The extension of the file is invalid ({{ extension }}). Allowed extensions are {{ extensions }}.</source>
431431
<target>Filtillägget är ogiltigt ({{ extension }}). Tillåtna filtillägg är {{ extensions }}.</target>
432432
</trans-unit>
433+
<trans-unit id="111">
434+
<source>The detected character encoding is invalid ({{ detected }}). Allowed encodings are {{ encodings }}.</source>
435+
<target>Den upptäckta teckenkodningen är ogiltig ({{ detected }}). Tillåtna kodningar är {{ encodings }}.</target>
436+
</trans-unit>
433437
</body>
434438
</file>
435439
</xliff>

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -430,6 +430,10 @@
430430
<source>The extension of the file is invalid ({{ extension }}). Allowed extensions are {{ extensions }}.</source>
431431
<target>Розширення файлу недопустиме ({{ extension }}). Дозволені розширення {{ extensions }}.</target>
432432
</trans-unit>
433+
<trans-unit id="111">
434+
<source>The detected character encoding is invalid ({{ detected }}). Allowed encodings are {{ encodings }}.</source>
435+
<target>Недопустиме кодування символів ({{ detected }}). Допустимі кодування: {{ encodings }}.</target>
436+
</trans-unit>
433437
</body>
434438
</file>
435439
</xliff>

0 commit comments

Comments
 (0)